Remove old versions. Quote $WORKDIR and $FILESDIR.

(Portage version: 2.0.54)

13 files changed, 21 insertions, 217 deletions

diff --git a/net-dialup/pptpclient/ChangeLog b/net-dialup/pptpclient/ChangeLog
index f62250103133..c53211e7c4d6 100644
--- a/net-dialup/pptpclient/ChangeLog
+++ b/net-dialup/pptpclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/pptpclient
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.38 2006/02/07 20:47:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.39 2006/03/13 05:53:43 mrness Exp $
+
+  13 Mar 2006; Alin Nastac <mrness@gentoo.org> -files/new-mppe/options.pptp,
+  files/options.pptp, metadata.xml, -pptpclient-1.5.0-r1.ebuild,
+  -pptpclient-1.5.0-r2.ebuild, -pptpclient-1.6.0.ebuild,
+  pptpclient-1.7.0.ebuild:
+  Remove old versions. Quote $WORKDIR and $FILESDIR.
 
   07 Feb 2006; Simon Stelling <blubb@gentoo.org> pptpclient-1.7.0.ebuild:
   stable on amd64
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index 238bd8799b4d..7e5cf1943a6f 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -1,42 +1,7 @@
 MD5 f061c51949276203668790cd8a742233 ChangeLog 5593
-RMD160 6e851583f63f4a24991c60ae669b3e44bc76182d ChangeLog 5593
-SHA256 ed4df8c47048bb6336f4ae652f443ba5e7f80025692b47c9112a7703372b55a3 ChangeLog 5593
-MD5 2ae5d625d43dc891c4e445b5049bb947 files/digest-pptpclient-1.5.0-r1 124
-RMD160 096f33c96fb9a519474ef32b421ed877cd214c79 files/digest-pptpclient-1.5.0-r1 124
-SHA256 c3d306e88d1a9b60a0e900152fd23d532a6aa8d405ca97139738763baafa9d45 files/digest-pptpclient-1.5.0-r1 124
-MD5 10a1583f3984e35a544b59b0d9595b2c files/digest-pptpclient-1.5.0-r2 135
-RMD160 45c6a522154d6069c9f926da0015b9efd0858c12 files/digest-pptpclient-1.5.0-r2 135
-SHA256 ec9b9803cb7e2548a235a93f820711b033c8c208e8792c0f6a1f1e9cd6d80545 files/digest-pptpclient-1.5.0-r2 135
-MD5 9dcb3e6b02bf8092a58d76b6d262e94b files/digest-pptpclient-1.6.0 129
-RMD160 c7b8e24722a63b88d48619cf3acef23f2e18148f files/digest-pptpclient-1.6.0 129
-SHA256 3470157c54474578f6b9fb7d44da8a8ec3e62c8e4b7bc91560dc3e94ed6e40f7 files/digest-pptpclient-1.6.0 129
-MD5 3faa8a65b9a15f9320a0ea924f25b6d3 files/digest-pptpclient-1.7.0 309
-RMD160 4d7779bbe557c0badc9e997b743764ffc7421f3c files/digest-pptpclient-1.7.0 309
-SHA256 fdd606f0eec493c216e620fab496dcf24853508902a4f2b4a3109cfe4500c69f files/digest-pptpclient-1.7.0 309
-MD5 eeee374ec64214d7f9c26a21ce8f4a36 files/new-mppe/options.pptp 340
-RMD160 adc667e771edab67316f855c8458978e386c51c3 files/new-mppe/options.pptp 340
-SHA256 cd50ad834140f6d5088d52190c5acee3eaea690cdb6550f90ba6d8837633b68e files/new-mppe/options.pptp 340
-MD5 dad6352a156cbe6ce71b057f50af2eec files/options.pptp 359
-RMD160 f9302762e0061e4fb06c86cf8ba9d34fd007567d files/options.pptp 359
-SHA256 26e794e283a186338b5306f915fe771e9209c2a23f64e5956d2d6b71a7ba22dd files/options.pptp 359
+MD5 437731fcd809ae5dd2adfc4bd5746c09 files/digest-pptpclient-1.7.0 129
+MD5 eeee374ec64214d7f9c26a21ce8f4a36 files/options.pptp 340
 MD5 34862b5af00d851d068eb3e384093c3b files/pptp_fe.pl 8100
