gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /gnome-base
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
77 files changed, 490 insertions, 252 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index c4d42c4d8b69..93b3f3538ca1 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 e07a5ad501a8..0643a8a6822f 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,3 +1,5 @@
 DIST dconf-editor-3.30.2.tar.xz 447060 BLAKE2B 4cd8ab7200afaa402d6915a94be12b32a58fdf11ed77d4b833e3734b94de99bf7182d3564d1e0b42935d4364b2c973c296d773de402942af8e66f4ccbe6026be SHA512 c9fe4393e9c75ad19c56670a50199493a32ed55f3135ada599aef5efb4582320a23648da1906ce1a1b64918987fd3684f00bfc749a21a6fd2806066d760418c8
-EBUILD dconf-editor-3.30.2.ebuild 896 BLAKE2B 8b3d3d2cd0b439d0fecd2abc3dbb17fb73d0fd00dd167ed88a3469a5b3f1bed1f287fa153e580af70e2a264caee29c6d2a4f78417573fc94400c9d5cb4edfd0c SHA512 f71ff1f73b46f01a6e6d26b3f11a28651444a8b4c45061633c20841a20944101eb3a5a568d312ded6a6eb2364fd4439c988f005c8667ce475bf3a546a281aedd
+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
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.30.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.30.2.ebuild
index 3666f7682c0b..ed7bd641c7b7 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.30.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.30.2.ebuild
@@ -13,7 +13,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-fbsd ~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-editor/dconf-editor-3.34.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
new file mode 100644
index 000000000000..ab376da8bc88
--- /dev/null
+++ b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Graphical tool for editing the dconf configuration database"
+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"
+
+RDEPEND="
+	>=gnome-base/dconf-0.26.1
+	>=dev-libs/glib-2.55.1:2
+	>=x11-libs/gtk+-3.22.27:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index b2c196e7858d..9d2af2a89393 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -3,7 +3,7 @@ AUX 0.32.0-drop-vapigen-dep.patch 1113 BLAKE2B 17bc1da864e0a706aee7574115604e8bd
 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 1498 BLAKE2B 7829c513e07d7d7f40404f18a173310b4d7f9d591650b807529512b37431c34404fbc8a3b02cf854044e450c6009eb02b1a5582dc930dac621aa2a961d46f14d SHA512 229b151dc70b0dffce0998fab2dcb6e7f8b44c518e9f07ca80340f53124b9a91cc6b2c1c2ca6c64be9704511ed46505ee3c6f45c14fe666f2e64ed96adeb5e7b
-EBUILD dconf-0.30.1.ebuild 1833 BLAKE2B 992db142e268c021eaaa09f4e923cd5a51d4a83648b042b6742cf4669a9897120ee96f2dbe3f83ecc999522a5c4396eb0def38825c029f0c9ddf62de8528ba48 SHA512 20bddd4e4399da71113e34a19436ca344564895d987fec4df19a86b476b3b581cb35cfcf642e86553b2c14a754df31dcdf9d6e547a8a5b2f68ed9f3f5ada94e4
-EBUILD dconf-0.32.0-r1.ebuild 2119 BLAKE2B ba1b3594c0879866da0dd7803b82e3db668a25fe2d6e9626a6ce14518438faaec23e4fb0b497afaba7efcac4fc0c4e2ef5ce4666ddef421bf29c9e2b4b6b4a09 SHA512 7680177935489778b066dfe7166029604aa57e6bd7bc465b68f0192719cce4b6b385474d06b11306bf34d615aafe79b6456dc51882102d1f1f1b3b33347aefa2
+EBUILD dconf-0.26.1.ebuild 1476 BLAKE2B 2cc966193509f00c2ef23dcb6712f60c0c7894c91aaff397b2d067123c7f7be4ea8a27121bb1578c6a111fe7206406722158538c9458944f41790e462fb77d3c SHA512 f5bb74a43f300ac4b0c1042d67d44f2414fbc9621ab1c753ce68804c0d6ce2b42afe830fcde32d4b683ab05f06723050704bde6c54cac58e54f2b786a3445e2b
+EBUILD dconf-0.30.1.ebuild 1810 BLAKE2B c5e4aece778582dc0a93f1c28e9489817649bb168310d97f0513a6ed8fd78d31a4f7889420903102f1cdd17a2d08bfc009c668fd513cb7e9e1d5567b11ffdfcb SHA512 515b985d4cf42c19436acf54b7cd92b8b921b5dce0137603bbbbfacfc69c47c5c00082f9ee13f292bb6cad80bb980ccb4034b352721efd95890b6a741a219add
+EBUILD dconf-0.32.0-r1.ebuild 2097 BLAKE2B ed68cc1f8946e9f1d68586b887256ef8c8c76972b785ea6c346323a3a18911c0cd4a3243ea65de28712e08009318dcf2fd71532d928072e4aa24710dfdca4ef2 SHA512 28b6d049652138c232514790eb6fb6d2abef56092758e9a28e0d71ef400c29198733a9f05e6bf234cabca0018bc0638619f0ee49dfe0a2165c8cc7e0bed2eb9a
 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 9150b2a6a80a..4f62392857d3 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 ~amd64-fbsd ~x86-fbsd ~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.30.1.ebuild b/gnome-base/dconf/dconf-0.30.1.ebuild
index 71ea5bba2717..86f125d97e94 100644
--- a/gnome-base/dconf/dconf-0.30.1.ebuild
+++ b/gnome-base/dconf/dconf-0.30.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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/gnome-base/dconf/dconf-0.32.0-r1.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
index 8e9d9a0257d7..9d82cd9e4fe6 100644
--- a/gnome-base/dconf/dconf-0.32.0-r1.ebuild
+++ b/gnome-base/dconf/dconf-0.32.0-r1.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 ~amd64-fbsd ~x86-fbsd ~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 b54ed77d93b6..8b39d3ea554b 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 3668 BLAKE2B 90cd42c147b5f87a8e0a6ae421f703e68a585cc910de4c75212ee31860de05107f887dab528df46e5d8b4c22405ced8e6128cefa48abb44b014a0520d4f4428c SHA512 a20db9f81e388e0069ea202936d5479f1b7699789d3ebcd4aac35395c5e5466ab86bd967cc4e956a55ebfeac36ef7a28453d94a04491e6bb48b5dca351fab252
+EBUILD gconf-3.2.6-r4.ebuild 3646 BLAKE2B c1a98b644e9051be73b4718483ab9bc196b8e2184da0c3e922d998e13d2cedeb68634b915aac2c25625ecdf633db8aa3ac6bd8174313b9e0023469d567ec0324 SHA512 76eca81bf19aaf02a1b5541ebe65aa41004dc8588068b420d9d8eee387ee0c054ab53341b45d13d3e0906a94807090613e0a8ce33ad42e0d95ba2f35c04b6d0f
 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 1cf3c4e19529..41c56b56acff 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 ~amd64-fbsd ~x86-fbsd ~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/gdm/Manifest b/gnome-base/gdm/Manifest
index a147df68fa79..99557cdf80f2 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -8,6 +8,8 @@ AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e4
 AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
 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 7784 BLAKE2B b8dffa26147ca3a6f45aefd06000a6a4ed741f04c8438fbd1679d37297c1d839c01d35f37ceeafc668862c17edad389f64c6e2bc67e933cc90e0ca535c2a0bc5 SHA512 b3e858fc4c788bd73b41a6ca882a27f1a7fe7df9ce2fb25f5d6a4cc5a845cdd8260a2e918cae47133a2c54f806dc515aa74be330989e9d3985a21b62294aed73
+EBUILD gdm-3.30.3-r3.ebuild 7785 BLAKE2B 93ea897e035790ef200767a453eab985fd3184e8243d05a11ad69ed0942b592ba20a8b8eefa328c76bcc5ce70a1384b6f3ebf97c6acdcdb74bc3a46d3cfd81d5 SHA512 add94d28f86af1802fe4965905907f8f40593d9ec5191432a96c0e26a3a6452b4631442589ec92a68428f2f440de51cc1ca484abcb657565378402c6cb1ec351
+EBUILD gdm-3.32.0.ebuild 7673 BLAKE2B 3bd4f098b0ffe69cf7e38bea552c8576dc754c8ae2b4fb74f0646cf633bdf83908502043f4d101bff48e13ef7ab7349e9b5107cc441bb2f814e336759843feea SHA512 5739b68e9cc69e6fe1b5b989ba170246ee64b9ccb2c6bddf7a7a1ef8b1017bb7d5daff2692377fbe450b3d6826edafed48664aebfbb85d994541e46a9fb66eb2
 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 58c5e9f782a5..ffe2b15b7151 100644
