net-vpn/networkmanager-l2tp: bump to 1.20.6, fix net-misc/networkmanager dependency

Also, net-misc/networkmanager dependency has been fixed (bug #876957).

Closes: https://bugs.gentoo.org/884461
Signed-off-by: Alexander Kurakin <kuraga333@mail.ru>
Closes: https://github.com/gentoo/gentoo/pull/28548
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 68 insertions, 0 deletions

diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
index 230cca20087f..c8d7d76a8bda 100644
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -1,4 +1,5 @@
 DIST NetworkManager-l2tp-1.20.4.tar.xz 481688 BLAKE2B 031ea7b639bd310574c56cd7a130889a9e7b4d44d22e61950b8111556011f92e89712744852828e20ef2a9b3e3efa623fac9731463bc7217fe0c9361b763e2ab SHA512 5f4a2353f4083397d03e94130d7b1f78c99b6ac284c57a86e13092fcb93499b07de3f4ea8307d2f0f888661b9534ce87811907a72c10ec8c2ff93bc2aaf2a97f
+DIST NetworkManager-l2tp-1.20.6.tar.xz 490172 BLAKE2B d07bd29635e6f0b980456f70dbb20a911fef84c3862e929486cd46edf912bbe23ad74a67445f6ff30b627f91fd35d341cc9a3175f9276642240e75bfd26083df SHA512 2c838009577843c7b852c9ecffd412e4dff31028fb029056f6300c7ad5f98493ed6acd0d1a8b4bf2b47685f1940ff6adcbf7bbeab3db9ff0b8cab47671707088
 DIST NetworkManager-l2tp-1.8.0.tar.xz 435964 BLAKE2B 05267b4bb1a824cd9478b79af4b07535b0b9245d34f49397feb778d806c814d6a7bcf723545d53b9f3d2d39e6de079fac00407e7c8d0e6389394aaf6a432b16f SHA512 8ef6732dbef2d24a51c6f70bcd98b272244dfc4d89e888e0d2c6c12b0042c1bcc750b73cdfda3489f4987af4fe85df4fc54976c48151996aa205939671d250da
 DIST NetworkManager-l2tp-1.8.2.tar.xz 437032 BLAKE2B 24d3bce74d9b57228196b288406983423a98d242fc26129a14c144269a9173d5ab2b47ad9dcf7b16dde5b9f015e6f3851e34d1ebe7e5edf6769401a2377eb0b7 SHA512 fc7f4037a4e2d442231f3c72692b7d405f13507625828dc4b975fab3717c7c0daaeaa757ef2ed875f347a87ac4ccaf5a0df1834235d8879f3d1e0d1b450531b8
 DIST NetworkManager-l2tp-1.8.6.tar.xz 446780 BLAKE2B d1cc532a5aafab6c3876c74ad88387ee3a2db2d0844a4c79bea2afcd252aab9bbef1e3435075b5089d1f8471ba41b47f6054a06e1a3440cfe5fe7c432a5ee3fe SHA512 968e8c9140f800935e57e6a58fb4cc8a92385427b8a070a5106c37f5a9d05cfcc1333fe706dfa5ae79dfdcdde89e4becd7866a4e5f535b32e1edafe7171946a7
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.6.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.6.ebuild
new file mode 100644
index 000000000000..4647b74d91e9
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="NetworkManager-l2tp"
+MY_P="${MY_PN}-${PV}"
+
+inherit autotools gnome.org
+
+DESCRIPTION="NetworkManager L2TP plugin"
+HOMEPAGE="https://github.com/nm-l2tp/network-manager-l2tp"
+SRC_URI="https://github.com/nm-l2tp/${MY_PN}/releases/download/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk static-libs"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.20[ppp]
+	dev-libs/dbus-glib
+	net-dialup/ppp:=[eap-tls]
+	net-dialup/xl2tpd
+	>=dev-libs/glib-2.32
+	|| (
+		net-vpn/strongswan
+		net-vpn/libreswan
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		app-crypt/libsecret
+		gnome-extra/nm-applet
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	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
+
+	local myeconfargs=(
+		--localstatedir=/var
+		--with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}
+		$(use_with gtk gnome)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}