From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4261138350 for ; Sun, 26 Apr 2020 14:58:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 290B0E0A70; Sun, 26 Apr 2020 14:58:15 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06A27E0A70 for ; Sun, 26 Apr 2020 14:58:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DACB34F71B for ; Sun, 26 Apr 2020 14:58:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 592F01F5 for ; Sun, 26 Apr 2020 14:57:42 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1587913021.cdd959ac7981ae073eade185e03a37b24ab08c5c.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/nm-applet/metadata.xml gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild gnome-extra/nm-applet/nm-applet-1.8.24.ebuild gnome-extra/nm-applet/nm-applet-1.8.25.ebuild X-VCS-Directories: gnome-extra/nm-applet/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: cdd959ac7981ae073eade185e03a37b24ab08c5c X-VCS-Branch: master Date: Sun, 26 Apr 2020 14:57:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 353409bd-d253-4368-a194-b1daa6357f43 X-Archives-Hash: c18d02983d6c7780126d1b1fcdd995df commit: cdd959ac7981ae073eade185e03a37b24ab08c5c Author: Mart Raudsepp gentoo org> AuthorDate: Sun Apr 26 14:53:38 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Apr 26 14:57:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd959ac gnome-extra/nm-applet: drop legacy libnm-gtk unconditionally Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> gnome-extra/nm-applet/metadata.xml | 1 - .../{nm-applet-1.8.24.ebuild => nm-applet-1.8.24-r1.ebuild} | 5 ++--- gnome-extra/nm-applet/nm-applet-1.8.25.ebuild | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml index 7bbb6fe7064..0c7d192a978 100644 --- a/gnome-extra/nm-applet/metadata.xml +++ b/gnome-extra/nm-applet/metadata.xml @@ -7,7 +7,6 @@ Enable advanced certificate chooser, requires app-crypt/gcr - Enable legacy library libnm-gtk Enable link time optimization Enable support for mobile broadband devices using net-misc/modemmanager 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 24baa03f859..d1811905673 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? ( =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 18462f2d74e..94ff1ec2fb9 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)