--- a/gnome-base/gdm/gdm-3.30.3-r3.ebuild
+++ b/gnome-base/gdm/gdm-3.30.3-r3.ebuild
@@ -51,7 +51,7 @@ COMMON_DEPEND="
 	x11-libs/libxcb
 	>=x11-misc/xdg-utils-1.0.2-r3
 
-	virtual/pam
+	sys-libs/pam
 	elogind? ( >=sys-auth/elogind-239.3[pam] )
 	systemd? ( >=sys-apps/systemd-186:0=[pam] )
 
diff --git a/gnome-base/gdm/gdm-3.32.0.ebuild b/gnome-base/gdm/gdm-3.32.0.ebuild
new file mode 100644
index 000000000000..9ee9ae70dc7c
--- /dev/null
+++ b/gnome-base/gdm/gdm-3.32.0.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user
+
+DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
+HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
+
+SRC_URI="${SRC_URI}
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="
+	GPL-2+
+	branding? ( CC-BY-SA-4.0 )
+"
+
+SLOT="0"
+
+IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+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
+# dconf, dbus and g-s-d are needed at install time for dconf update
+# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.44:2
+	dev-libs/libgudev
+	>=x11-libs/gtk+-2.91.1:3
+	>=gnome-base/dconf-0.20
+	>=gnome-base/gnome-settings-daemon-3.1.4
+	gnome-base/gsettings-desktop-schemas
+	>=media-libs/fontconfig-2.5.0:1.0
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-apps/dbus
+	>=sys-apps/accountsservice-0.6.35
+
+	x11-base/xorg-server
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libxcb
+	>=x11-misc/xdg-utils-1.0.2-r3
+
+	sys-libs/pam
+	elogind? ( >=sys-auth/elogind-239.3[pam] )
+	systemd? ( >=sys-apps/systemd-186:0=[pam] )
+
+	sys-auth/pambase[elogind?,systemd?]
+
+	audit? ( sys-process/audit )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	plymouth? ( sys-boot/plymouth )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# XXX: These deps are from session and desktop files in data/ directory
+# fprintd is used via dbus by gdm-fingerprint-extension
+# gnome-session-3.6 needed to avoid freezing with orca
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-session-3.6
+	>=gnome-base/gnome-shell-3.1.90
+	x11-apps/xhost
+
+	accessibility? (
+		>=app-accessibility/orca-3.10
+		gnome-extra/mousetweaks )
+	fprint? (
+		sys-auth/fprintd
+		sys-auth/pam_fprint )
+
+	!gnome-extra/fast-user-switch-applet
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.9.4 )
+	app-text/yelp-tools
+" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup)
+
+DOC_CONTENTS="
+	To make GDM start at boot with systemd, run:\n
+	# systemctl enable gdm.service\n
+	\n
+	To make GDM start at boot with OpenRC, edit /etc/conf.d to have
+	DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
+	# rc-update add xdm
+	\n
+	For passwordless login to unlock your keyring, you need to install
+	sys-auth/pambase with USE=gnome-keyring and set an empty password
+	on your keyring. Use app-crypt/seahorse for that.\n
+	\n
+	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
+	for smartcard support
+"
+
+pkg_setup() {
+	enewgroup gdm
+	enewgroup video # Just in case it hasn't been created yet
+	enewuser gdm -1 -1 /var/lib/gdm gdm,video
+
+	# For compatibility with certain versions of nvidia-drivers, etc., need to
+	# ensure that gdm user is in the video group
+	if ! egetent group video | grep -q gdm; then
+		# FIXME XXX: is this at all portable, ldap-safe, etc.?
+		# XXX: egetent does not have a 1-argument form, so we can't use it to
+		# get the list of gdm's groups
+		local g=$(groups gdm)
+		elog "Adding user gdm to video group"
+		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
+	fi
+}
+
+src_prepare() {
+	# ssh-agent handling must be done at xinitrc.d, bug #220603
+	eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
+
+	# Gentoo does not have a fingerprint-auth pam stack
+	eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
+
+	# Support pam_elogind.so in gdm-launch-environment.pam
+	eapply "${FILESDIR}/pam-elogind.patch"
+
+	# Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222
+	eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf
+
+	# Show logo when branding is enabled
+	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# PAM is the only auth scheme supported
+	# even though configure lists shadow and crypt
+	# they don't have any corresponding code.
+	# --with-at-spi-registryd-directory= needs to be passed explicitly because
+	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
+	# Xevie is obsolete, bug #482304
+
+	# --with-initial-vt=7 conflicts with plymouth, bug #453392
+	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
+	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
+	# before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
+	# so lets try always having it in VT1 and see if that is an issue for people before
+	# hacking up workarounds for the initial start case.
+	# ! use plymouth && myconf="${myconf} --with-initial-vt=7"
+	local myconf=(
+		--enable-gdm-xsession
+		--enable-user-display-server
+		--with-run-dir=/run/gdm
+		--localstatedir="${EPREFIX}"/var
+		--disable-static
+		--with-xdmcp=yes
+		--enable-authentication-scheme=pam
+		--with-default-pam-config=exherbo
+		--with-pam-mod-dir=$(getpam_mod_dir)
+		--with-udevdir=$(get_udevdir)
+		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec
+		--without-xevie
+		$(use_enable systemd systemd-journal)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_with audit libaudit)
+		$(use_enable ipv6)
+		$(use_with plymouth)
+		$(use_with selinux)
+		$(use_with tcpd tcp-wrappers)
+		$(use_enable wayland wayland-support)
+		$(use_with xinerama)
+	)
+
+	if use elogind; then
+		myconf+=(
+			--with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
+			SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+			SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	if ! use accessibility ; then
+		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
+	fi
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
+	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
+
+	# gdm user's home directory
+	keepdir /var/lib/gdm
+	fowners gdm:gdm /var/lib/gdm
+
+	if ! use bluetooth-sound ; then
+		# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
+		# bug #679526
+		insinto /var/lib/gdm/.config/pulse
+		doins "${FILESDIR}"/default.pa
+	fi
+
+	# install XDG_DATA_DIRS gdm changes
+	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
+	doenvd 99xdg-gdm
+
+	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	local d ret
+
+	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
+	ret=0
+	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
+	chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1
+	for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
+		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
+	done
+	eend ${ret}
+
+	systemd_reenable gdm.service
+	readme.gentoo_print_elog
+}
diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest
index f3803358b755..383bb0dc85d5 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 623 BLAKE2B 7607cf8cf5a6146209a04739669ff863d62083bfe1f106ca23f3a691472eb40402b47f5d5f2b7fc3a481521e38878a4c304c5c514bedaa1bad510b54c08ff581 SHA512 e6837d80ba62ba64186aadab408d8270be82cb68908edbe290a36d8dfc13db5f4a16d3365c4c9ba6d1f4565117ec2df3261587356cfaf6bf62f6a291caccb0e5
+EBUILD gnome-common-3.18.0-r1.ebuild 601 BLAKE2B 1a54cb8e05a7b36f5b6fcaf3756855c24a005cb97850beffeaafc154925c0d8dce1bfcc0a4ed1ad9f6c0e48dd9afd50ca5c590f00d603416e57ace2f7ec295f4 SHA512 1b7cc48c2aba60215f77edeeb3889f63994c40d5a55315da50031febd71078f33f85560f3f1e1f122ab6f9c71ba3134c8716aa014a1f896a885f282ef5af4e7f
 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 448ddcf7a87f..2c8b991fccbf 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-fbsd ~x86-fbsd ~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 6ecb7633a0c1..679e71fce26a 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -3,6 +3,6 @@ DIST gnome-control-center-3.30.3-patchset.tar.xz 65244 BLAKE2B d210f94e0058e6284
 DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f184f8831a8df218691fefd035842170871eebb6f17e34405e7c4c18da6a191b92c7b58fcd40b252cdb67154becdf7e7ac6a63aa8f SHA512 85c7b51d6bc32f73d7f4ad6df8d4cc14c59e19da88d7a17b7337f995483f41008213ca829247a3c9db43c4b31eae0be321ed6804570660fbe0356da3dd0948dc
 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 5844 BLAKE2B e162b72341a314622e8be3056af5cdb1e97e56668c3d14fab822d037bd5c1c787c7815c9848655de0e47828617e3d92b607f6038d68bf0b431012e09defed956 SHA512 afdc5320664b18daa7bda2992d03190aa6ffcfcbd8cfea6910a14a45bc366e675d069f8b58831d23d1e5e48be0ddb459a71f1a200a72b5b4ca153142a6eb13a4
