gentoo resync : 21.06.2020

25 files changed, 18 insertions, 437 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 89fee2bc38e8..8c49e3afb7df 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 6b9e4e8b8a48..449fa89b6e80 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 3644 BLAKE2B 4ac16d864d9098701583a1fed4911a8038f39db663e640eab8350fa25d197345b3eb50433ce43e93926792eb5dc93b7a870e052e3a1e10ac44cb92afd85c7d8a SHA512 ea8156912de5e0bac97bb7a95c01f73448f1111a370f20e72cc3965a8ec2f498322472d2192e5d12f482faf15ff7dd9dcd0bd5d91be72e740f95ce1c5d808d8f
+EBUILD gconf-3.2.6-r4.ebuild 3617 BLAKE2B bb8a10f13cd7598daa7418e3f8324a6ba0c2fac9dd9aa292e0a3723bde5ae33aa368013924589fff534e0a15f079a7c2fff43854c17880d20b7d5929fa0c511c SHA512 7a572f25580c947e4d7a7e114c2c1b21b1a937d44e498ffea1ce42c110a5a38ff6aedd373f88ee9e711d9e56f3b4b0d361c2af264c25bd39a65d1fb4aa28652f
 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 ebaac26eb04b..5712c7277f6e 100644
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 2d6dbdb8c8dc..8b5c2178fb9a 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,6 @@
-AUX 3.32.2-fix-tests-without-locale.patch 2883 BLAKE2B 437a89de9d59781e0a3d6ceb46401abb8cca1d0325ace9f081b90f8e32c81ee283c3062e53a107129f00716d30e3ecc48df8be9889d7828bfcd0d4f38dc27622 SHA512 a33ed8fab6b4c0dba96250aabe56075e2f3ded3354f533e23dd9a222981d351a9900f7d3cf3427a2f24912ff78e843a5f08e9aaf94d71a16c7e81e99e08a8d81
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-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
 DIST gnome-desktop-3.34.5.tar.xz 718008 BLAKE2B a09daf4f575b26774beeef8e9edb4ed757ead7c0155aab4d7c132bf503d29096c40b06d52aa261594c6db367ac7a638c33de4445748ab3d94a095c23f8ddd705 SHA512 bc59b420d5698b15697404efcf452e830933efa23b6dba9011eade1c7521dbd4fb6f6e6e2be822d231611b2133e36f2ec42ed49ecabd175127366e0e7d59955c
-DIST gnome-desktop-3.34.6.tar.xz 718144 BLAKE2B 7379f45b7028ed16f4f707b82adfd1c95150791da9988ff52f3b49a9be68effefc04e32512fb4316368d695ae531afd8ad58168214e483fd0164b45a2de7f1d1 SHA512 a4e6c8ec1f5cea785bc58635dc72dae39a0a118db5433a02919c8fd3c4f7276d6f1093e8f52b1def5756c161effbedce20c6dcfe282a5a3d2458acc82af60aa5
-EBUILD gnome-desktop-3.32.2.ebuild 2251 BLAKE2B 4db77f0b8ee01c122943d3e9f3cfff22d1d2a626066588308b9750bde7ffdc6854f93af56f5de9b6ab9d2e8e6f7b9eb2d82aa573a9ec1901722efbd6667bc2c7 SHA512 c39916311e8b2b49dce90c9d122a4cd92732f1b0f2d41212a8ad1f4ea4b406d24480d93b9cc80999369324dd48310d11ebb3f51b41de4f7e55aac3597a2ee75f
+DIST gnome-desktop-3.34.7.tar.xz 718220 BLAKE2B 89bfd00a356cd47d865aa4df1079b37b08c6a85f4380b5424181ce247248c7f11f0ca135858afb0c00fc4ff47175ff2acbb0b67cebe75e0b0a9f27263f0a9d69 SHA512 efc466d2a7a8a142e76a07c8cb75bad51aafbb2e70432e339713965890e6a83554a5f77ef6cdb6aa9e3ebace4883fb6d3d06004d7a2446d6960319cacbec7639
 EBUILD gnome-desktop-3.34.5.ebuild 2022 BLAKE2B 67eb2266a63db598d5fa7fe26a7f8ca9206335685c310d821da32c5bd47319aafd703e4f12353310776098734eb5496e3842c20ed3dff55213843ed3eb1037b1 SHA512 0a32a031cb21a1b977997aa498edae51979674b01f15cf79f8876e3dca0e6498280eab2242a0fd948b1a7443239fc87d69113ca6b3b8b103f32dab5bba889301