-RMD160 4b8c4591645a5f79daf2ba27e3e657db24323ffe files/pptp_fe.pl 8100
-SHA256 f980fd3ff529bd4476852be39e05579bbeb9dc5c299795050a8d146ed6c4c648 files/pptp_fe.pl 8100
 MD5 bd60480b6ba90362342540fb9cbe7ebe files/xpptp_fe.pl 5620
-RMD160 876401b301857b17e0ced6e191316f1ff89afe19 files/xpptp_fe.pl 5620
-SHA256 18c6098a66721a4f5c5b387c2ea312c21224c11ad6b2ddaec83f63049b1ab053 files/xpptp_fe.pl 5620
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
-SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163
-MD5 91a738e62b5ea1adbef4717455f58c19 pptpclient-1.5.0-r1.ebuild 1074
-RMD160 b15d2846fce5c687094125b8e152a34ef77cccfc pptpclient-1.5.0-r1.ebuild 1074
-SHA256 53db530346af545c2c860df62d3b8658d790f2b50fbe44e65070cbc4826038e5 pptpclient-1.5.0-r1.ebuild 1074
-MD5 816f285f7a0594ba2812e7a6858977a4 pptpclient-1.5.0-r2.ebuild 1132
-RMD160 d6dbc5ea97318152bbc5f19a62fb476dd6039584 pptpclient-1.5.0-r2.ebuild 1132
-SHA256 b2915d91508abab64d1dd6bbf47f6f5e1b17ae0f1059eee57121441a8c88f787 pptpclient-1.5.0-r2.ebuild 1132
-MD5 ff3bc276a9b0c2fc6dc07f4c72a39bfb pptpclient-1.6.0.ebuild 1124
-RMD160 bef2a1e94cbe0c01a8efca0b6d4af3bf45a6ff61 pptpclient-1.6.0.ebuild 1124
-SHA256 0041f2dda22b8fce0ffa42937937fb10b298f9c311b530cb1f62c89ee20cefc0 pptpclient-1.6.0.ebuild 1124
-MD5 2dafd4bb6441f9b777238d0da7293c38 pptpclient-1.7.0.ebuild 1121
-RMD160 b504238423e9f363f822f4bbfd31f5a88b8515e1 pptpclient-1.7.0.ebuild 1121
-SHA256 92e5538923e03388500c1f8ca6910cfa2268a31414995a32c3845b4719416ab5 pptpclient-1.7.0.ebuild 1121
+MD5 ee37a5b63158f3efa67cb4fc241cf868 metadata.xml 295
+MD5 401c4cb3d91f0dfaac23675924550b2e pptpclient-1.7.0.ebuild 1142
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.5.0-r1 b/net-dialup/pptpclient/files/digest-pptpclient-1.5.0-r1
deleted file mode 100644
index 3880e63665bb..000000000000
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.5.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4c90a2d879d5fca198c93931003f7d77 pptp-command 23014
-MD5 281ee37788bdf3260426eca56a9af858 pptp-linux-1.5.0.tar.gz 223317
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.5.0-r2 b/net-dialup/pptpclient/files/digest-pptpclient-1.5.0-r2
deleted file mode 100644
index 43e8731abe14..000000000000
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.5.0-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 281ee37788bdf3260426eca56a9af858 pptp-linux-1.5.0.tar.gz 223317
-MD5 a2fd08077b4c6ab1edd9e959901639cd pptp-command-20050401.gz 7662
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.6.0 b/net-dialup/pptpclient/files/digest-pptpclient-1.6.0
deleted file mode 100644
index ab827a464ffc..000000000000
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.6.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a706327fb9827541d7c86d48ceb9631 pptp-1.6.0.tar.gz 225956
-MD5 a2fd08077b4c6ab1edd9e959901639cd pptp-command-20050401.gz 7662
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.7.0 b/net-dialup/pptpclient/files/digest-pptpclient-1.7.0
index b8506d6c0a0b..af65248414c7 100644
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.7.0
+++ b/net-dialup/pptpclient/files/digest-pptpclient-1.7.0
@@ -1,4 +1,2 @@
 MD5 0bc7dbd1c265e4263008fa7883de58dd pptp-1.7.0.tar.gz 227699
 MD5 a2fd08077b4c6ab1edd9e959901639cd pptp-command-20050401.gz 7662