+EBUILD gnome-control-center-3.30.3-r1.ebuild 5834 BLAKE2B 43b57996a79cb5d3ac8522a6f2f5a8952f78b87a6006e87c896cba6abe1bee0b9239bb4c02d6727c3fe9b859cc50a1babad0ab862768b747ca243adbcb6e12ec SHA512 ee7a1f6ce458919b535ee80a634b9b1286297a43f81bea37e7c2f8b20d9226900742bc21be7860175a3738073882416e954b1c82278743b645579ab9cab8fd86
 EBUILD gnome-control-center-3.32.2.ebuild 5511 BLAKE2B b49a8fbd28eb99212e2b4421250fff12a8115ede86c8082872db4684394297fd4433ad81c86f886ad188c77ae48689e8d36108bc8e5bed0aae008a1592f6d22d SHA512 8b9e2e077ef321615da8faffec217bea13af6f7f7a255ab337483afd0d1709ea38df8f8dd0e1a3a07739c372d322b0a8b26306416a05a8c65545bb196d393eac
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
index c501a28ee295..0b752ffb26a3 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.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="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # 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 31a4ce86d407..c2a69a73ab23 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,2 +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
 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
new file mode 100644
index 000000000000..6b6dc0458da5
--- /dev/null
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.32.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="+bluetooth cups"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64"
+
+# gnome-color-manager min version enforced here due to control-center pulling it in
+RDEPEND="
+	>=gnome-base/gnome-core-libs-${PV}[cups?]
+
+	>=gnome-base/gnome-session-3.32.0
+	>=gnome-base/gnome-settings-daemon-3.32.0[cups?]
+	>=gnome-base/gnome-control-center-3.32.1[cups?]
+	>=gnome-extra/gnome-color-manager-3.32.0
+
+	>=app-crypt/gcr-3.28.1
+	>=gnome-base/nautilus-3.32.1
+	>=gnome-base/gnome-keyring-3.31.91
+	>=gnome-extra/evolution-data-server-${PV}
+
+	>=app-crypt/seahorse-3.32.2
+	>=app-editors/gedit-3.32.0
+	>=app-text/evince-3.32.0
+	>=gnome-extra/gnome-contacts-3.32.1
+	>=media-gfx/eog-3.32.1
+	>=media-video/totem-3.32.0
+	>=x11-terms/gnome-terminal-${PV}
+
+	>=gnome-extra/gnome-user-docs-${PV}
+	>=gnome-extra/yelp-3.32.2
+
+	>=x11-themes/adwaita-icon-theme-3.32.0
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.32.1 )
+"
+DEPEND=""
+BDEPEND=""
+
+# cdr? ( >=app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore
+# >=gnome-base/gnome-menus-3.13.3:3  # not used by core gnome anymore, just gnome-classic extensions
+# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 3879b88bff53..1483539b770e 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 2296 BLAKE2B fbd9347c8215cc512b0a510da35b4e12425f7c33a40a6081f714ba3cf4d71eabf66c27c230eb08147d9c56c1d15ac9586c7ecaa894baffc6721fbba35bcda062 SHA512 427f8dca28ce505920a02e0f540b3c311baff2fc03dcac908d07d4d4e463f70dbb3b642ae53129ff7c4a2892efc34ca84683316cb15f493c89968ed390e4b74e
-EBUILD gnome-desktop-3.30.2.3.ebuild 2004 BLAKE2B 2fe4f1c41abf2dfd931dcdb196bb1c71d056aeef2c59d774325b79d0d5ea03e8ec9b8cc6b6983ac47cb25d4a6cff1db002fd619de5dadaca70a6baaebbd9b24c SHA512 954954c7d409a2a2fe4c97e353e4dc00431a03d213f30170b57256755c60b8159dc002559f45d022d6819ab5cf1493c0c684a66fba6819c0c6fa1011df8cfceb
-EBUILD gnome-desktop-3.32.2.ebuild 2274 BLAKE2B ada1f3497d05b955fa91890fdcc16da36231d11d7bd87412ab277047df97e1d583ded0f2f9a3108dd71a2e2d5d2ebeaa69b705dd7ea2f17e399c80452c5c8a2f SHA512 aa2c130ade269c2c4a964ef679dddde701b72865fc1612709b9c6aee27c988b63ca92d25d89f8a02c80b84d242fbfe1dc18540146b12bdccca4426a2b51f3c42
+EBUILD gnome-desktop-2.32.1-r2.ebuild 2286 BLAKE2B 3e5c049ee0cfcd0bce0d229398534d00b49d915674b97d1c6f45f691fa6a7e59f608ddcd66e979493882680c05aa7a49c4fac7affd0c07332b5c91c68ea8dca4 SHA512 c3d27e1efcb6006ffb4d3c3bb9e1f54796d9ec55f1ab4d8446ed1d5dad995a1935c5f13e8b95479c3fa89834fc4582badd9afcebbf54f50d367a7200314091c5
+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
 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 dbcd5ea476d1..595d61ff0bd0 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 ~x86-fbsd ~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-desktop/gnome-desktop-3.30.2.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.30.2.3.ebuild
index 2ed6a694e4be..64e40e19554b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.30.2.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.30.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/17" # subslot = libgnome-desktop-3 soname version
 IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~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-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
index c33b430ccf5a..7e9e3fe09c13 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 ~x86-fbsd ~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-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 140c8f709ab5..97014f0f09db 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -2,12 +2,8 @@ AUX 3.31.91-fix-musl.patch 779 BLAKE2B 72dc9001d17dcec1a2612a19e0edb358398a36dc3
 AUX 3.31.91-race-fix1.patch 1503 BLAKE2B cd90c630835f5e5c85ec6fc432ea10cc17aeec6bf7edbd42a6fecccc2426c4ee54135394f71d8ac8cfcd84062a465baf91dd85c29decd4e9db5c8bf39a719d8d SHA512 64ba00999370283d33f998ee6ed5f26cfaa685ea53a169a3bb0a1a28fe7229331ab388ef86fa3322deb3e454d850bb82c390686fad51cd69dc5005deac8dfb9a
 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.20.0.tar.xz 1215324 BLAKE2B 97a4663fac7d3e854a742ac2f160fda2b40c5ff9f7316b52197955aa1970732ef323252325a021469d4944e962b1f1b868d300476b854f21cc5636961e3972da SHA512 f7e6195b4be52edaee3bc3181f006ec31ebd54f8000c98220520f4158f66580b60950e4f55247aefae6aa9320f6589c8a09c1e32853165915ae5ff1b40627c5b
-DIST gnome-keyring-3.20.1.tar.xz 1219800 BLAKE2B b0c633575ee35a733bbf04322e4413675bc40d4de256b66183138483f50c1d399a450cd4d06a3d76707948a7c541ef129a3385044f109a37677af6a7fc01e9af SHA512 a60d8a4b17a9c6d8c581578881abaf7d79de43045a314b401e3bfd3974edb4ab94117dd430203b721058f432b24bf6296e0b7c4fba1e66cccd2c2e9441787177
 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.20.0.ebuild 2149 BLAKE2B b0b14027766ee97e3352465c496e5495da2ee6a60eff01ec108f0ea8e45b04212c3a9e4535392cb5a2547dc2fe4c7b03b99f4f89b8a37b3694d4cfb913c8767c SHA512 3498b100ddfc190e0994963f8f5f892948e1af570069417d2b3eb7df51ade7d5b82ec9b6e6ce617a761274baddb87d8495f8e5a438bf22f0fc88b2a7619497b5
