gentoo resync : 30.05.2020

3 files changed, 8 insertions, 8 deletions

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index deed4e1e31f4..e826b9cfe4ab 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,6 +1,6 @@
 AUX 1.8.24-fix-bashisms.patch 5304 BLAKE2B d564e84e12033826ed4e1663336d20a0591058a0d50201b3d91180f26f9d46380dea35cd95fc2b0e3bb94dbda70d8f55b7885c13c73f14a526a3e6473863d7d6 SHA512 c8acde4a746d83666671aa0bd1c64b24710219dd932d28eae7ddc56de2e430ef745f92953608ef277ff5d4d94270876ca4d1b6c8ac338571a0af6cef6516b804
 DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
 DIST network-manager-applet-1.8.25-dev.tar.bz2 1795238 BLAKE2B 2cdf81b1395dc69fa35ed19d5410dc94b8a7ea5cf99a3a8b81e7d4f0b0852f883d8a0c4fbe42e0088ba79e5473c6c01e332feb6f78a3526bb21237f6fe17719e SHA512 3441b8c3c195c0ff9528d219d5769bcc56d7fac92030af75ae2d16e3c91accb2350286c18c2c46cc12a20e87099d05183f0510398519c6fcd8520d0ab56850a2
-EBUILD nm-applet-1.8.24-r1.ebuild 1754 BLAKE2B 8b6f8f981ee9254acde3aa739ee51e804ac9e3801a86bbc8744954953dd4ca326075a4e998772c95d02433a00c46dee04830e8ecd620e3cf0254f13634b50703 SHA512 d407c5a3ae53c61e3bfef5fdd0014ee7973d73dd8aa5e4dddac9929891539d148f0a2c0ddcf28f975f7054bfffcd7693de15434bb4e18fcf4ec1dd815c8e63af
-EBUILD nm-applet-1.8.25.ebuild 1719 BLAKE2B 442f4c4c596671cf4be609e14c7fdcaa4f0590c32653415d8d6ec992fbf9f63ae60203dbbcb309c185083a0bbd3678a22d0fd123227de89d1f19864d2856c4a6 SHA512 004873ed7a2d37d6fe8baad21ad14c5415c84670064b8c37d89c3eb961da8df516af67bfbdc3dd63a4dd75899afe184c58a217cf27afd67a2553d0c20923f102
+EBUILD nm-applet-1.8.24-r1.ebuild 1769 BLAKE2B 0b45a7183222fd774830e2ace5d253392d107c35621c83b4195cbbaff7a081a937166b505dbd1a434b3d6fc9c885141fbde7f75e999ea41b8b0bbbfa6b85cc9a SHA512 30956c606f4a35c346ee2260582053bb41137724fc3c7a46d4a3a4d6a8cafe924b27d5f272e6bdcb71e6df9f676fa72d3a38351793c1f2eee8c63248a28e3898
+EBUILD nm-applet-1.8.25.ebuild 1717 BLAKE2B 2be2bc81f05c81e66e0cfcfc1336e20cdb524eba9096578126d04d284a094ddedc16fd6bce4f9b463e33c4b7b120422d30a5f3b264caec6a5dcbd128a1fd3160 SHA512 6be1934aa310f734ff7da25f60d0d0a821d39622e11f362ae2abf8994b781243bf4984ed75824a6deb08a7492f848fb087c5199c08e8ab427d52517a0725ae85
 MISC metadata.xml 651 BLAKE2B 71fde7243fa65796946de511bafa6b20510a1c69d47d9ac91f66590fedb7897a85612a1de146bc4b411ca1acea84674d00cee25647b3485120bc87221d00bde6 SHA512 4736c2a5f00d8bc21c63d15454c039a7e74b3b2612bb76ba94451ef54ad27eb4259f382f018cd8aae2d8e3571638eec202226c59bfb35c7e3fcd80e0b3ffd4a0
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
index d18119056732..b606dc264603 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
+IUSE="appindicator +introspection +gcr +modemmanager selinux teamd"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
@@ -30,7 +30,7 @@ RDEPEND="
 	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
 	net-misc/mobile-broadband-provider-info
 
-	ayatana? (
+	appindicator? (
 		dev-libs/libappindicator:3
 		>=dev-libs/libdbusmenu-16.04.0 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
@@ -54,7 +54,7 @@ PATCHES=(
 
 src_configure() {
 	local myconf=(
-		--with-appindicator=$(usex ayatana ubuntu no)
+		--with-appindicator=$(usex appindicator ubuntu no)
 		--without-libnm-gtk
 		--without-libnma-gtk4
 		--disable-lto
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
index 94ff1ec2fb9c..c43ccd0ecaca 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/network-manager-applet/-/archive/${PV}-d
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ayatana doc introspection lto modemmanager selinux teamd test wwan"
+IUSE="appindicator doc introspection lto modemmanager selinux teamd test wwan"
 
 DEPEND="
 	app-crypt/libsecret
@@ -22,7 +22,7 @@ DEPEND="
 	net-misc/networkmanager
 	x11-libs/gtk+:3[introspection?]
 	x11-libs/libnotify
-	ayatana? (
+	appindicator? (
 		dev-libs/libappindicator:3
 		dev-libs/libdbusmenu
 	)
@@ -44,7 +44,7 @@ src_configure() {
 	local emesonargs=(
 		-Dlibnm_gtk=false
 		-Dlibnma_gtk4=false
-		-Dappindicator=$(usex ayatana yes no)
+		$(meson_use appindicator)
 		$(meson_use wwan)
 		$(meson_use selinux)
 		$(meson_use teamd team)