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 34051138351 for ; Sun, 26 Apr 2020 10:56:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15B8AE09F8; Sun, 26 Apr 2020 10:56:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 004C8E09F8 for ; Sun, 26 Apr 2020 10:56:41 +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 E647B34F520 for ; Sun, 26 Apr 2020 10:56:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4616E1EE for ; Sun, 26 Apr 2020 10:56:39 +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: <1587898545.4fc2bc12abe37076c9739398d69fcbd23814d48f.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-sstp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild X-VCS-Directories: net-vpn/networkmanager-sstp/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 4fc2bc12abe37076c9739398d69fcbd23814d48f X-VCS-Branch: master Date: Sun, 26 Apr 2020 10:56:39 +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: e9048e49-729f-4b06-a52a-7644d2768185 X-Archives-Hash: 4a1a97a42e7101c7ea8cf11c75a6d174 commit: 4fc2bc12abe37076c9739398d69fcbd23814d48f Author: Mart Raudsepp gentoo org> AuthorDate: Sun Apr 26 10:53:14 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Apr 26 10:55:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc2bc12 net-vpn/networkmanager-sstp: disable libnm-glib usage, fix some deps * Ensure libnm-glib and co usage is always disabled * Fix USE=gtk deps; libnma was missing, even after --without-libnm-glib * Add missing gdbus-codegen build dep * Drop dbus-glib dep, long ported to GDBus; dep on needed minimum glib as per upstream * Drop ltprune.eclass usage and unused eutils.eclass inherit * Other small min dep tweaks per configure.ac Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> ...-1.2.0.ebuild => networkmanager-sstp-1.2.0-r1.ebuild} | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild similarity index 80% rename from net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild rename to net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild index cfd469aae6b..e3d6d9c1d49 100644 --- a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild +++ b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild @@ -3,8 +3,6 @@ EAPI=6 -inherit eutils ltprune - MY_PN="NetworkManager-sstp" MY_P="${MY_PN}-${PV}" @@ -17,17 +15,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gtk" -RDEPEND=">=dev-libs/dbus-glib-0.74 +RDEPEND=" + >=dev-libs/glib-2.32:2 net-misc/sstp-client - >=net-misc/networkmanager-${PV} + >=net-misc/networkmanager-1.1.0 net-dialup/ppp:= gtk? ( - x11-libs/gtk+:3 + >=x11-libs/gtk+-3.4:3 + >=net-libs/libnma-1.1.0 app-crypt/libsecret ) " DEPEND="${RDEPEND} + dev-util/gdbus-codegen virtual/pkgconfig sys-devel/gettext dev-util/intltool @@ -42,10 +43,11 @@ src_configure() { --disable-static \ --with-dist-version=Gentoo \ --with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VERSION}" \ - $(use_with gtk gnome) + $(use_with gtk gnome) \ + --without-libnm-glib } src_install() { default - prune_libtool_files + find "${ED}" -type f -name '*.la' -delete || die }