-EBUILD gnome-keyring-3.20.1.ebuild 2150 BLAKE2B 9b7f568fea159895924f5266728f685abffcb2c0f35f19725b9fb40ff481ec099d12c036fe4903ec3233f06502fdd3120a3a05d70bfe19b8922963e3827c9a63 SHA512 bc08c5581b9aff79fd0d610e57020c6772723a6e643dea8da4ede325c6231e91e36d9756dc1c505c1a483e9fe6a2c93bb0de946147748370fbcea45650763020
-EBUILD gnome-keyring-3.28.2.ebuild 2152 BLAKE2B a9c31fab90f47193a55eeba49f87c85dcf6991a36fcc048cb55c43ff913247168f25d1d50410c31a4a568e45802a10719befed5830b20d0ace1034be60466557 SHA512 3438279a10b1bb8d3c35fe67fb97819d05bdc56ed347d4ed2dc378cfac8d072c83415880dea70dc7a2d36cb516878abe331b119f1048c54070118ae622afb7f9
-EBUILD gnome-keyring-3.31.91-r1.ebuild 2388 BLAKE2B 094cb925b0356ebd01181097b81aafc00ed4e2241e1ffa10384c6ce9ebee9aa7dc5d6fbce318c6888c3c08642037fd674225eeca723857d487ef29e4908c738d SHA512 55c5d25e7e41a4d891bcce0ef2d9bba45e298939d7b28c65b4afdad6d276a8e38994d57cc82080d78bc00013b12b7f03b83f29fa611b342adba941a14786a715
+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
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
deleted file mode 100644
index 8f8e2194ab56..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.38:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-gnome )
-	>=app-crypt/gnupg-2.0.28:=
-"
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-pinentry-0.5
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS with debug enabled
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc
-}
-
-src_test() {
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check
-}
-
-pkg_postinst() {
-	# cap_ipc_lock only needed if building --with-libcap-ng
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-
-	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
-		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
-		ewarn " # eselect pinentry set pinentry-gnome3"
-	fi
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild
deleted file mode 100644
index b48ebc6b6428..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.38:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-gnome )
-	>=app-crypt/gnupg-2.0.28:=
-"
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-pinentry-0.5
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS with debug enabled
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc
-}
-
-src_test() {
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check
-}
-
-pkg_postinst() {
-	# cap_ipc_lock only needed if building --with-libcap-ng
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-
-	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
-		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
-		ewarn " # eselect pinentry set pinentry-gnome3"
-	fi
-}
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 52b6ce5263c5..d9ad273fc78a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
@@ -13,7 +13,7 @@ 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-fbsd ~x86-fbsd ~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="
@@ -22,7 +22,7 @@ RDEPEND="
 	app-misc/ca-certificates
 	>=dev-libs/libgcrypt-1.2.2:0=
 	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	selinux? ( sec-policy/selinux-gnome )
 	>=app-crypt/gnupg-2.0.28:=
 	ssh-agent? ( net-misc/openssh )
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 e71fe8099eb0..e15406304ac3 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,7 @@ 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-fbsd ~x86-fbsd ~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="
@@ -22,7 +22,7 @@ RDEPEND="
 	app-misc/ca-certificates
 	>=dev-libs/libgcrypt-1.2.2:0=
 	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	selinux? ( sec-policy/selinux-gnome )
 	>=app-crypt/gnupg-2.0.28:=
 	ssh-agent? ( net-misc/openssh )
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index 7814887823a6..59139ba37991 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,4 +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
 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
new file mode 100644
index 000000000000..75acc391dae2
--- /dev/null
+++ b/gnome-base/gnome-light/gnome-light-3.32.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+P_RELEASE="$(ver_cut 1-2)"
+
+DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="2.0"
+IUSE="cups +gnome-shell"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64 ~x86"
+
+# XXX: Note to developers:
+# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
+# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
+# any apps, but shouldn't be used by users unless they know what they are doing.
+# cantarell minimum version is ensured here as gnome-shell depends on it.
+RDEPEND="
+	>=gnome-base/gnome-core-libs-${PV}[cups?]
+
+	>=gnome-base/gnome-session-3.32.0
+	>=gnome-base/gnome-settings-daemon-3.32.0[cups?]
+	>=gnome-base/gnome-control-center-${PV}[cups?]
+
+	>=gnome-base/nautilus-${PV}
+
+	gnome-shell? (
+		>=x11-wm/mutter-${PV}
+		>=dev-libs/gjs-1.56.2
+		>=gnome-base/gnome-shell-${PV}
+		>=media-fonts/cantarell-0.111 )
+
+	>=x11-themes/adwaita-icon-theme-${P_RELEASE}
+	>=x11-themes/gnome-themes-standard-3.28
+	>=x11-themes/gnome-backgrounds-${P_RELEASE}
+
+	>=x11-terms/gnome-terminal-${PV}
+"
+DEPEND=""
+PDEPEND=">=gnome-base/gvfs-1.40.1"
+BDEPEND=""
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if ! use gnome-shell; then
+		# Users probably want to use gnome-flashback, e16, sawfish, etc
+		ewarn "You're not installing GNOME Shell"
+		ewarn "You will have to install and manage a window manager by yourself"
+	fi
+}
+
+pkg_postinst() {
+	# Remember people where to find our project information
+	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
+	elog "for information about the project and documentation."
+}
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 5be24b7c10cb..74d57cbc7c92 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 1382 BLAKE2B 8bb7a4381e0975e4c6030708920a8d2a3a192ee52dd0da131cf3c4b8c9aa89eeb5f150a5af2b417955643f2ed2aed1b63b6ffe9fe082b3ac0e0f53578dbeb3ef SHA512 13517cd1fc4b57e6f63d114a273639cfafa3faeb16aaa977a3a9213a12e39fc8cc6a50f8b40b1f7e4f36265d586ac0a7fa76d285d382514ba64a81a42c11fe54
+EBUILD gnome-menus-3.13.3-r1.ebuild 1372 BLAKE2B 25d790a2185c89e520dbd212b309a14de2457de629c231a122c14d958a5bd62f403362022d90fc8136351ee0e93ba6f89d36168f2433c6ae74ece3f72e1ebae1 SHA512 07e444a58ae18fb1c36e4e12dbedcb95b55f3b39e0688b72a4e9978662a7cce01a204398b893f10856bc00a69c59b616b8e1f4232368a3fd7e433dd2829baa7f
 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 675fccc08fec..44fe31b2cc9c 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
@@ -11,7 +11,7 @@ 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 ~x86-fbsd ~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"
 
diff --git a/gnome-base/gnome-mime-data/Manifest b/gnome-base/gnome-mime-data/Manifest
index bd998cd5e0da..12b6995e407a 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 615 BLAKE2B 9878326a24d3ca79ce8350c7ca0112abf745d0794114ecbbe83d57ec5326b4c1d1ca1da4fb727b7dcae477435107492123d695bb435ad205879de834351152b1 SHA512 4d5020116427ca36ed137c7fa64b4caadccbcdc0a6e2e1d30c4b53a35dc7d21c3fb538f7ea0666f274858c4854f672f0540fa41d6f126d46f336f028e18fff3f
+EBUILD gnome-mime-data-2.18.0.ebuild 593 BLAKE2B c5e80da1c83ae6ce1302fa6e8a7eb05e2c00b2a8163b0f9d9d977f4d1a464bc39c5b8c29f749699fcf47e1d0f1fc904b8f6102d2bee5df10ea056bb3c02e9038 SHA512 f29f7b3307d9ee8fefe9ad94709a295c586f3de05436d214b4229b9a7ec807472e059e9a28d2b51431806e1a48f0f4f656ee7ae1d31f4a7e707be0a88ca40a47
 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 63ef57d9cead..6373724924e2 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-fbsd ~x86-fbsd ~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-session/Manifest b/gnome-base/gnome-session/Manifest
index 948c57b43766..997c07439982 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -6,6 +6,6 @@ AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc5
 AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe8aed122e3b918cf840e5b8df8bb68c5ebb5ffed9d95b530581e10c03f7b4454ffe23fd8993253ce2898 SHA512 1d282ab6a139f6e0f0309263ca736dc2eeca0490f25a740583a24cd4f84a21531aaa0bd916d0809844e928029a434acdb3922305ce1253241ff62938c13c4eae
 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 3913 BLAKE2B 273bcbe62ac444b2e2898fb3dc1c93d6456999807a6f46677b028194aa224ab181766387c3a4bbb7d5e3704429f2b328d000debdb26b45d22488b0f9e5fd72d1 SHA512 489a779174640d275ff02115d3dd0b6fddd88c5043484f679a3dd3d4d84dd3289f3419c9c7411ae1843436f425123381da8cf4f1e9927205572b44289befad12