-RMD160 1c02ad63aa90419bbe2151476d1463d7a26d6215 pptp-command-20050401.gz 7662
-SHA256 49cfb115491b476a364ddc03f8c1b27f7ba19b6a231eabc11e823e3f32c5987d pptp-command-20050401.gz 7662
diff --git a/net-dialup/pptpclient/files/new-mppe/options.pptp b/net-dialup/pptpclient/files/new-mppe/options.pptp
deleted file mode 100644
index 24119ad5da61..000000000000
--- a/net-dialup/pptpclient/files/new-mppe/options.pptp
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Lock the port
-#
-lock
-
-#
-# We don't need the tunnel server to authenticate itself
-#
-noauth
-
-#
-# Turn off transmission protocols we know won't be used
-#
-nobsdcomp
-nodeflate
-
-#
-# We want MPPE
-#
-require-mppe
-
-#
-# We want a sane mtu/mru
-#
-mtu 1000
-mru 1000
-
-#
-# Time this thing out of it goes poof
-#
-lcp-echo-failure 10
-lcp-echo-interval 10
diff --git a/net-dialup/pptpclient/files/options.pptp b/net-dialup/pptpclient/files/options.pptp
index 7111f0cb439c..24119ad5da61 100644
--- a/net-dialup/pptpclient/files/options.pptp
+++ b/net-dialup/pptpclient/files/options.pptp
@@ -17,9 +17,7 @@ nodeflate
 #
 # We want MPPE
 #
-mppe-40
-mppe-128
-mppe-stateless
+require-mppe
 
 #
 # We want a sane mtu/mru
