gentoo resync : 14.05.2020

4 files changed, 7 insertions, 10 deletions

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 5729cd925c42..deed4e1e31f4 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.ebuild 1806 BLAKE2B b6ed9e016e7a9b91f7d0c8a884aadc5541c1266fcdd479ed7232d2b707782a69160bc323d68a96965eaf40214a15ce4175dea62609dcf8ec95c734cfcbdf1fae SHA512 6f94b1fe3b6f07002c7782e7011550bf1149803d39551c6b4931956a6680146e9b8ac9b3331e9a310086be61b9f119dc7da80b2dee5c580bb0f73b58979517f1
-EBUILD nm-applet-1.8.25.ebuild 1774 BLAKE2B cc259671e2b77a821e533e27eee8f0b17f2738d841dee25b126787e598dfc74f86c3ad5bbbc3167b3df23ef8f4847c7f4451a61e0a30886f40b94fbb50418832 SHA512 dd32925a9aeed3637d5ea88f02d292cb446da2d3ceace191b0d23dee6794439e9694aeb186072154ef5c8322daf934b33644016ff7cc5baeffbcaff60fbb415a
-MISC metadata.xml 709 BLAKE2B c5ee0c7c876b849c7f640a64d5d6ae3325b693be9b7733e9757ccb0418f6d6b4ad2f85afe033ebfd6f3f4cfd6f907160095141998ce5c01e2faa87456ab58856 SHA512 0449bc9810e4b7b85307bcd8bde24746697641cf82e34790d7a8c280951c5814646c2a6bc7a3e8e0245d1deb24f9b8a0890d1d5d8227dbaf6c92dd966e5ea1c8
+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
+MISC metadata.xml 651 BLAKE2B 71fde7243fa65796946de511bafa6b20510a1c69d47d9ac91f66590fedb7897a85612a1de146bc4b411ca1acea84674d00cee25647b3485120bc87221d00bde6 SHA512 4736c2a5f00d8bc21c63d15454c039a7e74b3b2612bb76ba94451ef54ad27eb4259f382f018cd8aae2d8e3571638eec202226c59bfb35c7e3fcd80e0b3ffd4a0
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 7bbb6fe7064c..0c7d192a9785 100644
--- a/gnome-extra/nm-applet/metadata.xml
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="gcr">Enable advanced certificate chooser, requires <pkg>app-crypt/gcr</pkg></flag>
-		<flag name="gtk">Enable legacy library libnm-gtk</flag>
 		<flag name="lto">Enable link time optimization</flag>
 		<flag name="modemmanager">Enable support for mobile broadband devices
 			using <pkg>net-misc/modemmanager</pkg></flag>
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
index 09b643ef42f0..d18119056732 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.24.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 gtk +introspection +gcr +modemmanager selinux teamd"
+IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
@@ -33,7 +33,6 @@ RDEPEND="
 	ayatana? (
 		dev-libs/libappindicator:3
 		>=dev-libs/libdbusmenu-16.04.0 )
-	gtk? ( ~net-misc/networkmanager-1.18.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 	virtual/freedesktop-icon-theme
 	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
@@ -56,7 +55,7 @@ PATCHES=(
 src_configure() {
 	local myconf=(
 		--with-appindicator=$(usex ayatana ubuntu no)
-		$(use_with gtk libnm-gtk)
+		--without-libnm-gtk
 		--without-libnma-gtk4
 		--disable-lto
 		--disable-ld-gc
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 18462f2d74e3..94ff1ec2fb9c 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 gtk introspection lto modemmanager selinux teamd test wwan"
+IUSE="ayatana doc introspection lto modemmanager selinux teamd test wwan"
 
 DEPEND="
 	app-crypt/libsecret
@@ -26,7 +26,6 @@ DEPEND="
 		dev-libs/libappindicator:3
 		dev-libs/libdbusmenu
 	)
-	gtk? ( ~net-misc/networkmanager-1.18.4 )
 	introspection? ( dev-libs/gobject-introspection:= )
 	modemmanager? ( net-misc/modemmanager )
 	selinux? ( sys-libs/libselinux )
@@ -43,7 +42,7 @@ S="${WORKDIR}"/network-manager-applet-${PV}-dev
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use gtk libnm_gtk)
+		-Dlibnm_gtk=false
 		-Dlibnma_gtk4=false
 		-Dappindicator=$(usex ayatana yes no)
 		$(meson_use wwan)