gentoo resync : 13.06.2020

4 files changed, 55 insertions, 77 deletions

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index e826b9cfe4ab..595b35e9aee7 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.16.0.tar.xz 1944244 BLAKE2B b5181474da55d9b320d217638a960a9bba1c103d8ff69f171aea57458d425ee8347e8a525b051f1b72888cf33d9b20a850b9e10fb0a487998a5502d2acb92105 SHA512 0ad8ac1d05cf76b9a82602c6f8f7034ae52fc11bae0b5ee17cf5bd89c6c91ba3ef7b07f770397b22484d54fd69e7a9a73f8c08a4d3d9f492f11d09d0b0379ff5
 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.16.0.ebuild 1219 BLAKE2B c8707d4e45ebeee88390da129fa33b80af68a2e269776cf92f06ab9aecee64d7afc1a525be33c68fe66f91d05f27ad9d0185500ab919fa3999869e28d8ad69e3 SHA512 d43c76284ca2bcbcb02edbd5f985ec6a44ceed40d3dda90a10dc8bcdfe08206a8323a5c1a9ef6332bfb05ddf8971dad0a31af9817d8654cef26b337444f2cfb1
 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
+MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 0c7d192a9785..7cb30b744ca5 100644
--- a/gnome-extra/nm-applet/metadata.xml
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -7,10 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="gcr">Enable advanced certificate chooser, requires <pkg>app-crypt/gcr</pkg></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.16.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.16.0.ebuild
new file mode 100644
index 000000000000..49e66011c5f5
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.16.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="NetworkManager connection editor and applet"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="appindicator modemmanager selinux teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=app-crypt/libsecret-0.18
+	>=net-libs/libnma-1.8.27
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libgudev-147:=
+	>=x11-libs/libnotify-0.7.0
+	>=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
+	appindicator? (
+		dev-libs/libappindicator:3
+		>=dev-libs/libdbusmenu-16.04.0
+	)
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( >=dev-libs/jansson-2.7 )
+
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dappindicator=$(usex appindicator ubuntu no)
+		$(meson_use modemmanager wwan)
+		$(meson_use selinux)
+		$(meson_use teamd team)
+		-Dmore_asserts=0
+		-Dld_gc=false
+	)
+	meson_src_configure
+}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
deleted file mode 100644
index c43ccd0ecaca..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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="appindicator doc 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
-	appindicator? (
-		dev-libs/libappindicator:3
-		dev-libs/libdbusmenu
-	)
-	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=(
-		-Dlibnm_gtk=false
-		-Dlibnma_gtk4=false
-		$(meson_use appindicator)
-		$(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
-}