-EBUILD gnome-desktop-3.34.6.ebuild 2025 BLAKE2B d6d578b59bc7154ca8d5e5c452c4fb96c187f4e9c5cb8d33de6a443d83f410a9b027aec5352a70ce46aeb681495f414ce51fe03b95b837c4487fb57f8012a493 SHA512 14d7eac731b31f23346dadbcc00eb7f3a99da34a085a278fd3c1ce7f46bae40d75ce5eb9c7567fe603c31b15520fa873806d7777e5f5fd6376c26f60b86a082e
+EBUILD gnome-desktop-3.34.7.ebuild 2025 BLAKE2B d6d578b59bc7154ca8d5e5c452c4fb96c187f4e9c5cb8d33de6a443d83f410a9b027aec5352a70ce46aeb681495f414ce51fe03b95b837c4487fb57f8012a493 SHA512 14d7eac731b31f23346dadbcc00eb7f3a99da34a085a278fd3c1ce7f46bae40d75ce5eb9c7567fe603c31b15520fa873806d7777e5f5fd6376c26f60b86a082e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch b/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch
deleted file mode 100644
index bd4df1ca1a91..000000000000
--- a/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 9ae847ec875efe443d51d584fa6c61966c7c3c7c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
-Date: Wed, 4 Sep 2019 22:09:26 +0100
-Subject: [PATCH] tests/wall*: Do not fail if some of the locales is missing
-
----
- tests/wall-clock.c        | 14 ++++++++++++++
- tests/wallclock-reftest.c |  5 +++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/tests/wall-clock.c b/tests/wall-clock.c
-index 4937ee66..23929ebd 100644
---- a/tests/wall-clock.c
-+++ b/tests/wall-clock.c
-@@ -48,6 +48,7 @@ test_utf8_character (const char *utf8_char,
- 	/* In the C locale, make sure the time string is formatted with regular
-          * colons */
- 	locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
-+	g_assert_true (locale != (locale_t)0);
- 	save_locale = uselocale (locale);
- 	clock = gnome_wall_clock_new ();
- 	str = gnome_wall_clock_string_for_datetime (clock,
-@@ -60,6 +61,10 @@ test_utf8_character (const char *utf8_char,
- 
- 	/* In a UTF8 locale, we want ratio characters and no colons. */
- 	locale = newlocale (LC_ALL_MASK, "en_US.utf8", locale);
-+	if (locale == (locale_t)0) {
-+		g_test_skip("en_US.utf8 locale not found, skipping");
-+		return;
-+	}
- 	uselocale (locale);
- 	clock = gnome_wall_clock_new ();
- 	str = gnome_wall_clock_string_for_datetime (clock,
-@@ -73,6 +78,10 @@ test_utf8_character (const char *utf8_char,
- 	/* ... and same thing with an RTL locale: should be formatted with
-          * ratio characters */
- 	locale = newlocale (LC_ALL_MASK, "he_IL.utf8", locale);
-+	if (locale == (locale_t)0) {
-+		g_test_skip("he_IL.utf8 locale not found, skipping");
-+		return;
-+	}
- 	uselocale (locale);
- 	clock = gnome_wall_clock_new ();
- 	str = gnome_wall_clock_string_for_datetime (clock,
-@@ -112,6 +121,10 @@ test_clock_format_setting (void)
- 	const char *str;
- 
- 	locale = newlocale (LC_ALL_MASK, "en_US.utf8", (locale_t) 0);
-+	if (locale == (locale_t)0) {
-+		g_test_skip("en_US.utf8 locale not found, skipping");
-+		return;
-+	}
- 	save_locale = uselocale (locale);
- 
- 	settings = g_settings_new ("org.gnome.desktop.interface");
-@@ -192,6 +205,7 @@ test_weekday_setting (void)
- 
- 	/* Save current locale */
- 	locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
-+	g_assert_true (locale != (locale_t)0);
- 	save_locale = uselocale (locale);
- 	settings = g_settings_new ("org.gnome.desktop.interface");
- 
-diff --git a/tests/wallclock-reftest.c b/tests/wallclock-reftest.c
-index 8ac630f2..0a7e812d 100644
---- a/tests/wallclock-reftest.c
-+++ b/tests/wallclock-reftest.c
-@@ -446,6 +446,11 @@ test_ui_file (GFile         *file,
-   locale = get_locale_for_file (ui_file);
-   g_assert (locale);
-   loc = newlocale (LC_ALL_MASK, locale, (locale_t) 0);
-+  if (loc == (locale_t)0)
-+    {
-+      g_test_skip("locale not found, skipping");
-+      return;
-+    }
-   previous_locale = uselocale (loc);
-   g_assert_true (previous_locale != (locale_t) 0);
- 
--- 
-2.20.1
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
deleted file mode 100644
index cee93712f2cc..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-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 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	app-text/iso-codes
-	x11-libs/libX11
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=[X]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	# Translation updates and nvidia builtin display detection fix from origin/gnome-3-32
-	"${WORKDIR}"/patches/
-	"${FILESDIR}"/${PV}-optional-introspection.patch # add introspection meson option
-	"${FILESDIR}"/${PV}-fix-tests-without-locale.patch # fix tests when he_IL.utf8 or other tested locales not present
-)
-
-src_prepare() {
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.6.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
index 5018ba92f323..5018ba92f323 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.34.6.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 302689ef8d82..3f68bfe161f8 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 4198 BLAKE2B 1ef10b615d1a605f3b4bea569445187deaf62f50ecc850bf01a225c5d01f2661ec00f6d96132fdd6f951fa5e2f63099254bb2d09a567d6f4b871ff832c80b1f5 SHA512 0a90ce6a193e2726d4925384e9d5439b9201ee641fe96b32e4217f9a9d0099dd4dc4fdc2110f9fd9c82abc3c9055b297bfce7e9c513230ed7ce7e0075195f773
+EBUILD gnome-vfs-2.24.4-r5.ebuild 4171 BLAKE2B 203e3dd6a795d0f2e4fb782ade92bb9e94fd669ffcdd2c419c2a1f977ca07a92ac05a0a1698c0881975ab4ef6a64ac7e5834f6e8cc8cc17fd95c626fa90bac4c SHA512 3809136bf91cec4824345ba2a5a7ad7071bfdf59d3541c8a78e0d584b28c4ed09d03e5c143bb76a56a66d19c4993616a04b1a20a2c05bc12def7942295888764
 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 8aab040241a5..2d74d7c50016 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
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	gnome-base/gnome-common
 	>=dev-util/intltool-0.40
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	>=dev-util/gtk-doc-am-1.13
 "
 
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index b8161718b44f..b8a8d3a6a738 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,6 +1,4 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
-DIST gsettings-desktop-schemas-3.32.0.tar.xz 628888 BLAKE2B 7d675597d861ee8ee8258f037d06d6f728e9705c7e121508a811bbad000b1ef10a7e2ef23066cec01c34865648f4f0a204716306643db1a4cbd505801ce939c1 SHA512 cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc
 DIST gsettings-desktop-schemas-3.34.0.tar.xz 650468 BLAKE2B a275cd011c255531b293ccb875159ea4465c79852a3d1be2a03faafa8dbb6ba7137d72c7a59bce93b6ce5f187ebf92aca334dc3c51c8de5ee3af3092fc250fe5 SHA512 6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1
-EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1016 BLAKE2B 7f58297cfc383e02cac7ab3f0ac945c4f72ff0d7b488f6087f03a91976d66d0f34a2815a78bd96b5487ec525e650b212a3d02a6d63dbe25d91c424e21dfee5ae SHA512 a4dc5205066a8dc4a359846fab989ce5c92f2f4b8f83085f7d714396ed5820a9c3f0fd5e1b5529bebc0a60cf9213b236a52f007d58d5b1f1a345fa115c3991b9
-EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1018 BLAKE2B 92720cb3ebce7dccb82cf433c29c11a02414c83bbca44be6ac8f9bfce40b5b1e69fc399ba80c215e18268d7504079703bcadd12bdc0a5e2be4e5669246a72cff SHA512 cc6bf1d06b01e963803b7b0b57923c30441e1835e4b10ec236cd0242ebf81989d8789bd72ac9f1a560596f0d223fd5afd161527dd3a1b183d8e4a28fedb556ae
+EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1017 BLAKE2B a548ba8e5a3828d64e3ce0d73e84e0703c1499ae3ac7854cd61dcd6ba99735d022f3cc090a0975b482ca35ac278420a231e1432e8500bdc1b39f5d48c8e0a6df SHA512 25be3c53bc476396887f6b1f45d7443d46182e2a571ec2d1b294d695533bd8837db346cb33b43b60f9b25ebf0cba826ee8e9cd85db56951dc745f5460c621dfd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
deleted file mode 100644
index 05bb635dd560..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND="!<gnome-base/gdm-3.8"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
-	"${FILESDIR}"/${PV}-default-fonts.patch
-)
-
-src_configure() {
-	meson_src_configure $(meson_use introspection)
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
index 4ad81888bafe..74512d7821ae 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.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 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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 fb7335afcf70..0e26de3e4e36 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,7 +1,4 @@
-AUX 1.40.2-gvfsdaemon-rpath.patch 1076 BLAKE2B eb268a3500c06aaefa0365b525d530a94c1332c393ebce3047b42ec250b7ac59d6a0c7a573ffc0616617a32e1163ad424042389af055a84803b3830ec5ad8e36 SHA512 b3c1e33e87e033efc3c23524494857858f70ef7b76b88a13bf595006cd1b1f8fdcca875cf8ebe8cba7ce536fe92fed460a957a9136f5b56b393420124fd3e013
-DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
 DIST gvfs-1.42.2-patchset.tar.xz 23932 BLAKE2B 6957c5a8a200ecff9c3294a7fb7304ae1be147e45dae1838121690a3a20b1d2557681b4efe5f722811d5302b8270d0058eedac7f8a95029cd872df3db14cc541 SHA512 0494fb36e093d06bb278a75ecbf3bc17460d5d20302a9c1d2c5b74a0b65c2a259141b515b3e80c57c3e1125df74b3cf6d2a91ae70c8e2e0af3bbca285417b9f0
 DIST gvfs-1.42.2.tar.xz 1204972 BLAKE2B ebc1c4a4ae69a809ee7c556e65f87f968806ef057cfb7f7a7d2f18614443197c1feaad79099fd5b04640035e7ab306683018676ce109a7d718e3c8d35676be7c SHA512 b786ae2e493099a0a1ab2756efba3690f0e241a53995013e2632b2d7e01628d52d72b47298c7a2b913c8d50f135c191b2963a7ffc0e768fc5c96a89f93401e3c
-EBUILD gvfs-1.40.2.ebuild 3812 BLAKE2B ca7a091366e5c9672a1ef26e77ae1a52e77e8dd56ec4b5583173c93f438c60242cfd3df5765f1cc08f06927f0a2548a6585dab7f652da816511b555647fabdd4 SHA512 86723b0572972a468824f3363321724f4fcaf4fc3a03d48a81b0938a5b3df0ac212a8744d101719f94c7e54ff68a3faaf6f41c69b8e068e45577a3fdc8b60e8b
-EBUILD gvfs-1.42.2.ebuild 3852 BLAKE2B e173a71b321be9b1ef4d6e343688886538409a05aa5870790d57642fdf334c8566c80b66bb7ed71c5bcdcf5963f633578cea48963191171f08e5a6b7c67e6b46 SHA512 b2324cbe9fa35f170c637f333892b425ab7abef2c8ddd80dc62bcbf8b04d7fa591a926ce6ffebacbc3ad5899430e767eed0201d76413f92153db7e52628ec486
+EBUILD gvfs-1.42.2.ebuild 3851 BLAKE2B 97775a41744d5ec07cd3571c0aebca51690a06264164d97eddd641f943f454f95b78e6677e1622c35d563a1d9b75a17463cf89b749726339c2a66dab0ce96aea SHA512 bb04c71b2c39a01a742a46da0b31f5473701cb17a892f56567d5f133754b5e2eb8991193de0cef387bc0b00530259ac8d5102409a536240db47904e97883fdac
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch
deleted file mode 100644
index e5d579418932..000000000000
--- a/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4fd68eb29aaf010468e154c737a03e04465aabb5 Mon Sep 17 00:00:00 2001
-From: Robby Workman <rworkman@slackware.com>
-Date: Thu, 18 Jul 2019 03:38:41 -0500
-Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so
-
-On Slackware development branch with gvfs-1.40.2, I just noticed this:
-  # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found"
-	libgvfscommon.so => not found
-
-After some backtracking, it seems that this first occurred in the
-switchover from autotools to meson in the 1.36.x --> 1.38.x bump.
-
-Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and
-assistance with troubleshooting this.
-
-Signed-off-by: Robby Workman <rworkman@slackware.com>
----
- daemon/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/daemon/meson.build b/daemon/meson.build
-index 0ce0c204..f3ed404a 100644
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library(
-   dependencies: deps,
-   c_args: cflags,
-   install: true,
-+  install_rpath: gvfs_rpath,
-   install_dir: gvfs_pkglibdir,
- )
- 
--- 
-2.20.1
-
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
deleted file mode 100644
index faf79aa4527d..000000000000
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Virtual filesystem implementation for GIO"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-RESTRICT="!test? ( test )"
-# elogind/systemd only relevant to udisks (in v1.38.1)
-REQUIRED_USE="
-	?? ( elogind systemd )
-	cdda? ( udev )
-	google? ( gnome-online-accounts )
-	gphoto2? ( udev )
-	mtp? ( udev )
-	udisks? ( udev )
-"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.57.2:2
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	sys-apps/dbus
-	app-crypt/gcr:=
-	policykit? (
-		>=sys-auth/polkit-0.114
-		sys-libs/libcap )
-	http? (
-		dev-libs/libxml2:2
-		>=net-libs/libsoup-2.58.0:2.4 )
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	udev? ( >=dev-libs/libgudev-147:= )
-	fuse? ( >=sys-fs/fuse-2.8.0:0 )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	elogind? ( >=sys-auth/elogind-229:0= )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:= )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
-	gnome-keyring? ( app-crypt/libsecret )
-	bluray? ( media-libs/libbluray:= )
-	mtp? (
-		>=dev-libs/libusb-1.0.21
-		>=media-libs/libmtp-1.1.15 )
-	samba? ( >=net-fs/samba-4[client] )
-	archive? ( app-arch/libarchive:= )
-	cdda? (
-		dev-libs/libcdio:0=
-		>=dev-libs/libcdio-paranoia-0.78.2 )
-	google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	nfs? ( >=net-fs/libnfs-1.9.8 )
-	net-misc/openssh
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/meson-0.49
-	dev-util/glib-utils
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-"
-
-PATCHES=(
-	# from gnome-3-32 branch, fixes RPATH of libgvfsdaemon.so
-	"${FILESDIR}"/${PV}-gvfsdaemon-rpath.patch
-)
-
-src_configure() {
-	local enable_logind="false"
-	if use systemd || use elogind; then
-		enable_logind="true"
-	fi
-
-	local enable_gcrypt="false"
-	if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
-		enable_gcrypt="true"
-	fi
-
-	local enable_libusb="false"
-	if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
-		enable_libusb="true"
-	fi
-
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		$(meson_use policykit admin)
-		$(meson_use ios afc)
-		$(meson_use afp)
-		$(meson_use archive)
-		$(meson_use cdda)
-		$(meson_use zeroconf dnssd)
-		$(meson_use gnome-online-accounts goa)
-		$(meson_use google)
-		$(meson_use gphoto2)
-		$(meson_use http)
-		$(meson_use mtp)
-		$(meson_use nfs)
-		-Dsftp=true
-		$(meson_use samba smb)
-		$(meson_use udisks udisks2)
-		$(meson_use bluray)
-		$(meson_use fuse)
-		-Dgcr=true
-		-Dgcrypt=${enable_gcrypt}
-		$(meson_use udev gudev)
-		$(meson_use gnome-keyring keyring)
-		-Dlogind=${enable_logind}
-		-Dlibusb=${enable_libusb}
-		-Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
-		-Dinstalled_tests=false
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	gnome2_giomodule_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-	gnome2_giomodule_cache_update
-}
diff --git a/gnome-base/gvfs/gvfs-1.42.2.ebuild b/gnome-base/gvfs/gvfs-1.42.2.ebuild
index cbb51bd5ae0d..9d564417391f 100644
--- a/gnome-base/gvfs/gvfs-1.42.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.42.2.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 42505f88cc88..f800bd138f3f 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 2860 BLAKE2B a28727a80b7950f03f3c506cde788ffc334baa7c5b79040e2e60ab239025627a2ece75225186317b11c0f46a3df2f2470716e7525b8467329f5384cbd7f9a273 SHA512 87c8b53859648625a5cdec2e7dcc1984826aa963556b57db6c7a79f766b3df0beb5080cb21d3944740f8cfc10c260369f7076896084befe5cb8f02789eeeb267
+EBUILD libglade-2.6.4-r2.ebuild 2833 BLAKE2B 9a427b6a95d8d9387b20b27cf327d57c81a668871cf0853193f499b980144caacad0ee6bcd3e0cf48655d5d4c668f8cdc43674243495d62f200925789dca4145 SHA512 3ba8b42f9a076a5bbfc103be2864494345e4095a1b4274a185af2dd00dcf92a57abbd23e7bc6bbfbaaeaf083ec36a75b88c652ebd39980c3f624f70aa5bd0fec
 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 3ce81eeb82c7..5e004a473cb6 100644
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	tools? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 pkg_setup() {
 	use tools && python-single-r1_pkg_setup
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index 7f81fd82f87a..a54c3660186c 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 1681 BLAKE2B c3a6e6a4c67188fb5a66025417a66ad6a803b9c500009eef6cd97ed0a2b3828925c3c6acd9ca9c233fd7b0ec83e332625e0eb1983e6b42f0389bcbfdab894238 SHA512 94430b5e2719f41047054b12ef25c4c95a674b0e389bdee269c4200ff357b7d857060c252616366c3c172172dd15d472ae727206215ed95d63efa4ed7cb25397
+EBUILD libgnomecanvas-2.30.3-r1.ebuild 1654 BLAKE2B 6c5a38b57c55553900c18301185aa97a9a2b6aeee35418ac930897e20509aceb272cde94dde70003294ca176617470e1718f741c1ecf6a7ab0c191f59f91f9b1 SHA512 794e745c26b2ec2c402ed6356e1adbc49fe218a471cd044014187dca4225b5173120fe255827c20f0f9e14b61b0f50d09dce92840bead98396348cb8806b4b28
 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 381c53c0dc07..f68e3014e302 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/glib-utils
 	>=dev-util/intltool-0.35
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 src_prepare() {
 	gnome2_src_prepare
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 2ad41d262960..3b227267fccd 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,7 +1,5 @@
 AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6
-DIST libgtop-2.38.0.tar.xz 729700 BLAKE2B 2296741d6c6bd1c9eb17be10e480dabd732e956826c859c176cbc6f8f03259a3b2f2f04d6c55d1c562b082f7e880bb4b7a3f07a66d7f24660085387dce078879 SHA512 96586b7f12a2b63c5ec7f69c51b6e28361a7458f24f20270fc589213bfae43ae99d1e39efb6101d189741bba084c887554f745131e99d8ed90b7db6d53c36e1d
 DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b
 DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861
-EBUILD libgtop-2.38.0.ebuild 761 BLAKE2B 1c15a9838e4be517757bed073fe6b196b862047cd6ab2595a5611601bc810c416870090caf0a0f94752115dfc2cf229857d9f61d7f1b96e9fa628b3e55622c40 SHA512 6fdbf12fb10459af5e96b82caf0cac4d6927e3ec6669742c453d2b7f127e272cfbae68b87b71125563bce4ecbf2354d201a3076435ed728462aedf401e17e53e
-EBUILD libgtop-2.40.0-r1.ebuild 1212 BLAKE2B 9a34340d70684feb928c076a544df47c64488f97422b8a993a22f0843ab4d42be646093664b90623901c57e48b3c1f54607bed231a48d864d7a315ebc39d4d56 SHA512 fa682f05a089d112e84a159b377433d80ea051c5700148e2f77543559f256eadcad874e33a43917b9609f2e7864d710b73aa7a1ca408e9da9aaac38217ebd5c8
+EBUILD libgtop-2.40.0-r1.ebuild 1211 BLAKE2B 0318bb4dbc3326e0d1692ad3e84db5d25910891909e924bc0995e762b2bd6bdce13f20632ca14d7810f6dcdb5aa553204217d8dbb0a61e34a2d741d0b981e87d SHA512 2a476fef7deee533b3a6cc5549f8bfe17e81972577f5a2f359a8db1eb4aef6f0a08c781eb938e06ceced2305864f209d19548cd18d4ee823d1b67d175cb04edb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.38.0.ebuild b/gnome-base/libgtop/libgtop-2.38.0.ebuild
deleted file mode 100644
index 8c03243348ea..000000000000
--- a/gnome-base/libgtop/libgtop-2.38.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2
-
-DESCRIPTION="A library that provides top functionality to applications"
-HOMEPAGE="https://git.gnome.org/browse/libgtop"
-
-LICENSE="GPL-2+"
-SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Add explicit stdc, bug #628256
-	append-cflags "-std=c99"
-
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
index a7b999c3a1bb..454fa3ec2244 100644
--- a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index af69f2886ef9..147297008473 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,4 +1,4 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-EBUILD librsvg-2.40.21.ebuild 2666 BLAKE2B 07c4c9279acfc9c2bd13343929ad14fbd44fee06441cff4ade89c51b0eb8e5c1c9b87b4a5dd3ceb64514683d6e1e0ebfe3d446d3023504c941d4b0d2aeff3724 SHA512 bc5001b12723877973d9364b52c0cbadbc371541362aa4ae71730c594eb572432865594a03731f17024513b9e3b941656c0cec1b6e7595ae64b395a4f4560042
+EBUILD librsvg-2.40.21.ebuild 2639 BLAKE2B 90b8112288349552ac764ea1e148ab03df464a7f7d3c50e1da99c73116c4c6b5bab15e808e08862944ab5d18da54e2938334490ea29edf1715f043ec941adf10 SHA512 03779cf7a6f14b55e8a38c2e28e07ebbc425dce3bb59eea3542643fd6e84fb9ee51b0610bb9d73ff929ff0b7f5efdaf8b19b4696d535158d2c2b8ed7381ff34a
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index b5655355df53..972d7b6e6d2e 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 	dev-libs/vala-common
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.13
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
 # >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf