gnome-extra/nm-applet: drop legacy libnm-gtk unconditionally

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

diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 7bbb6fe7064ce2cf77dd403d0a4b07a88fc379a8..0c7d192a97854f39baf1b7efc736743556201491 100644 (file)
--- 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
similarity index 92%
rename from gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
rename to gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
index 24baa03f859ee3eb5ec8fbf737525d24431468bd..d181190567323b4f47a43a93bf28f87e51e05f0c 100644 (file)
--- 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.19 )
        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 18462f2d74e3c5d7c89c7bfbd50249f7d21ae673..94ff1ec2fb9c0117688e6f5d33f41a09e9b1e1f6 100644 (file)
--- 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)