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 581CE138350 for ; Sun, 19 Apr 2020 20:25:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1A6BE0A5B; Sun, 19 Apr 2020 20:25:49 +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 8BD0BE0A5B for ; Sun, 19 Apr 2020 20:25:49 +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 BBB8C34F004 for ; Sun, 19 Apr 2020 20:25:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78C1F1DF for ; Sun, 19 Apr 2020 20:25:47 +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: <1587327931.c3acd0c7a868023cf1732e7e6062e95749cab959.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-pptp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r2.ebuild X-VCS-Directories: net-vpn/networkmanager-pptp/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: c3acd0c7a868023cf1732e7e6062e95749cab959 X-VCS-Branch: master Date: Sun, 19 Apr 2020 20:25:47 +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: 1dccfdeb-0a8f-4c29-a565-c9f9ff05504a X-Archives-Hash: ddb52d3f693e6c408dea75f068a0bdb8 commit: c3acd0c7a868023cf1732e7e6062e95749cab959 Author: Mart Raudsepp gentoo org> AuthorDate: Sun Apr 19 20:13:45 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Apr 19 20:25:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3acd0c7 net-vpn/networkmanager-pptp: disable legacy libnm-glib compat Disable libnm-glib, libnm-glib-vpn and libnm-util usage, as they are all gone with newer NetworkManager. This also disables libnm-gtk usage, which requires libnm-glib in turn as well, and is also gone with newer nm-applet. Depend on new libnma package instead of nm-applet, as this is what is needed here. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> .../networkmanager-pptp-1.2.8-r2.ebuild | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r2.ebuild b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r2.ebuild new file mode 100644 index 00000000000..76465cd0e87 --- /dev/null +++ b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME_ORG_MODULE="NetworkManager-${PN##*-}" + +inherit gnome2 + +DESCRIPTION="NetworkManager PPTP VPN plugin" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="gtk" + +RDEPEND=" + >=net-misc/networkmanager-1.2.0:= + >=dev-libs/dbus-glib-0.74 + >=dev-libs/glib-2.32:2 + net-dialup/ppp:= + net-dialup/pptpclient + gtk? ( + >=net-libs/libnma-1.2.0 + >=app-crypt/libsecret-0.18 + >=x11-libs/gtk+-3.4:3 + ) +" +# libxml2 required for glib-compile-resources +DEPEND="${RDEPEND} + sys-devel/gettext + dev-libs/libxml2:2 + dev-util/gdbus-codegen + dev-util/intltool + virtual/pkgconfig +" + +src_configure() { + local myconf + # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}" + + gnome2_src_configure \ + --disable-more-warnings \ + --disable-static \ + --with-dist-version=Gentoo \ + $(use_with gtk gnome) \ + --without-libnm-glib \ + ${myconf} +}