gentoo resync : 25.04.2020

3 files changed, 56 insertions, 1 deletions

diff --git a/net-vpn/networkmanager-pptp/Manifest b/net-vpn/networkmanager-pptp/Manifest
index f06362829fd1..5625fa07c76c 100644
--- a/net-vpn/networkmanager-pptp/Manifest
+++ b/net-vpn/networkmanager-pptp/Manifest
@@ -1,3 +1,4 @@
 DIST NetworkManager-pptp-1.2.8.tar.xz 401540 BLAKE2B 64b3fe344a39eb64b462bda9204fb80b95a6cb54988efef9dbd1a5a6b04b3577edee97afabef410488868736d751846bdd98f3965a96806790527434c8207ec8 SHA512 ff1bee257d6aa6750c2fbd302edc3022780e9182fde1d79d4b37246daf01b0a9e5115dd64ec70a4b128e273eff6f9bc22af87fe2b25618008be6f452bbcd41a7
-EBUILD networkmanager-pptp-1.2.8-r1.ebuild 1264 BLAKE2B b1f5f9300ca6a16cfecc53be1e69976dba53302e18e94fc393ef9b3aec9769a2750318da399048b4007f1687f29d99325707d6baf48f849a660d026afce49a16 SHA512 549826222778c2ac48a8707e192fad7d4fa4ea72090434e5807d57b31d5d780f2bd417fea3854ffd4fa7bdc0c0d00ef906f00ec0a08372ff1cbcdae49747fafa
+EBUILD networkmanager-pptp-1.2.8-r1.ebuild 1296 BLAKE2B 3b76312220594f32ec8652edce5c4c80f8ef045d8170b05a5105926c7224483e2b905d13e89bc7a93d2f71a98afcb3b0994abeee9135e85d75426e1830a221ec SHA512 94c9a4ff66f7098e88e647c96b0c7824c017028154de0b09acf7ed1bb730094dba2af021841e489a8c1310c1911ab64ec16e244ac8ca62f5e2d844d0429c2cf0
+EBUILD networkmanager-pptp-1.2.8-r2.ebuild 1279 BLAKE2B cd1492ed7f97a1e0f7dca2849058eff09ceb00590f5b6a9bf9b6a28e6c881842ae7a32145b15498210b916c4e07d2a80d0c4e3f31324c9c241c6a2fe0e6d450c SHA512 4c3445bc13eea26cfab2735ac587f7578633508c315e56997f2cb8e9ea8fd32df8d82a4560c323dbbb81ed12b08b8521fdf20328c8ab509faee7d93d09a3e88e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild
index 0a3a2b4956e6..f1715f8f01a7 100644
--- a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild
+++ b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	net-dialup/pptpclient
 	gtk? (
 		>=app-crypt/libsecret-0.18
+		<net-misc/networkmanager-1.19
 		>=gnome-extra/nm-applet-1.2.0[gtk]
 		>=x11-libs/gtk+-3.4:3
 	)
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 000000000000..276b82f69612
--- /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}
+}