Merge branch 'next'

3 files changed, 2 insertions, 70 deletions

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