-EBUILD gnome-session-3.32.0.ebuild 3887 BLAKE2B 25b4eee562f7253e00f76c836c6b91d5708ca5534d1aa2c4d0252beb13439b08b654a31140287cf2fc610542e216160086e97d01577eb9ca6751d8c898186377 SHA512 224a5881404312084fecc1856611a71c157c38b6a7ab6ec51aa1d17523eaf65050bc9e857403c3779593814d17193c49eea209b2fa3e9c9325d3f6e318cc9703
+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
 MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b
diff --git a/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild
index c621f020617f..c1b21a8f6eba 100644
--- a/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.30.1-r1.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 ~x86-fbsd ~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-session/gnome-session-3.32.0.ebuild b/gnome-base/gnome-session/gnome-session-3.32.0.ebuild
index 7c7814e1e3cf..67d00960e131 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 ~x86-fbsd ~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 96bcb7deee52..581462df4a2e 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -3,6 +3,6 @@ DIST gnome-settings-daemon-3.30.2-patchset.tar.xz 20132 BLAKE2B b8f2573e806ee5ae
 DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B a7cf276c5a802b7d9a6f738048b5bc34d97f79723c6f4cfb4f29ac3ed0f43e307cbdd6793e8d8115f51981ee576737d75c58531dcd5d0779d9f3670b68523a60 SHA512 517cb6bab3da10d5d47ab9c9690da3fa23e64d023d01b7cc101441f6b65639f3b6c8d0a0d19da80b22924b3dbe6430b2573fb861060f02fda248b24f00be5d84
 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 3885 BLAKE2B d59a394535e6c4589d67bfcae5e9b2e0f6690f9523f617dd3b214c1f79c9c40fd40262a2ccfce56671dcb266d8f43b51728cb151f4f58d4425ccb239eb534251 SHA512 6ddd62b160bfaf78c5004e7bb66c7f7204d612806997b5e196a17b1cb4c9f436c08cfce9b736a4033419bf520623b4ec71cf74c84a45d51209efe90a0a06b5df
-EBUILD gnome-settings-daemon-3.32.1.ebuild 3849 BLAKE2B 208e23f41162df6a9682bc660349c720632ba7cf499b4dc3bb272052ec887cf7e6e293c2d872e38f10b077b00cc773307fd67d27b50ae2fcb15fff2131e0a397 SHA512 0904befde465cb65cc88d0e88c525783235d1afae98ba60e117c372ca75c4d9c27a7695f396ae019222a84cea3e83af43aa72b21a3982fe8ee8245ed721de46f
+EBUILD gnome-settings-daemon-3.30.2-r1.ebuild 3875 BLAKE2B 7f4d3b773cc18afa75b4f36841af72379e420c6303df60adaef601458f30dca91b71e8b5131a993b20cdd00383b58229fae09cd39728e34381bfd5571a83ca1f SHA512 08087204d178e434573672c51a33f56a43fcd72e467bb4f8f0eff0edbda5859b74764b582f3e166b296be933c6293c4a3d056faa5d5080a7a3f33bf75bdae262
+EBUILD gnome-settings-daemon-3.32.1.ebuild 3839 BLAKE2B 8cf70b7daabe2c64a699b7db6742a410e2d7782d1561d47006a3176e278ba9b93a77cc6a317ae6ad4c5a4949214dd5fd580db1a2344976b3dbe652fb7c67fed7 SHA512 579ae05ed8660ee8ee2654fe93598cbbb371960ad5c784839530456bad7b14ac28044746a6b2114933b03c8ddaae228a779fc7df6365a02af1094dbdeb01ebb7
 MISC metadata.xml 454 BLAKE2B 271588e1f1a6a9799ba121f1da6f69ea1b5ba4c006f11c3a997833eac097143ba19bfe445759f17b7269414892af5efeb04eaaa752c0c330e1238c66004f30ed SHA512 ada9cf6a61a63bd96807bd1c4840a19ed2e59b7889d54af7796ec07af6b8250ce03953d907545c92aa75c59d2bee3ecb4120c571f1830a5c2b06e4ebf7005eee
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild
index 256ae196a670..af0a71d5c2be 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~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-settings-daemon/gnome-settings-daemon-3.32.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild
index 92e5c92709b2..5b7a8c993725 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 ~x86-fbsd ~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-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 3b93e96c016c..d7484d8cdfec 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 4222 BLAKE2B 5bd31696162085f66b239bbfedee05c4df1eb3bed2bb7c087623003a16d3752dae9f1e8d1ea242c9b77eccea1c82f4a13712da1f58ef8e1963d5940aca1b552b SHA512 32209abac28214f80b38dca58e06241a17eb13b568a3fb93a8d38e98d631cd2890a98b7be99a7b37c883f23e3a24e0f6441b6d81b973652f9208040778f1bbe7
+EBUILD gnome-vfs-2.24.4-r5.ebuild 4200 BLAKE2B 00cb94196fcd6d641c89a66bb16c8fe7f56c2b81827795524ea51e980920379c2ee31fe740145ff5541ad30a8c712b68074b078a43d0c15a6eeae01c7ded3754 SHA512 77ed69bad4dd96839bb88cb6126b7d9197936870e080f8a685bbcf0641a90ca5b2b782e550c9005fc87faa52f9d4ab36c8e5c07f387ab1f138cbf60e008f4636
 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 8195abdc226c..08f7e4ec87d2 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-fbsd ~x86-fbsd ~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 c8dffd4236f1..679d6bd5e78c 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -2,7 +2,7 @@ AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 DIST gsettings-desktop-schemas-3.28.1.tar.xz 652416 BLAKE2B a9ddf44153a83fa188f873e6bca29499e1abc7dea310c6eda3193233e363607781c93bca64a9ddf2f31137e22e54e23b0f139e90ef99c181aac9a976409b6c94 SHA512 2bf3260e976943e9d1e51feda62ef1e432870a6d9b34881afbdf99ddbe4954e5dd679697e152e793a0b38492dbbc4891018f7aa8cd4e703d05a8647cc5a56785
 DIST gsettings-desktop-schemas-3.32.0.tar.xz 628888 BLAKE2B 7d675597d861ee8ee8258f037d06d6f728e9705c7e121508a811bbad000b1ef10a7e2ef23066cec01c34865648f4f0a204716306643db1a4cbd505801ce939c1 SHA512 cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc
-EBUILD gsettings-desktop-schemas-3.24.1.ebuild 773 BLAKE2B 0e1ae32f96f19282f026d4247c1dc95000525836c0d8528d1ee275ae5bbe4511cf2f23fdf693a56480e83ad22f620d03c8f24bd9a8d0b236f5bd976f404c5892 SHA512 e8b192cb63c0a765b79c14db77b6fe7d205dfacb78875ef3038d8eea5a54c180bb6db3e6c8664c20960f7aea38b39df2b968003abd56ef2f4273e7c78df08e23
-EBUILD gsettings-desktop-schemas-3.28.1.ebuild 774 BLAKE2B 9d1190a947d62b14390a6a89588a6eeebd7555e2af8fdf24195a047f496eb8f60ed281776118fe2815f1dc7474e717b2e7121c3e8c6343eca706316512155fe2 SHA512 6554ac3ddc2149e8cbeb6723f197cb5f467e774404d6caba1178a04b121cbc0e2ecbd73d946dbd9ede5a3224e9bb0cfb1caee7fa5af2eafe81661fe4205a0e20
-EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1051 BLAKE2B 8bd8a0a8679e29dd23acc20446fda9084779f9258e47ac0cf9a5c93119ba1af48cd85a32e28ec38f55fab366442de879e4b6d1370ded7df6f9b9c3e92b764731 SHA512 dff9c3f5772cc31a6b5a26b6ddc7160013d1efd80a90ad978e3a2c3726104f95ae69ac507b0015ef57aaf8a80ea733d2940889e2ebd728fbc8dd4ea80a1a8d87
+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
 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 360de4ab49b5..b58a9346233a 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-fbsd ~x86-fbsd ~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.28.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild
