[gentoo-commits] repo/gentoo:master commit in: profiles/, gnome-extra/nm-applet/

[gentoo-commits] repo/gentoo:master commit in: profiles/, gnome-extra/nm-applet/

[Mart Raudsepp]

commit:     eb225e381991118a81dc62a41ab571a9e4630843
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  7 20:02:56 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 20:12:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb225e38

gnome-extra/nm-applet: drop problematic 1.8.25

This was a heavy development version that was quickly p.masked
and isn't usable at all (it drops libnma, but the stable standalone
libnma requires newer nm-applet that drops glib gschema, which libnma
ships itself now); it also handled USE flags badly, mainly in relation
to asserts, LTO and modemmanager. We now have upstream stable 1.16.0
release available instead for use.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-extra/nm-applet/Manifest                |  1 -
 gnome-extra/nm-applet/metadata.xml            |  2 -
 gnome-extra/nm-applet/nm-applet-1.8.25.ebuild | 72 ---------------------------
 profiles/package.mask                         |  5 --
 4 files changed, 80 deletions(-)

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 8ed24daf4bb..eca1c583af9 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1,2 @@
 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

diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 0c7d192a978..7cb30b744ca 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.8.25.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild
deleted file mode 100644
index c43ccd0ecac..00000000000
--- 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
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 4551ab0a3ca..7b9c096d97f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -369,11 +369,6 @@ dev-java/icedtea-web
 # Breaks at least dev-games/simgear right now, bug #709878.
 ~dev-games/openscenegraph-3.6.5
 
-# Mart Raudsepp <leio@gentoo.org> (2020-03-13)
-# Masked for testing due to split of libnma needing migration
-# and 1.8.25 being an old development release
->=gnome-extra/nm-applet-1.8.25
-
 # Eray Aslan <eras@gentoo.org> (2020-03-09)
 # Mask experimental software
 =mail-mta/postfix-3.6*