gentoo resync : 28.07.2021

3 files changed, 72 insertions, 4 deletions

diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
index a9fccd25e576..63984371f981 100644
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD networkmanager-l2tp-1.8.0.ebuild 1012 BLAKE2B 1beecaeb16823ca7bc7fcca4f237616e642279876192b171a9822375c24f56aeef99c2720faaaf904bb968a1c9fda241e0b398fc9be91c18a2c04251babc6c2f SHA512 0b5ee5a8ef5ca4b17db896ca4424e1427e12cb104707fdc1fab4c2b319b5c5bbea29ebc4de68e87740b2ec31ff588511c6d068511647509ff4701c34b8b16b3a
-EBUILD networkmanager-l2tp-1.8.2.ebuild 1012 BLAKE2B 1beecaeb16823ca7bc7fcca4f237616e642279876192b171a9822375c24f56aeef99c2720faaaf904bb968a1c9fda241e0b398fc9be91c18a2c04251babc6c2f SHA512 0b5ee5a8ef5ca4b17db896ca4424e1427e12cb104707fdc1fab4c2b319b5c5bbea29ebc4de68e87740b2ec31ff588511c6d068511647509ff4701c34b8b16b3a
+EBUILD networkmanager-l2tp-1.8.2-r1.ebuild 1262 BLAKE2B c0f60d71ed6f56b2d224c9b242a9df450534ec30972a7af7d6e70fd6196af017254b017719ab3b8f880864004a6821a137a9465d6e3d87c4711aed7338d1dbe1 SHA512 8dba4d68f5cc7a9e603b718c73a4582cf76f3888cb83acc2b717f6468b6641191ecd4fde113e9f0c1e9646c18f9b5ed400c972f0a0c4a5ba4d615f99c25c9005
+EBUILD networkmanager-l2tp-1.8.6.ebuild 1262 BLAKE2B c0f60d71ed6f56b2d224c9b242a9df450534ec30972a7af7d6e70fd6196af017254b017719ab3b8f880864004a6821a137a9465d6e3d87c4711aed7338d1dbe1 SHA512 8dba4d68f5cc7a9e603b718c73a4582cf76f3888cb83acc2b717f6468b6641191ecd4fde113e9f0c1e9646c18f9b5ed400c972f0a0c4a5ba4d615f99c25c9005
 MISC metadata.xml 361 BLAKE2B 3cbc2e35a93fc771cbf0d9152b5f5b0059f6ba114f176135a193b78f2462151e5fd4276082c8912fb6d695f10247b48b6f4dd590a08b09784f008224380fd520 SHA512 d23341b2bf05543c1d41a25aa10bf1afcff3f8c235f08f0063f928e0027236d754cae539ed770acfd14aaf2a791fa932b7d663bffc423515ded5f555c6b71e0e
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2-r1.ebuild
index ec5ca2a6ddea..0db9addd3960 100644
--- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="gnome static-libs"
 RDEPEND="
 	>=net-misc/networkmanager-1.2[ppp]
 	dev-libs/dbus-glib
-	net-dialup/ppp[eap-tls]
+	net-dialup/ppp:=[eap-tls]
 	net-dialup/xl2tpd
 	>=dev-libs/glib-2.32
 	|| (
@@ -32,8 +32,8 @@ RDEPEND="
 		app-crypt/libsecret
 		gnome-extra/nm-applet
 	)"
-
-BDEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	dev-util/intltool
 	virtual/pkgconfig"
@@ -46,8 +46,13 @@ src_prepare() {
 }
 
 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 gnome)
 		$(use_enable static-libs static)
 	)
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild
new file mode 100644
index 000000000000..0db9addd3960
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="NetworkManager-l2tp"
+MY_P="${MY_PN}-${PV}"
+
+inherit gnome.org autotools
+
+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="gnome static-libs"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2[ppp]
+	dev-libs/dbus-glib
+	net-dialup/ppp:=[eap-tls]
+	net-dialup/xl2tpd
+	>=dev-libs/glib-2.32
+	|| (
+		net-vpn/strongswan
+		net-vpn/libreswan
+	)
+	gnome? (
+		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() {
+	eautoreconf
+	eapply_user
+}
+
+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 gnome)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}