6 files changed, 4 insertions, 72 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 9688147113ef..015572847424 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 55f1e65388b2..5f8835f346f9 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -2,6 +2,6 @@ DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7
 DIST libgsf-1.14.45.tar.xz 618476 BLAKE2B f577859578de6ca359a7377dcced424e95779d3fd155cdbeb1c2874f7a0d0c7a09a2322d2538452b48798ea979e8260be77215140f298dc58ee32a0b9ead0e47 SHA512 2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd
 DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
 EBUILD libgsf-1.14.43.ebuild 1000 BLAKE2B ab04bfba11ed11f061bf2074d72b20086e9b3b41edf4ffcd8cf0ce3dc7a8816f61f15c9ed20544123e3f928289782d6f3f61c4ace27a539abe76545b73c38062 SHA512 0426fd92c203dd7a38a1b8a63f169c38d89b8e18d52b7c51db433540619d20574075fa2bccd2ff64eb1fea8b583773d364ac049f7e19782058b9b05c88d08233
-EBUILD libgsf-1.14.45.ebuild 1005 BLAKE2B f6112cd864eceb569d3bd719951f2c4a219d787d82dde357f579ac7857381ae12f1e4f751cf76997341457e0f05710cd99a7631d1dba3bc0588cda047c873735 SHA512 68c849f28c5eff6526f7197436431b136e4ae296dacd87cc405d60fa57e5b1970913c64acf45bed51afe115424d9547b12021d603896d9ed737e69d86d131c23
+EBUILD libgsf-1.14.45.ebuild 1004 BLAKE2B e2e4309855f6bd188b2e19789cfd70cf5b989209f333a836b70f68c296ada5e04d8c6b023e397c506c9acb13cc8ea2ba3aa13bc1ed6900bf7c8ac46abbf999cf SHA512 2fdcc8ecdccfe0b86f150cac82d1ccd244c69300bbdc962e022b346df089c326ebafd51b5584d64d7a1f5b45cf7014de7522a46cd3218710e279446bb1bbf6d5
 EBUILD libgsf-1.14.46.ebuild 1010 BLAKE2B 8916d0707ff006845f3c0d103e178567743615103c0f13323eec85d8d072eedf082022216fe580c1517df920fa3efc3da5132f1e90f9263676fd656a219c1218 SHA512 17594b7634342c69976bd1f5e9fe6cc5fedb017c72ae58979e8408b2b56efa2bfe2e554c4bcc1d3d2721c0cf4687bdfdaa70e0acd23bd98c801220b0a684259a
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.45.ebuild b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
index e36f75f51eaa..bbf262c75ce4 100644
--- a/gnome-extra/libgsf/libgsf-1.14.45.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index dd43357690d0..ee1181f30be6 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,3 @@
-DIST network-manager-applet-1.8.20.tar.xz 1551392 BLAKE2B 91258012715f226467126e4eefdfcd6ebde36958be80ae5e264dbf5168e0b772ce04404030d3f7dac9a6f72088918a2c5160aba694b6b7f7d4d6289b716b76f1 SHA512 5020aefe1803ad3b59562478e793737b52a3e5fd294470cfb430c73937cdbc0be6ecba5f3f8e8dbcc5bb5ac293df2866ecc919dd5019a3e681a434078d235a41
 DIST network-manager-applet-1.8.22.tar.xz 2058500 BLAKE2B e4b31ea3dfe91f07a61b7dd4c34521bc4fc2d7a1b7e5649690336cce0c425d57128ff8011b18a6505893982bfd81170eb8239b9e83de6f91afa11190cfac3b4d SHA512 d2f679a67b79b011762f9249798c5a4ccad3d0fdd01d8d45956a65ab75398ccc07167fc5452748a12294315f729b10115edcb9f11e05475bb0b15b2ade638dd3
-EBUILD nm-applet-1.8.20.ebuild 1652 BLAKE2B 7c46f50db0ade503045cb33d9d267d879718809d4e68f5c810a90acc26293be0e328b3bb81fcf0488292b3439e1aec00fa43ef4da4c2baa6db3f66fbb3ba8355 SHA512 0afd250aa5b7a857f16b37624aa34a5ab8ec85edb0a952757c54ee7221958b5ce2439d23714423d5916d090e9df0d14ab97d2f8fc8d1e117614da9ee0534e87b
-EBUILD nm-applet-1.8.22.ebuild 1651 BLAKE2B 9cc6a6aec6201209f7c721934bc74810b477ba3df709aad033ff5737c6fcc7ef80459d148fa5ab014769c9aab0cd533cbcfc86bd94da6786225dcb981d56bc78 SHA512 e529d282af870ce6d2b439d8b778fdd2dc948f7ce9234a5c1a793a3731fe5e4c2929909c027d930abe8c5c11bd7037e3fc06efb254c1bdafdb428a77cc44e1cb
+EBUILD nm-applet-1.8.22.ebuild 1650 BLAKE2B 577f91d275acae5ef15bda487c0e11cd2cf36b0ec71f0b9456accf479843b3fa9eeadb8fd212e828919554272eab5403f44b9374bc13a4bee8a4cd0da084b2a1 SHA512 2eee1bc81f1c4e3c511e0df9d7cc86bb3c18ddba0e8723bb81ced863f708d620cc7c03dc7113a1edf2d92237d35ef92e701df495fa3b54bd977b9f071e646456
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild
deleted file mode 100644
index 5532c487d811..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-crypt/libsecret-0.18
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
-	net-misc/mobile-broadband-provider-info
-
-	ayatana? (
-		dev-libs/libappindicator:3
-		>=dev-libs/libdbusmenu-16.04.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	virtual/freedesktop-icon-theme
-	virtual/libgudev:=
-	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
-	modemmanager? ( net-misc/modemmanager )
-	selinux? ( sys-libs/libselinux )
-	teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.0
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-src_configure() {
-	local myconf=(
-		--with-appindicator=$(usex ayatana ubuntu no)
-		--with-libnm-gtk
-		--disable-lto
-		--disable-ld-gc
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_enable introspection)
-		$(use_with gcr)
-		$(use_with modemmanager wwan)
-		$(use_with selinux)
-		$(use_with teamd team)
-	)
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
index a9669752da59..578c09c6d1d0 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18