diff --git a/net-dialup/pptpclient/metadata.xml b/net-dialup/pptpclient/metadata.xml
index 1e11e7bbd01b..e4b100d3112b 100644
--- a/net-dialup/pptpclient/metadata.xml
+++ b/net-dialup/pptpclient/metadata.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
+  <herd>net-dialup</herd>
+  <longdescription>PPTP Client is a client for the proprietary Microsoft Point-to-Point Tunneling Protocol.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild b/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild
deleted file mode 100644
index 4a3c4f4c5583..000000000000
--- a/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild,v 1.7 2005/10/04 19:41:23 mrness Exp $
-
-MY_P=pptp-linux-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Linux client for PPTP"
-HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://gentoo/pptp-command
-	mirror://sourceforge/pptpclient/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE="tcltk"
-
-DEPEND=">=net-dialup/ppp-2.4.2
-	dev-lang/perl
-	tcltk? ( dev-perl/perl-tk )"
-
-src_compile() {
-	emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" || die "make failed"
-}
-
-src_install() {
-	dosbin pptp
-	dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
-	dodoc Documentation/*
-	dodoc Reference/*
-	dodir /etc/pptp.d
-
-	# The current version of pptp-linux doesn't include the
-	# RH-specific portions, so include them ourselves.
-	cd ${FILESDIR}
-	insinto /etc/ppp
-	doins new-mppe/options.pptp
-	dosbin ${DISTDIR}/pptp-command pptp_fe.pl
-	use tcltk && dosbin xpptp_fe.pl
-}
diff --git a/net-dialup/pptpclient/pptpclient-1.5.0-r2.ebuild b/net-dialup/pptpclient/pptpclient-1.5.0-r2.ebuild
deleted file mode 100644
index 6191d0a1a37b..000000000000
--- a/net-dialup/pptpclient/pptpclient-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.5.0-r2.ebuild,v 1.5 2005/10/04 19:41:23 mrness Exp $
-
-MY_P=pptp-linux-${PV}
-MY_CMD=pptp-command-20050401
-
-DESCRIPTION="Linux client for PPTP"
-HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
-	mirror://gentoo/${MY_CMD}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~ppc ppc64 x86"
-IUSE="tcltk"
-
-DEPEND=">=net-dialup/ppp-2.4.2
-	dev-lang/perl
-	tcltk? ( dev-perl/perl-tk )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" || die "make failed"
-}
-
-src_install() {
-	dosbin pptp
-	dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
-	dodoc Documentation/*
-	dodoc Reference/*
-	dodir /etc/pptp.d
-
-	# The current version of pptp-linux doesn't include the
-	# RH-specific portions, so include them ourselves.
-	cd ${FILESDIR}
-	insinto /etc/ppp
-	doins new-mppe/options.pptp
-	newsbin ${WORKDIR}/${MY_CMD} pptp-command
-	dosbin pptp_fe.pl
-	use tcltk && dosbin xpptp_fe.pl
-}
diff --git a/net-dialup/pptpclient/pptpclient-1.6.0.ebuild b/net-dialup/pptpclient/pptpclient-1.6.0.ebuild
deleted file mode 100644
index 3c4985d9baa2..000000000000
--- a/net-dialup/pptpclient/pptpclient-1.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.6.0.ebuild,v 1.5 2005/12/18 17:57:05 corsair Exp $
-
-MY_P=${P/client}
-MY_CMD=pptp-command-20050401
-
-DESCRIPTION="Linux client for PPTP"
-HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
-	mirror://gentoo/${MY_CMD}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ppc ppc64 x86"
-IUSE="tcltk"
-
-DEPEND=">=net-dialup/ppp-2.4.2
-	dev-lang/perl
-	tcltk? ( dev-perl/perl-tk )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" || die "make failed"
-}
-
-src_install() {
-	dosbin pptp
-	dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
-	dodoc Documentation/*
-	dodoc Reference/*
-	dodir /etc/pptp.d
-
-	# The current version of pptp-linux doesn't include the
-	# RH-specific portions, so include them ourselves.
-	cd ${FILESDIR}
-	insinto /etc/ppp
-	doins new-mppe/options.pptp
-	newsbin ${WORKDIR}/${MY_CMD} pptp-command
-	dosbin pptp_fe.pl
-	use tcltk && dosbin xpptp_fe.pl
-}
diff --git a/net-dialup/pptpclient/pptpclient-1.7.0.ebuild b/net-dialup/pptpclient/pptpclient-1.7.0.ebuild
index 1a4dbc38a467..eaaa55c2a95d 100644
--- a/net-dialup/pptpclient/pptpclient-1.7.0.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.0.ebuild,v 1.6 2006/02/07 20:47:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.0.ebuild,v 1.7 2006/03/13 05:53:43 mrness Exp $
 
 MY_P=${P/client}
 MY_CMD=pptp-command-20050401
@@ -19,7 +19,7 @@ DEPEND=">=net-dialup/ppp-2.4.2
 	dev-lang/perl
 	tcltk? ( dev-perl/perl-tk )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" || die "make failed"
@@ -34,10 +34,9 @@ src_install() {
 
 	# The current version of pptp-linux doesn't include the
 	# RH-specific portions, so include them ourselves.
-	cd ${FILESDIR}
 	insinto /etc/ppp
-	doins new-mppe/options.pptp
-	newsbin ${WORKDIR}/${MY_CMD} pptp-command
-	dosbin pptp_fe.pl
-	use tcltk && dosbin xpptp_fe.pl
+	doins "${FILESDIR}/options.pptp"
+	newsbin "${WORKDIR}/${MY_CMD}" pptp-command
+	dosbin "${FILESDIR}/pptp_fe.pl"
+	use tcltk && dosbin "${FILESDIR}/xpptp_fe.pl"
 }