9 files changed, 6 insertions, 171 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index bc0165835d6f..de8293b219af 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index ec4d9e5d5d54..0c78f009a2f9 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,5 +1,5 @@
 DIST gsettings-desktop-schemas-3.22.0.tar.xz 598412 BLAKE2B 0249dfbdc7d574824ad6c34cdbafc7859eba4d78494c80d42b9b5a739cfaa8bb6d43e13093148253dedd0ae2762261750f791d809ba8058a78098fc7f8dad510 SHA512 653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 EBUILD gsettings-desktop-schemas-3.22.0.ebuild 762 BLAKE2B e0502aa9126fc0808e90ecf18ec028d00edbaf9a813db4d4230f5c4572dadf4b5dc26afda75cb76902022341a4b3a55e541f14a84b1a52da0ed0ba57821f48f6 SHA512 66a5ff681cec7c66941ce08292117c26d2314499f55daea0f87c95d3f4d73ae4c3e0ac166717bc793c9d4f9a03593c317b5c0ddbd065146b35992334a1c8e209
-EBUILD gsettings-desktop-schemas-3.24.1.ebuild 765 BLAKE2B a0c74bb0f4e25160a6f001badaa02d7a78660a201f15b6dfaa97a2283d0269b0c1f6388372fce51d28726c5406edbea6dae9bea362bb6bd4dfa01989b8ad2d6d SHA512 fe593ca976f8b6983568c645e74795d882b58b2392467b2bb922058c4c3be5ba1096123b0328bce3c9ef254c1e03713b90ffcea0cbe8a6b00d32773fcc5588d5
+EBUILD gsettings-desktop-schemas-3.24.1.ebuild 763 BLAKE2B 0698eee92e216f5d039d3c6d0ca9659504015d6597cc722b46487da6f733a6e391c7211fe93fb9df8b9a49a0b51af333366a3292330743e2f1e844a1f3b76091 SHA512 1a0e09d280a5ec1b7849f8069c884a15c071a88669567c9fac251dade4c9acae0a42f4c2996949b0dbbcb6871dcea549d9608113118e9bc8f1c8a7a4f5494ce1
 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 2e366afcc5cf..8285b4be9735 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index b0c186025013..05b980882cc5 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,7 +1,5 @@
 AUX gvfs-1.30.2-sysmacros.patch 525 BLAKE2B 27337a06b02aea544e98b5726ac5a1ae29c8632150c373ce85f0f601c368e0f1430217ee729de5494e15162a05423c738e0756431a46c87b62ac647615b6273d SHA512 9b06683ed3b8ceea1b330e86308c396581ab4c85aa22199ce92acad915bb28f0fed8997558c08b18cb9c5f1bab45e46a1365831acaf1c194e7134e185849dba2
-DIST gvfs-1.30.4.tar.xz 1895304 BLAKE2B 7e7dbcde464ac3afc982d6d04916ecbee4b0cfae9481d2f75e2195b4816e8f92a5fe3d434f630dbea684b4020721825133205f303d4bf527d8826033355b547e SHA512 305b2abc8cfcb4bdea1fb84f5a7df4aac9697494f5d63d40ce1eb234b547aed497deb4d88a2cb17f9ab4fc188d49ff56033993a17cbfebae6d65a33dc84a633a
 DIST gvfs-1.32.1-patches.tar.xz 53288 BLAKE2B 2394f0931927069b4aeab69769df74c823ebffca2e7e73245b3597e085f2fff5c98999e6eccd052fa3564339b75d764f2124592c0977fddd2eb4afeca819b965 SHA512 c3e9de02e013aaf707878f8ffab96c42ac558412020f8462f928d2c7bd8b9756aa980e6b8db50e6f0ff0ad91f250ef1a26358d80b5d1cdaa9234475ec3a3db4f
 DIST gvfs-1.32.1.tar.xz 1813212 BLAKE2B 4b349e968eaab75d75ac9e7b66087298754ad81668e415812c4db74e2e393ac2cddea1b55771656dcd67ffdca23e4cf1642afef101498d309c643519fcefcca3 SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8
-EBUILD gvfs-1.30.4.ebuild 3682 BLAKE2B 2d3d1ef263069a971b730ca70ca5719a67279b393381e14ea385fc677be382d7e81d68a81e89a1a8cfd288e56fb2cf52577cc55568a666aba89b64e247cc47d1 SHA512 e5698ae16fad71377b69a981ab420754be4303f36b8b18bd1687b2377469a215ae2a6eb75df5682c80dca4b682a7e9f48840247616d431b1b11a2b56048110ad
-EBUILD gvfs-1.32.1-r1.ebuild 3828 BLAKE2B fbb96d94056d85e6428c86d299a7bd881d332ba626045463fd2fec96efaa78a0342ac2fd399778b7fc8484892fb38c2e36b715ee6994108a89d8b841c079da68 SHA512 6fc27ab985cc62e9d920c1b4c2344341a1a6f8592a15dbfd3793882110e70646b4ce0f0a1105b441b3b6c925d4996d00348122f40e88931ddc4de56a298083ee
+EBUILD gvfs-1.32.1-r1.ebuild 3826 BLAKE2B f1bfe2003c7d9e52a28be077b9dffe0cb0b1df892324fef94716f5667ce6fd99092aafac595d429a924c5ef614b74d77b6f42088a762aacbaae2e9954ea3f563 SHA512 fc653f73522939d51129c6443971f2cc1ec2e73cc409db8a8520d5b77d84b242135289bbbbf8a5584dbc8a078000244991fe288faf8849d849c63babbf6f6ff3
 MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc
diff --git a/gnome-base/gvfs/gvfs-1.30.4.ebuild b/gnome-base/gvfs/gvfs-1.30.4.ebuild
deleted file mode 100644
index dec41a2ad236..000000000000
--- a/gnome-base/gvfs/gvfs-1.30.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 gnome2 systemd
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
-	cdda? ( udev )
-	google? ( gnome-online-accounts )
-	mtp? ( udev )
-	udisks? ( udev )
-	systemd? ( udisks )
-"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	app-crypt/gcr:=
-	>=dev-libs/glib-2.49.3:2
-	sys-apps/dbus
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray:= )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
-	google? (
-		>=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts]
-		>=net-libs/gnome-online-accounts-3.17.1:= )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-2.42:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:= )
-	mtp? ( >=media-libs/libmtp-1.1.12 )
-	nfs? ( >=net-fs/libnfs-1.9.7 )
-	policykit? (
-		sys-auth/polkit
-		sys-libs/libcap )
-	samba? ( >=net-fs/samba-4[client] )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	udev? (
-		cdda? ( dev-libs/libcdio-paranoia )
-		virtual/libgudev:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-core-12.3.0
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234
-)
-
-src_prepare() {
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-
-		# Uncomment when eautoreconf stops being needed always
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	# --disable-obexftp, upstream bug #729945
-	gnome2_src_configure \
-		--disable-gdu \
-		--disable-hal \
-		--enable-bash-completion \
-		--enable-documentation \
-		--enable-gcr \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(use_enable afp) \
-		$(use_enable archive) \
-		$(use_enable bluray) \
-		$(use_enable cdda) \
-		$(use_enable fuse) \
-		$(use_enable gnome-keyring keyring) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable google) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable http) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable nfs) \
-		$(use_enable policykit admin) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udev gudev) \
-		$(use_enable udev) \
-		$(use_enable udisks udisks2) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
index 630b1d417905..a4dbfa656798 100644
--- a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.32.1-r1.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 ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	app-crypt/gcr:=
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 8a5fa01aaa74..4283e8b872b9 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,3 @@
-DIST libgtop-2.34.2.tar.xz 725720 BLAKE2B fc69a6d64f86e16490f417748937b196c090de7afb68052a42258c06b7b65b686edb41abbf69ad42065a44b5811def0776969c2caa01009c2087355e9b1b2e9f SHA512 22ae4792236c47fda265f1b16f66f8685122f84a76e14adf2fd9e5e669c1f9776a58a2ec00564e37add98084d7e3cea621b38b8ad09b15e348f9c74f5345f19a
 DIST libgtop-2.36.0.tar.xz 727072 BLAKE2B 46f24573bde0bcfeb2210ea08446f6e6590fadc5697745178133ce5f3aec2e464cbce8446d2dbddb9f05d4a16eb7daf110c4554778a28573116b2b59edcf556f SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5
-EBUILD libgtop-2.34.2.ebuild 695 BLAKE2B 721a1692bcc264ba0b3c70a283b522f15e02a24d03c8b96086e51729c0c19932259c0f90542c0ed05b7225bb4f0a1733492535c6d33e78a246c475c4b7205ae6 SHA512 748d1283986bc38c5ab86e5d91996c1149e02f31339898cc39c8eab2b72c056e8569854a751487bd1d8c54d4f7fe8c03b6ed8fbe3cbb63a1a6d95dd1ded42e77
-EBUILD libgtop-2.36.0.ebuild 771 BLAKE2B 7f66e2de8eb6a0486be1a2065684649ad500c16534ddbc52a4aeb7c186b04103cc6d11bc614d8dbdf186f7b9a5bcd5755262943c86dfaa117a9213ad1a0a9d09 SHA512 da6d2b29ad74243612e44943699889e59b7213303678f35af28cc889251f7cdc672dc943dbb36ec87e18839a28fb0ec8aa499c54aeddb2e4471176ecd7b4f601
+EBUILD libgtop-2.36.0.ebuild 769 BLAKE2B b5247d7371184e217fa7f0242305577a009969c6ea9c2c67a45fa2646fa0441a5ff26c7d2e73b3f54b27347b1c9d7e76dd4afa3e64d5fa3d3a76a008e8503728 SHA512 525471e9a3d833b559a4cc5a963d9b6e8a7b25cceb8839c716ea2b6e764cd5b03756d767a434913940ab8542f62481d7b7b1aabe0d6f979f1987534211089a83
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.34.2.ebuild b/gnome-base/libgtop/libgtop-2.34.2.ebuild
deleted file mode 100644
index acafa2277c42..000000000000
--- a/gnome-base/libgtop/libgtop-2.34.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A library that provides top functionality to applications"
-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"
-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() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
diff --git a/gnome-base/libgtop/libgtop-2.36.0.ebuild b/gnome-base/libgtop/libgtop-2.36.0.ebuild
index 62d491bdc2fe..dd04cae7630b 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 ~x86-fbsd"
 IUSE="+introspection"
 
 RDEPEND="