index 93741ea14e4b..51692079e8d5 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.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-fbsd ~x86-fbsd ~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 d03664abab07..5e1c2cba5a01 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-fbsd ~x86-fbsd ~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 1d14a1867401..3cfb2ebfd72b 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -5,7 +5,7 @@ DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa
 DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
 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 3817 BLAKE2B cc34335728255ad00d94d07c54c688c3726087f22c24cb953c9c8665b4828630b918b5979b6ae691c05f558eb7368e8719a509e4060ebf823338ced2c3c6bb46 SHA512 c4128d4025b38738492802b713e927cfc7d2084a7911a7504ad8cc115ac32c445085761ebf483abe15581c609a517d3c1ff8330d110e236e1730133dc2ea3576
-EBUILD gvfs-1.38.3.ebuild 3775 BLAKE2B 45564d0084c02f875597a1dcc12bc5f6ee9ffd09c4a0182385421dc3e1cb7858785a115e7421f3d34858bff84d174de7cf6dd40f152c1789e12d0ecd46929ec3 SHA512 b52da884bab6fb91bff321a4eac7e66be3c363c20123565ca66a48570e0974c4251ff0ee0e1cd11a67177b1f58929a678a5b496525462333e51bef0ff86d1d69
-EBUILD gvfs-1.40.2.ebuild 3810 BLAKE2B 98b641202e0456c08a74c0fa2ff62cc018de7b4985a826de103049d9ad7e13ab0237f4b4e5e3977fcf48778a214cc0ccacdee802a5ad1642bb0168206103d861 SHA512 242c531ee81bf2fc9e4a1d626586470f81f42b22e585bba2b2a550e2b21d6614144c5e8b7df6507cd44298cba279528d5a3c87e47740e99cc6f2ccc00a6c0d57
+EBUILD gvfs-1.32.2.ebuild 3795 BLAKE2B a598524ff257c549015b0998187f9400197ce0ca88d25b45441da370f78ab384f177434aeaaaf483653bc733661406b061185726b87aa62e5b080a764ade4540 SHA512 b56fe15c08989ba4a2e1b253982e4c2e058ddfba96b406218a1e982529bbbcda9b0f064170dd600192c3d9e374728eeefba3652983cf1c8abf6def1c2b23e305
+EBUILD gvfs-1.38.3.ebuild 3753 BLAKE2B a2a719f5ae13b9beb8cc8d88a8267f59e897cf0a57e8f48ee3126896c20528e6f84302428793af99da8c46610378b2de2d074cfb34805ac435b20430ffc8db9a SHA512 f703720eaace138acc3775e9f8cefc3fb2605b07e35d2015746524c6dc9ac4fc995c1aee147019767bf2053c643a30b790edec20985a260c578c345e97eb1b44
+EBUILD gvfs-1.40.2.ebuild 3787 BLAKE2B d85407c20e10d65a294e946a51467dcb2cab19540356db0541b8308424dbaa15367ce539780ad5f28fc7282de65a95cdd3afacb23f0f462ea800530e5b2f86dd SHA512 5ca2774045f18edd007db5253e5a2535c669bbd00a4bed29ae3def1ddb7c0512aee1e2902ac9b73b80667dd61aa6a0023abc33395b8a9cc3eeebfcbbc9a2841a
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild
index 1ce70934c752..9667da5811bf 100644
--- a/gnome-base/gvfs/gvfs-1.32.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.32.2.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	udisks? ( udev )
 	systemd? ( !elogind udisks )
 "
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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="
 	app-crypt/gcr:=
diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild
index 95672992cf1d..d0c51873c96d 100644
--- a/gnome-base/gvfs/gvfs-1.38.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.38.3.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index dbf07c77c2de..530519c88e4e 100644
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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 f8f42a8fc31b..9462643bc9b1 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 1554 BLAKE2B aba479d1104b5c96c54e369c3413b89691970cb2dfeff6a73ecf45f09a455d4594e39ff8d17f060de3074f7181cc3795748d5ec1487c5a1d281dbe0880a44bf4 SHA512 4bfb2829fc703d6bcbe573f3586e31112d4566d4e3529ed2a28439e9740a16472fa51d03f3a25d562acd104da55948d4a7f8231178cee906b9b7bb3008b15086
+EBUILD libbonobo-2.24.3-r1.ebuild 1532 BLAKE2B c4a8fbb2e34c4a272cbcc2e88c0c01468eeb783c8bf24c373baf9c1c10a3ce8126d1de8ce63fb923126c5085c1f15767a6b2792e9daf186b6fd88c84707f9cba SHA512 0d74b06659c1bd5156e86be52dcf51713c706653a13de8cacc7b605e733c3b2613e825b7af5f5a34dc8f49becf4ea73e303cca250b3f90e5f8572779e623661a
 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 4d43751f3952..fb75eb43b8b9 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-fbsd ~x86-fbsd ~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 f683f4d929a3..ca869cc30884 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 1353 BLAKE2B 9732816f947d6a5ac012df5c32c11d15867a63b0066eb07e64c20c9efba820fd6b820540af2611ba43efdc08e517f586a962bb01d9f42c94624a0c5938dc4137 SHA512 28e09e22b6161b90d4a4be92b8d25fb3c66cc36a1f94f45e288256b5c62a55f65fe9a6065e1320463e3c6e2c4a7ad79c7da0ccde8a7681a93f31e829e6457294
+EBUILD libbonoboui-2.24.5-r1.ebuild 1331 BLAKE2B d67c3cdd1b3fa51986d066b38acd943668eda931f3a13f6e680cecc463bd4e5c5feb05f750db8624cb12cb09fb518f0594cadbc653f07898c4ef9c546c771b75 SHA512 2c5fb9a0167c540c2dcfe23e8ee7e7db541fd95eb32ee5dcb9ac79d8251111c547f38c56479a25c715f158ed0156472ae2164b43d7a56d8a9f73b63653db3ea3
 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 56b1c70caca9..4ffc7b9fecd1 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-fbsd ~x86-fbsd ~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"
 
 # GTK+ dep due to bug #126565
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 269f51f2bfa8..4f97d5d551f1 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 eadac429e2526cfd5f42def2fb64748e9e75611fdeedc8fc76921b29c0f416ecc18fb7bd66c5cbd561320a716921fcc9c3d737df965688300737221d7cc5a9fd SHA512 2142c966b1af34618537ba475927aeac883bbfeb79fa716705f6fb75b0d1a44429b159c6fb9358e2bb470b42708cc5e9783239591f31e00a4890ebc297b2b27a
+EBUILD libglade-2.6.4-r2.ebuild 2839 BLAKE2B 11ce26a0eee48504cd9a446e24c5d82f47f97823b93eb6e314e4298574fb8228e4c17a7b804632ee4e78391451011f15f8f0b7ff7897c6c84d9a6f5a11bb3e6a SHA512 5e794bd0abb82fe8633c4877e53e1f4268087935243acdfc6e5f00a3729da0fd76a503cb12789e02d6ae5238aa6c36a5835ae02f0aa8da318bdd73c5fb5196af
 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 d9e5ea5dbe11..d70b6e70bcf2 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-fbsd ~x86-fbsd ~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"
 REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index ca6b71a0835b..75cf9abc4ec2 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 1864 BLAKE2B ac7530073cbbecbc358d35ba2b074a60269b768fd798e2a365bca2c7519bab54f8b492d85551af75fc470460241295aa997a92f9384bc490e27367842f99fb47 SHA512 c79713a295dbfaedab3712d8d2eb7a010f7779e88ba08f757e304c5dc234b6fca201ea280aae4c6e4f0813daa57ce15fcbf2533ff2669152f2d039d65b5fcfb0
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1842 BLAKE2B 6e21c17b37b15032a901010cba48f5d5d45472b4fe03699392c5a18fca95ef35ea3bf13a6f93fb4f53b88e00eb3af9b55364dafa63a12d9dca44d34375bdfd99 SHA512 75ed17ac41ec43f6d57f9e7275be336a3486d31510205b421f334f1f863190d61264210b98e09c51ab87d561884901ad31f3cee68faf02a65eb74398104f7c97
 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 f28d203f3f14..d5269092cc48 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
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
 IUSE="debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 090a708e04bc..489714b4d024 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 1789 BLAKE2B e1ec0ef50077a5056443c41787b6ffd9c94d2e2c6af9f2023b1ab8a127e9b48793474483ee9f6e91401449718b5e1478f36af01154703485c223f6ba865bd228 SHA512 561557e7b6f602141d78b812f233712a3dc8593c3d64702c0ef632eee3e7036defbba95995df05c26526ca0b72582ead89ba07d6170dadd797f6d64f2aa11939
