Version bump, drop old, set pptpd plugin dir properly

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 64 insertions, 9 deletions

diff --git a/net-misc/networkmanager-pptp/ChangeLog b/net-misc/networkmanager-pptp/ChangeLog
index 5da3c68bd256..e618e8b87521 100644
--- a/net-misc/networkmanager-pptp/ChangeLog
+++ b/net-misc/networkmanager-pptp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/networkmanager-pptp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/ChangeLog,v 1.40 2014/06/24 01:23:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/ChangeLog,v 1.41 2014/09/23 12:07:44 pacho Exp $
+
+*networkmanager-pptp-0.9.10.0 (23 Sep 2014)
+
+  23 Sep 2014; Pacho Ramos <pacho@gentoo.org>
+  +networkmanager-pptp-0.9.10.0.ebuild:
+  Version bump, drop old, set pptpd plugin dir properly
 
   24 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   networkmanager-pptp-0.9.8.4.ebuild:
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index dc9b53bcdead..a8cffcac62e5 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST NetworkManager-pptp-0.9.10.0.tar.xz 350984 SHA256 564b16c9b2821a1d2ede06f56f4db5cb0d62ccb35f87c92ad6c636ed48e0af58 SHA512 97ed2840e3615d9131319e752536fd5ed30d8fe1e3084fd82ec963f5efa30ff627cd30d1c21cc6382ea58c2edd4422d3ce597d170bb26c2471d044c19c19b2c8 WHIRLPOOL 932d9eeb9f2dce7cb528e5fd6f841208f09454830365ae99c1afa9c26bc05a6049a1b50c52b66d61a3eec9ef976f3eee2b9a9b01ed57b9a9b822c01430c96aa1
 DIST NetworkManager-pptp-0.9.8.4.tar.xz 353004 SHA256 97ba8f6f726056c3b8e0e1c8d2ab3d32791cadd7c3a38e0478fb2bd3ecafdce8 SHA512 86138cb91b22596c075575cad7ad6c5c9efa3cc6d3491bb148b6ba79007968764b6043c3b89d1034b6825d25f2cf56158f9f278d5a2c12636e34c541384e5489 WHIRLPOOL 2ce9389bbc3623748f74e706389ae7b6969aa82fe0c63dcc6293721b90d373d4046a7a89c09e26a80531724b7208eba49871b139924141969dddb519f9e6884d
+EBUILD networkmanager-pptp-0.9.10.0.ebuild 1310 SHA256 b7e9980a3ff736cee211ae5be5ae335901561b93e60dbace8b011ca6fec2e54f SHA512 89628f130bf44cf660c45c4b26b49e7c9c7c92d2ce6e17e33e6b25388ec1c0e8d58d7b1a13190acbaa7aff5e2656fa795e4b0e183b6ad403153ba02a8ec2ffec WHIRLPOOL 21c6fcea2e63038fdb25d50c9aabe380ad72494a38eba66878b0aa71c1bc25abda474968a7f35d1ea8fa08ad65f64ab00c47405f17c013419c2aa00c6948fbe2
 EBUILD networkmanager-pptp-0.9.8.4.ebuild 1045 SHA256 67fafa26d0f9304dc81120d10fbd7083676c32d9154a4a89754c03449035edc1 SHA512 39e99d26b930f3d518c7204e0aa8a9d7f24039129dee468958374972e2b5416cac736d886fc85c6971540a562015ad0f8aae14eb5a0ee5beb1aa4c9318ad643e WHIRLPOOL 58920b866a6e413976ea0106b36bdc604ee1545dfef00f63612f6cb8549959108c68a7b4c2fc4e426eccb230afa16ed4c1379d5d8f76ae70d43d254f50904337
-MISC ChangeLog 7201 SHA256 483f771e60cf38b89b3aeeffd538edc0e8b7cd781d48edf90590ce749cee5539 SHA512 e9a43aea739cbbac7788ed4370da675f55b634125bdebacc1271cbdcec291ceba715f3be71bb7d411c3b420a217fa732d66a3fca1400fb8e40995d787b062adb WHIRLPOOL ea01b4fcfdcde89b6cdf13cfc0988631ed72577b004232b412930ebcf036f2801de29df3702e34c0c075204e0fc2edc071bd2601056c9f504b9c77faea2d73dd
+MISC ChangeLog 7385 SHA256 b1edb2cb390d3ba0afaf558fa4e0b9fac1d61ffc4b74ac4d41847bc5d92e5fbc SHA512 41bf4c114a8cb3bdee0a541d1d4b63864d2d8db716de4263481703fde7f39ce90436fbf7547f9d750f8345409ad30918fc92b8ec4cdd33edddfae70fc8d4e26f WHIRLPOOL 9b859db5833660797c39be32bd3f528feb4a947308424c8d3bcd660989e314b2aa16d1f088d156658caf6d0903b5d5c8d514ba8e3fbcdb25f9112f50f0e03e2d
 MISC metadata.xml 257 SHA256 a5789d9be253767cbc21f45ce73723ac16e2c45637033a3b67ec1e9f12ae8846 SHA512 0947d371f24a86e39c1faeb42f6d635550d7cf96480bf36eccbcbed7dc73c80c51c9ebe90c9749257e17950247b47eea19aae5161722e789efb0e212efcb6640 WHIRLPOOL 7a5853a2040251133a790c202b92b0e3ba151700cdf0b7c60a21d41ea90377155296a16d5f3085e6933fe2991290e7ae03958f7477112e195b06c977a1b8a049
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTqNK0AAoJEJ0WA1zPCt1hBG4IAKXIA8mbb1ewV0xzrWrQXAw2
-dGvZfbHRV89absyY15F4ffxc2g+KqEVKl5ce7rPhsC0ZI9meWA47o8bnAw6qaUaj
-UIN7igBiBgS/SE4HXhmyIMy8/TUERIlEO/mzBffQXZ6kl+bVDb371FzL5zxOxLT+
-4c/ysN6c/fCo9jZJ7toLivo3bF9gxkCFp8vGtRAgpDdWzC+tZOMTCoSjKdBrOjkd
-r28e6uy8Ezv86gFIluGmmrbarWOivpNt3HejNy0wxWRZinh4tBJQ9nVHFMXvz2xI
-JEGdMO5xcUIjaxENFtU+SD3/Qa5bHmJcTj2D4rFzzBm/PuZZ8XhLvXgxwpORcoE=
-=EwbX
+iEYEAREIAAYFAlQhYpEACgkQCaWpQKGI+9Ry1wCfWaMoRWy3NxfbYCmuTpOprFb6
+O08AnjdGfS6eHL5e/BSI6Bl8SdX/7DzF
+=P7lV
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild
new file mode 100644
index 000000000000..1c5d7c31d467
--- /dev/null
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild,v 1.1 2014/09/23 12:07:44 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager PPTP plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-0.9.6
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32:2
+	net-dialup/ppp:=
+	net-dialup/pptpclient
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-0.9.9.0
+		>=x11-libs/gtk+-3.4:3
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	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) \
+		${myconf}
+}