gentoo Easter resync : 12.04.2020

4 files changed, 72 insertions, 6 deletions

diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
index 1efcb3c956b2..d71c2296c8ce 100644
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -1,3 +1,5 @@
-DIST NetworkManager-l2tp-1.2.12.tar.xz 397496 BLAKE2B 7ff57356dcb27d37af52d2f1778875632f65705ee2bff6a047415fef2c1d34fcc11abae08053283ba63ffe92726efc32027d703f50c82a1527f500b81305794f SHA512 b3e6ab72e81df568b77afabd91cef40b35d2b9227087495b0b44f966ef937b6c78ccc94b019102c13fc76ba443f850fffe1ad7445f5967a1737532036e632422
-EBUILD networkmanager-l2tp-1.2.12.ebuild 972 BLAKE2B c1fe49aba715e0b0cb88491569bb5d8a4e24cc0be4640644618fc1b26bd0c5447fb97a6ef4730840d95ea27684258f572865fb88ce8d24d4349a47c0781cd58e SHA512 a980692d97236675f262084e30fa86f4cc7f3098cc90e48379792d4d5ed2c92f43aedeb0dedab170ac5c347c87bbefb3e87386c98624d7a33eb58c3d5bcdc791
-MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
+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
+EBUILD networkmanager-l2tp-1.8.0.ebuild 1019 BLAKE2B 241f70815f1ddf33538f8aa76e4dad804266a575f99b6c2ed31bbbff6bcbab24637d283bef2a2b291d549c3250262d4a61c26c867a50519dd611097453898100 SHA512 9da473609097d6f1136775f9a047abbd03504dba14e46aa9993a00aef71c194be23ca41bc30a91d72f2b94e2e1b02ada484ab687990a4b9cb23648f95c413591
+EBUILD networkmanager-l2tp-1.8.2.ebuild 1019 BLAKE2B 241f70815f1ddf33538f8aa76e4dad804266a575f99b6c2ed31bbbff6bcbab24637d283bef2a2b291d549c3250262d4a61c26c867a50519dd611097453898100 SHA512 9da473609097d6f1136775f9a047abbd03504dba14e46aa9993a00aef71c194be23ca41bc30a91d72f2b94e2e1b02ada484ab687990a4b9cb23648f95c413591
+MISC metadata.xml 361 BLAKE2B 3cbc2e35a93fc771cbf0d9152b5f5b0059f6ba114f176135a193b78f2462151e5fd4276082c8912fb6d695f10247b48b6f4dd590a08b09784f008224380fd520 SHA512 d23341b2bf05543c1d41a25aa10bf1afcff3f8c235f08f0063f928e0027236d754cae539ed770acfd14aaf2a791fa932b7d663bffc423515ded5f555c6b71e0e
diff --git a/net-vpn/networkmanager-l2tp/metadata.xml b/net-vpn/networkmanager-l2tp/metadata.xml
index 086586c08a88..a9662f61facc 100644
--- a/net-vpn/networkmanager-l2tp/metadata.xml
+++ b/net-vpn/networkmanager-l2tp/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.2.12.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.0.ebuild
index a1b6b45566a7..a2d16e139bf6 100644
--- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.2.12.ebuild
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,10 +23,14 @@ RDEPEND="
 	net-dialup/ppp[eap-tls]
 	net-dialup/xl2tpd
 	>=dev-libs/glib-2.32
-	net-vpn/libreswan
+	|| (
+		net-vpn/strongswan
+		net-vpn/libreswan
+	)
 	gnome? (
 		x11-libs/gtk+:3
-		gnome-base/libgnome-keyring
+		app-crypt/libsecret
+		gnome-extra/nm-applet
 	)"
 
 BDEPEND="${RDEPEND}
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild
new file mode 100644
index 000000000000..a2d16e139bf6
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 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 eutils 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
+	)"
+
+BDEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		$(use_with gnome)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}