+EBUILD libgnome-2.32.1-r1.ebuild 1767 BLAKE2B 8345279e4ab16816a8593ca8ea8a13a514367f2c451e115b4a599610ec92eb9251257d4c9c8784965df0fe9910ddb93c86e9e78cd57150f9eebb1bdebffc4f0b SHA512 eb309902bbe62dfc52db89a22c2d3c896efe186229e591ef42ea89fb47833f3e93fb9d6d694a1bc90d4b6bd0b7b757e328cda41bf689c39cb7255e571c6276b5
 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 7134bf05adb7..3e036fab858b 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-fbsd ~x86-fbsd ~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 2bb3c90ee961..1c0e79f127d4 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 1698 BLAKE2B be182aded1ed792f953fa5a179fb3c3e2d596c1d912ff922b7fb868f9c72c132280bacef46b9ed690f2654377d2e42454fc0377090ac2829c9324ecd2db7027d SHA512 38aa0c01c5d3582bfabfd8b713b35377edc8f9e58ca20b59440718ce48bf2576cd2ed714bd4075f92ef3a7eb00f119175164db9e5818531ae18d88bf3f783b3b
+EBUILD libgnomecanvas-2.30.3-r1.ebuild 1676 BLAKE2B fd99123fcbc4fe0a6723078735a07f7a04878755ca44a529f9ec056b5d7c1fd913c92399e9c8377cc34b5236008e89f538e69001062b179eccd14612f6c3fa1f SHA512 fe922f2572d6980771e6e8f109a81cbb4afdfe75a800bc22c44a57a7c31f2960f084c75785dc4b57474bd752a889f8c3fff73eeed2da2ae58a9d779191d7007e
 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 bc2ea1b97966..dd2800efe961 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-fbsd ~x86-fbsd ~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/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index f9dba7188747..2d1c252313d7 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 787 BLAKE2B f3d17bb3e3ffff4fdf1f0017a59c306cffe8f46ed9dfb14f210d4e38408344d33cd11bc190218b1d2da40d27d3e7f3cc62b0a66612463574a84d56aca29bc9d4 SHA512 88281fa426ac1acc6fcb1c4c1a7fcbfca028425cf1d77eee9356bf43838d3cd4b295e76e3035a22cb446eae2265703c97d1c7b8830b995db8a305b97cee552e0
+EBUILD libgnomekbd-3.26.1.ebuild 777 BLAKE2B c9b701c89515ca459e22863296d67a8309a08cbec534f9cb17e7383f7618166fafa168e4355b140a8f278730c6c39eaf5c8419c712abd8e8e7fd663f6ea87f01 SHA512 b7951a534d36c6c2fdb9468c5bb7489928ddb2365f5aabad00e6da123d89b21b3c9d45b69edb1bbe565aef98bebba5b6ddc90b35143bd5f575b9153977e0eea8
 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 43edcbc29a62..fabd4ad7b2c4 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org"
 
 LICENSE="LGPL-2+"
 SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
index af008d6f943c..d83138bca7dd 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 1330 BLAKE2B 753bcca40813d4bbcc9a14c901e0ccc807618a5971cb93428ec2d8c14de24e124fd1bfe5baa9a9ff0b4be4dc9ff22f171eed13c21d14f4eb749fbc0c0de44ec0 SHA512 4493e1ca96231381c64fd7d5e8476f1532255e1f2ab40082060ae11038d1be3bd2fbd0007f9e7c2ee9e2414753e284a56aea8c7cf97dea5d52b11bd5597ef59d
+EBUILD libgnomeui-2.24.5-r1.ebuild 1308 BLAKE2B 34ebba66044c53aa36321eb17f4a7e6cd18662e00f5d07ab019172d5bfe98a49595d8807e68aa022111432616b59468aed16e5b7e1b55563bbc70d03090f8d54 SHA512 12a5620fcf1d4db5d7d045c452eacb8b2f845e195806764d7073bfe4743e69c5909af2250ed88e77cbaed3bca983019c184d4b6412bf97998a7554157e3d34cb
 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 31b9073ddb12..beaff76d872e 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-fbsd ~x86-fbsd ~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"
 
 # gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index e70658785809..b61541bc5505 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,5 @@
 DIST libgtop-2.36.0.tar.xz 727072 BLAKE2B 46f24573bde0bcfeb2210ea08446f6e6590fadc5697745178133ce5f3aec2e464cbce8446d2dbddb9f05d4a16eb7daf110c4554778a28573116b2b59edcf556f SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5
 DIST libgtop-2.38.0.tar.xz 729700 BLAKE2B 2296741d6c6bd1c9eb17be10e480dabd732e956826c859c176cbc6f8f03259a3b2f2f04d6c55d1c562b082f7e880bb4b7a3f07a66d7f24660085387dce078879 SHA512 96586b7f12a2b63c5ec7f69c51b6e28361a7458f24f20270fc589213bfae43ae99d1e39efb6101d189741bba084c887554f745131e99d8ed90b7db6d53c36e1d
-EBUILD libgtop-2.36.0.ebuild 770 BLAKE2B 71a2bdb383799450816be360031d49f469974bd5d7d75a5c582416f53c00cae349bdcd8017cc97badb988651a0807dbce09adb1a28b5dfa2f39760674560ea94 SHA512 20efa1d4e1cb504c03cade5ca3490600a7c6b6214f5de4f905fedeec4f14c975f13550f89be1167eb249e465fd19fb7cd6a0df67a237fc4a3d1b2fb6c7233ad6
-EBUILD libgtop-2.38.0.ebuild 768 BLAKE2B d6f80d888ada1101ab256af2460cc1ceb9ee7dd6d530e3e5b28b29d255b3955e54255ea69be9a72264369ff81e4b569ebe976f2a2b1518b35337037a8975684a SHA512 1d3ed46b0ed0d64e4063d4bc1a0da132a641d062990bed69d78c35eed8aa08e6f0f588e0abeaed083e8daa4de085ab56299688ac25388f51d517b776a849ed03
+EBUILD libgtop-2.36.0.ebuild 760 BLAKE2B 51f5c9fd3cd106a65734731bdb27f66566e46134badd16f5bdb3c6458f22123b4a14ada6efffd21261bf385988461362878d19948272fcdf59088dc85719faab SHA512 c16fc5faee41847c01d4cc1f6a0c381f2e7a6a3a78c54a97edd23881decafd66be478e6ad247c146be91a524f5de193e52093cc284033a29850fa345a7bda143
+EBUILD libgtop-2.38.0.ebuild 758 BLAKE2B 3efd133c35a29436231ddc15560c8708dd162bfb53f0b4abb7f35af686ac54759e1a863f413484ebec3332e8304eaa0ef341882b3242a27c79665d49a5f238c3 SHA512 7b96cd6f20c6c2b6f346902c4ecdf79a83db76af9f3de7225fd9de3b1b4bf86c2da96b94226f8bbfe242806d7f261f832be24d59a83592915cb64016c2bd704b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.36.0.ebuild b/gnome-base/libgtop/libgtop-2.36.0.ebuild
index 6d26117f85c4..a961f6e069aa 100644
--- a/gnome-base/libgtop/libgtop-2.36.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2+"
 SLOT="2/10" # libgtop soname version
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/libgtop/libgtop-2.38.0.ebuild b/gnome-base/libgtop/libgtop-2.38.0.ebuild
index 774d471e1b15..e76ac8261411 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 ~x86-fbsd"
+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 3bd55c4479f9..6682f16d00f5 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -2,6 +2,6 @@ AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f
 AUX librsvg-2.40.2-vala-out-of-source.patch 1066 BLAKE2B 43bb0dfdc90f3fe3084e23ee5d275d92e41a60f7f5c3763180c91232f4543fe93b036ff22a455247b15d09f514bd8a9a4145ac1aec09b444cb9fc5414410c4b9 SHA512 6a8e8035183a965c7359c6258cde5a842c2eda662a9ccebbe27ea27eb978591255664a837124e65f25e2653980c354c6c4b9ae11427cc27fe46ccfcdcde8102f
 DIST librsvg-2.40.18.tar.xz 574384 BLAKE2B 964997ef3bd5f8bdcab43e67f22d12458683c0eeee2fa81e7a6199f6a31c7ac11c599327a6a66118000f63549ea735a042c71429635f6dc9bf073f12eab067b6 SHA512 faf503d0d881801ce129715e7ae979ee1675bd32beac9170b1889c94aac64caf486968bc86f3480463b84e94f28c1d805551ffdcb7068ecadd0688146e0fb182
 DIST librsvg-2.40.20.tar.xz 1796376 BLAKE2B ec8e7308a0255aa22038262d69019e810bb78b92e3de62662b53ab375110c8186e565e1eb7f5825c61c6d10bed1876ff3f7a06d1073e9676a3d2bb5dfb6b791e SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
