gentoo Easter resync : 12.04.2020

4 files changed, 83 insertions, 4 deletions

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index e67a59c7a250..808c4d381c58 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1,5 @@
 DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
-EBUILD nm-applet-1.8.24.ebuild 1673 BLAKE2B 656fa34ddeb1598b2823527b585135be9f1fc5534093083ca2c0404ff60f4392ebdf4668f0442e654d134a81da5af78d9bcbe91456386ae391f848d4e976e434 SHA512 33b98c51b7b43d1c2d9c0080b76ccf0ae84013277274a2f0f4a3fdfcfb375e040bacd170a7ea243ec9028ce37384f7d50028e5bad5b0ff10b22c38517fc3eab9
-MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
+DIST network-manager-applet-1.8.25-dev.tar.bz2 1795238 BLAKE2B 2cdf81b1395dc69fa35ed19d5410dc94b8a7ea5cf99a3a8b81e7d4f0b0852f883d8a0c4fbe42e0088ba79e5473c6c01e332feb6f78a3526bb21237f6fe17719e SHA512 3441b8c3c195c0ff9528d219d5769bcc56d7fac92030af75ae2d16e3c91accb2350286c18c2c46cc12a20e87099d05183f0510398519c6fcd8520d0ab56850a2
+EBUILD nm-applet-1.8.24.ebuild 1728 BLAKE2B 40fd22bbf9026619a4cbb38760e03b7fb498e3e9e13baf93df8b369e4cb22c9cc0677cb96122d14d621af443f6ddef4496910a88320e84129923774b5281f3e6 SHA512 196335486adbb889e21b4abb5332a7aaa664f0515b7090473a9b369a03614232304e9d7507c7e86c0eef340f018377f35284cd42bbc4bc6f2a19bd9fca2ea5fe
+EBUILD nm-applet-1.8.25.ebuild 1774 BLAKE2B cc259671e2b77a821e533e27eee8f0b17f2738d841dee25b126787e598dfc74f86c3ad5bbbc3167b3df23ef8f4847c7f4451a61e0a30886f40b94fbb50418832 SHA512 dd32925a9aeed3637d5ea88f02d292cb446da2d3ceace191b0d23dee6794439e9694aeb186072154ef5c8322daf934b33644016ff7cc5baeffbcaff60fbb415a
+MISC metadata.xml 709 BLAKE2B c5ee0c7c876b849c7f640a64d5d6ae3325b693be9b7733e9757ccb0418f6d6b4ad2f85afe033ebfd6f3f4cfd6f907160095141998ce5c01e2faa87456ab58856 SHA512 0449bc9810e4b7b85307bcd8bde24746697641cf82e34790d7a8c280951c5814646c2a6bc7a3e8e0245d1deb24f9b8a0890d1d5d8227dbaf6c92dd966e5ea1c8
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 7cb30b744ca5..7bbb6fe7064c 100644
--- a/gnome-extra/nm-applet/metadata.xml
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -7,8 +7,11 @@
 	</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>
 		<flag name="teamd">Enable teamd configuration editor</flag>
+		<flag name="wwan">Enable WWAN support</flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
index 771cfea9634b..f8af43807f49 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
+IUSE="ayatana gtk +introspection +gcr +modemmanager selinux teamd"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
@@ -32,6 +32,7 @@ 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] )
@@ -50,7 +51,7 @@ PDEPEND="virtual/notification-daemon" #546134
 src_configure() {
 	local myconf=(
 		--with-appindicator=$(usex ayatana ubuntu no)
-		--with-libnm-gtk
+		$(use_with gtk 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
new file mode 100644
index 000000000000..18462f2d74e3
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson xdg-utils
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager https://gitlab.gnome.org/GNOME/network-manager-applet"
+SRC_URI="https://gitlab.gnome.org/GNOME/network-manager-applet/-/archive/${PV}-dev/network-manager-applet-${PV}-dev.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana doc gtk introspection lto modemmanager selinux teamd test wwan"
+
+DEPEND="
+	app-crypt/libsecret
+	app-text/iso-codes
+	dev-libs/glib:2[dbus]
+	dev-libs/libgudev:=
+	net-misc/networkmanager
+	x11-libs/gtk+:3[introspection?]
+	x11-libs/libnotify
+	ayatana? (
+		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 )
+	teamd? ( dev-libs/jansson )
+	wwan? ( ~net-misc/networkmanager-1.18.4 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( dev-util/gtk-doc )"
+
+# TODO
+RESTRICT="test"
+
+S="${WORKDIR}"/network-manager-applet-${PV}-dev
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk libnm_gtk)
+		-Dlibnma_gtk4=false
+		-Dappindicator=$(usex ayatana yes no)
+		$(meson_use wwan)
+		$(meson_use selinux)
+		$(meson_use teamd team)
+		$(meson_use test gcr)
+		-Dmore_asserts=$(usex test 1 0)
+		-Diso_codes=true
+		$(meson_use modemmanager mobile_broadband_provider_info)
+		$(meson_use test ld_gc)
+		$(meson_use doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use lto b_lto)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}