-EBUILD librsvg-2.40.18.ebuild 2686 BLAKE2B c93c8988aba169199d3c631a9ba394b0cff890f6729bc7f7373d434e4653fec755a4421d70df6406087d2d22b795d2c59f7389e13eac37adc58dc90ddd02387a SHA512 52fe6200b0ea54eb7211fe22f84914bc14791adb29703ae720d8ac843219794674a109a773ddc37ac55d82d7e235cee9d089fc4de5b78924276d210fa691acbe
-EBUILD librsvg-2.40.20.ebuild 2691 BLAKE2B 125e33b13491128b95575e31415995d9994b36f0d0ee4485da9967af8c784aa9f60116c63f17f459703c15edf4988b8a0eb682188430f7a512deb53942c7a451 SHA512 aae6a152d79f7b36894521fd2bd3432a3d521e6a9127d8fffe4dcf04e7fc27544b9218a23db59f633f375657e55c8c33d81247e3b45b525c14b721dd37807f8d
+EBUILD librsvg-2.40.18.ebuild 2664 BLAKE2B db423b9dbd58b0795fae4c77e4fa261da20ecb0e36fb990457370806b7ed29546c70fe68c181e1980ea143f24e2372bcdc4224c934f3bf618a37b2ca153636cc SHA512 0f53e104b4eba5a31153d749d41366554ef900a14f86d213781b788fbc7d970a3c64f70225533133d87615b9424c6e246db8611ec59458833cae7389cece9cbe
+EBUILD librsvg-2.40.20.ebuild 2669 BLAKE2B e184e19b698f81d05e09159673a56164cf8c39554134544791a5df9e2f4f3507195b390422fdc2351fcfa1c1fefe5d54e3af7e6fda237b0d2a140a03e733a8c2 SHA512 afb7c63a0f7f4c097a67b5dc0c1a0271b26557c321ba9ffc9e9c694b87bbfd775901ef815792cb99f976d609b09a297711fa00d0162e46ebdd71a080615a8f0b
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.18.ebuild b/gnome-base/librsvg/librsvg-2.40.18.ebuild
index a98ec7330c0a..8d60a0d105d0 100644
--- a/gnome-base/librsvg/librsvg-2.40.18.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.18.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-fbsd ~x86-fbsd ~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/librsvg/librsvg-2.40.20.ebuild b/gnome-base/librsvg/librsvg-2.40.20.ebuild
index 67fbe6709fdb..258ad748ba0a 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-fbsd ~x86-fbsd ~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/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 5b04f78920b2..a7b46f0d349a 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -6,10 +6,6 @@ AUX 3.30.5-thumbnailer-updates2.patch 1841 BLAKE2B 261cabfc7ee8334bbf00b469a601b
 AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a
 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 2822 BLAKE2B 6b115495fb078e7eee306575f3a177fad9dee08b898e28980319656d8dd6624e568042ecca60ba164e474eb71fbe24834797460edaaf2ddfaea6d3ec608d195e SHA512 4c3a802cfa10e8315ecd854dc64f7a2bde19c3e2a3a196ff670aa01a40de83abca7ab27c98bae8898343316333192920f3f12450d267e9d38e04b77e1aa2f0e5
-<<<<<<< HEAD
-EBUILD nautilus-3.32.3.ebuild 2965 BLAKE2B f0ae2d8d8df70b9e5c7d70027c6b1340ea518f77c3d8625ed9240255a11bd3ccb9ef2e83fbe006b83f2e71d1d26714d8d5dc79314594c1e2a7e33bdd07b3005d SHA512 23ee9d7623c6121e4ec67b8a9db0da41ccb7fca90fd62f76a3012115499c2585c99334d1631f9dce1d150abd1585da203c7d8cc398601fbf48423070e3bcffe3
-=======
-EBUILD nautilus-3.32.3.ebuild 3078 BLAKE2B 91ff9260991be11484aa65e12f945708658d13cbbe26a557a5c5b8e7025d826f5b98eff980171865cd71d33d392f216dc03ae76bfd52554216ab7fb12c8dd3c9 SHA512 b6b8634003ad671d6cff134d20d4fd6a4d1b8f2ee840c6413ce9bbf1cc5969aa6fe13377e70fe474733c15a0e4461c55169f83f24543c7643efefcb641d39adf
->>>>>>> next
+EBUILD nautilus-3.30.5-r1.ebuild 2812 BLAKE2B 3f0057267cfea02f9c6d8db52363a24efc52836f932130c23ec64363899ece863590655aa87ffe323667033987c7999a1eac5cef897696688245e078f755c9f1 SHA512 481cde050147e497327d95d0cf1793653cf79b25b4ed74a9452e62e368330aa42f62e3056e16db54fba8bf681befef1dc1b7c61a38b6e43db3c914761c126361
+EBUILD nautilus-3.32.3.ebuild 3068 BLAKE2B 374cda29507c72db2a4685f616f1182e4313cfed13e20dbd7f50de6777d1c6bc7d186b7e4f1cdb55cd772f89747aa21bf6ce89072441ab226505773b0dd4dca6 SHA512 382a40f8b3a208b4b02887ad2ce3e113482c9e45b84bf7d415a546008398862ccde7891826f4278fb0eee89e40ab12d9b75cab7efef21e3eddc7303e36a4c4f8
 MISC metadata.xml 652 BLAKE2B e4161f58861954981a6837a9b6c7f6dd0b76dc84378ce2d9caea1375973d490751ce966753829b7b972a6c75d04519820f4cde8b6d4edc3b9a9abb7477c68a90 SHA512 a1906e74bd47437d2226ffb977f3f3d8c981a32f8d54d0f9e0156932b001b6e205b0e5b78ed5badb0b89c1ed1ff107f67e026bf5c4b088cfe95e2b69de8c6981
diff --git a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
index eeea495a5de9..cdb86ae33285 100644
--- a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.55.1:2
diff --git a/gnome-base/nautilus/nautilus-3.32.3.ebuild b/gnome-base/nautilus/nautilus-3.32.3.ebuild
index 3197ede8970f..0b50759cd36c 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 ~x86-fbsd ~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
@@ -35,12 +35,8 @@ RDEPEND="${COMMON_DEPEND}
 	seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
 	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
 	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
-<<<<<<< HEAD
-"
-=======
 	>=app-misc/tracker-miners-2.0:=
 " # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
->>>>>>> next
 DEPEND="${COMMON_DEPEND}
 	media-libs/fontconfig
 "
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index bc4b4793933f..0725ba99decd 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 3065 BLAKE2B 1da5d76fe33e7d89c7a2e754d22fd973f934bc8bf8cc3164916a840991c13c0030d1fa98c0b4a1c91a3cc9b032593f1581b62125aab9ea5616fc9bad3af874c2 SHA512 eb5658577d64ce1219481090304603bcb05c4cb9ee375fe34008bba41b1e9fb5344444007ed5aa1432d445e337a718e1c1839021b25710b5e0428ab664b0e776
+EBUILD orbit-2.14.19-r5.ebuild 3043 BLAKE2B f25fbebfdace4c2ddeeb4baa15c397f2cb89efa67b30a3e8920376b37db2699488d190c824f05e3f2692551a285f638a2310040ac3d11d3983bf992d427a7f71 SHA512 813fd64737cf36b7755004f6dbee5f40e5f9d5a50aa863356fc0839cf728e2a7e8856c71a76d0996854369b70e9543a365eb15c8ac08b2efa642915181b7be52
 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 377415da73db..9c20ea842bf6 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-fbsd ~x86-fbsd ~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"
 REQUIRED_USE="test? ( debug )"
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /gnome-base
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)