Removed old versions. Added pptp-command to SRC_URI

14 files changed, 27 insertions, 145 deletions

diff --git a/net-dialup/pptpclient/ChangeLog b/net-dialup/pptpclient/ChangeLog
index 4cfbf238cfb0..9a9a2d1667c9 100644
--- a/net-dialup/pptpclient/ChangeLog
+++ b/net-dialup/pptpclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/pptpclient
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.16 2004/10/02 12:50:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.17 2004/10/06 07:27:59 dragonheart Exp $
+
+  06 Oct 2004; Daniel Black <dragonheart@gentoo.org>
+  -pptpclient-1.1.0-r1.ebuild, -pptpclient-1.1.0.ebuild,
+  -pptpclient-1.2.0.ebuild, pptpclient-1.3.1.ebuild, pptpclient-1.4.0.ebuild,
+  pptpclient-1.5.0.ebuild:
+  Removed old versions. Added pptp-command to SRC_URI - Thanks to email from
+  Torben Frey <kic@lavalite.de> for the notification
 
   02 Oct 2004; Daniel Black <dragonheart@gentoo.org> -files/pptp-command,
   -files/pptp-init, pptpclient-1.1.0-r1.ebuild, pptpclient-1.1.0.ebuild,
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index 28865ddb7dff..7f14d56eda8d 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -1,17 +1,11 @@
-MD5 9446e1af1abe6545c389ddc0f8ef7d8a ChangeLog 2566
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 1abeaab95c3719d9d5152895a5911b7f pptpclient-1.1.0-r1.ebuild 1062
-MD5 e595ec9a9bd07ea24224b725541adb8b pptpclient-1.1.0.ebuild 882
-MD5 d0bf5066f898aed6e25b99d574e0e9cb pptpclient-1.2.0.ebuild 1000
-MD5 aa6db8d89abf63d7cbaa574329dd0c1d pptpclient-1.3.1.ebuild 1019
-MD5 a4a6be8fd47765a4a18b36005d8ac28f pptpclient-1.4.0.ebuild 1024
-MD5 c9c2801bbeb47e05551167b76eb686f9 pptpclient-1.5.0.ebuild 1061
-MD5 ddba6ac5fde52ccc46d17bc1f5822a39 files/digest-pptpclient-1.1.0 70
-MD5 ddba6ac5fde52ccc46d17bc1f5822a39 files/digest-pptpclient-1.1.0-r1 70
-MD5 87d3d997b8edfa7e7590b71edc635168 files/digest-pptpclient-1.2.0 68
-MD5 f94e15d8f5d315c95f576882fd1f1b3e files/digest-pptpclient-1.3.1 68
-MD5 2150240306c9a7345566f1c5944eca57 files/digest-pptpclient-1.4.0 68
+MD5 9446e1af1abe6545c389ddc0f8ef7d8a ChangeLog 2566
+MD5 14b1974b5020e48e5114a99ccab25147 pptpclient-1.3.1.ebuild 1049
+MD5 bffadea71fc42cbac51ead0147991035 pptpclient-1.4.0.ebuild 1054
+MD5 84c081db1530f255ed7a9d2a5f260baf pptpclient-1.5.0.ebuild 1091
+MD5 5e3ae8ec4aa13dfc12f71d856a170c99 files/digest-pptpclient-1.3.1 124
 MD5 dad6352a156cbe6ce71b057f50af2eec files/options.pptp 359
 MD5 34862b5af00d851d068eb3e384093c3b files/pptp_fe.pl 8100
 MD5 bd60480b6ba90362342540fb9cbe7ebe files/xpptp_fe.pl 5620
-MD5 9c2fa1fb3465e3b8ec3c0449aaf3ffea files/digest-pptpclient-1.5.0 68
+MD5 017b89e37327254726e469d4346b61f5 files/digest-pptpclient-1.4.0 124
+MD5 2ae5d625d43dc891c4e445b5049bb947 files/digest-pptpclient-1.5.0 124
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.1.0 b/net-dialup/pptpclient/files/digest-pptpclient-1.1.0
deleted file mode 100644
index f9a5222ecb56..000000000000
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03e340eb0a9118a8de94eef21560d6c9 pptp-linux-1.1.0-1.tar.gz 220286
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.1.0-r1 b/net-dialup/pptpclient/files/digest-pptpclient-1.1.0-r1
deleted file mode 100644
index f9a5222ecb56..000000000000
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03e340eb0a9118a8de94eef21560d6c9 pptp-linux-1.1.0-1.tar.gz 220286
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.2.0 b/net-dialup/pptpclient/files/digest-pptpclient-1.2.0
deleted file mode 100644
index 0d8422644dc2..000000000000
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6e5072c62046abc14c5b356d33d52cb pptp-linux-1.2.0.tar.gz 211258
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.3.1 b/net-dialup/pptpclient/files/digest-pptpclient-1.3.1
index ba48ccde756b..f6d0032bc315 100644
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.3.1
+++ b/net-dialup/pptpclient/files/digest-pptpclient-1.3.1
@@ -1 +1,2 @@
+MD5 4c90a2d879d5fca198c93931003f7d77 pptp-command 23014
 MD5 b24ca05422c0e62d7a26edbbec604a89 pptp-linux-1.3.1.tar.gz 215987
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.4.0 b/net-dialup/pptpclient/files/digest-pptpclient-1.4.0
index 98d34cfe69c6..73cb3c2789f6 100644
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.4.0
+++ b/net-dialup/pptpclient/files/digest-pptpclient-1.4.0
@@ -1 +1,2 @@
+MD5 4c90a2d879d5fca198c93931003f7d77 pptp-command 23014
 MD5 9e5c07de3e347c7125ed94824cebeaee pptp-linux-1.4.0.tar.gz 220425
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.5.0 b/net-dialup/pptpclient/files/digest-pptpclient-1.5.0
index 586ca8089eab..3880e63665bb 100644
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.5.0
+++ b/net-dialup/pptpclient/files/digest-pptpclient-1.5.0
@@ -1 +1,2 @@
+MD5 4c90a2d879d5fca198c93931003f7d77 pptp-command 23014
 MD5 281ee37788bdf3260426eca56a9af858 pptp-linux-1.5.0.tar.gz 223317
diff --git a/net-dialup/pptpclient/pptpclient-1.1.0-r1.ebuild b/net-dialup/pptpclient/pptpclient-1.1.0-r1.ebuild
deleted file mode 100644
index 9daad251dc0d..000000000000
--- a/net-dialup/pptpclient/pptpclient-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.1.0-r1.ebuild,v 1.11 2004/10/04 22:52:59 pvdabeel Exp $
-
-
-S=${WORKDIR}/pptp-linux-${PV}-1
-DESCRIPTION="Linux client for PPTP"
-HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pptpclient/pptp-linux-${PV}-1.tar.gz"
-
-DEPEND="net-dialup/ppp
-		dev-lang/perl
-		tcltk? ( dev-perl/perl-tk )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc amd64"
-IUSE="tcltk"
-
-src_compile() {
-	cd ${S}
-	tar zxf pptp-linux-${PV}.tar.gz
-	cd ${S}/pptp-linux-${PV}
-
-	make || die "make failed"
-}
-
-src_install() {
-	cd ${S}
-	insinto /etc/ppp
-	doins options.pptp
-	dosbin ${DISTDIR}/pptp-command pptp_fe.pl
-
-	if use tcltk ; then
-		sed s/pptp_fe/pptp_fe.pl/g < xpptp_fe.pl > xpptp_fe.pl.new
-		mv xpptp_fe.pl.new xpptp_fe.pl
-		dosbin xpptp_fe.pl
-	fi
-
-	cd pptp-linux-${PV}
-	dosbin pptp
-
-	dodoc AUTHORS COPYING ChangeLog DEVELOPERS NEWS README TODO USING
-	dodoc Documentation/*
-	dodoc Reference/*
-}
diff --git a/net-dialup/pptpclient/pptpclient-1.1.0.ebuild b/net-dialup/pptpclient/pptpclient-1.1.0.ebuild
deleted file mode 100644
index cdecfa69f340..000000000000
--- a/net-dialup/pptpclient/pptpclient-1.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.1.0.ebuild,v 1.12 2004/10/02 12:50:27 dragonheart Exp $
-
-
-S=${WORKDIR}/pptp-linux-${PV}-1
-DESCRIPTION="Linux client for PPTP"
-HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pptpclient/pptp-linux-${PV}-1.tar.gz"
-
-DEPEND="net-dialup/ppp"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc amd64"
-IUSE=""
-
-src_compile() {
-	cd ${S}
-	tar zxf pptp-linux-${PV}.tar.gz
-	cd ${S}/pptp-linux-${PV}
-
-	make || die "make failed"
-}
-
-src_install() {
-	cd ${S}
-	insinto /etc/ppp
-	doins options.pptp
-	dosbin ${DISTDIR}/pptp-command pptp_fe.pl xpptp_fe.pl
-
-	cd pptp-linux-${PV}
-	dosbin pptp
-
-	dodoc AUTHORS COPYING ChangeLog DEVELOPERS NEWS README TODO USING
-	dodoc Documentation/*
-	dodoc Reference/*
-}
diff --git a/net-dialup/pptpclient/pptpclient-1.2.0.ebuild b/net-dialup/pptpclient/pptpclient-1.2.0.ebuild
deleted file mode 100644
index 4b741fb4bb48..000000000000
--- a/net-dialup/pptpclient/pptpclient-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.2.0.ebuild,v 1.10 2004/10/04 22:52:59 pvdabeel Exp $
-
-MY_P=pptp-linux-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Linux client for PPTP"
-HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc amd64 alpha"
-IUSE="tcltk"
-
-DEPEND="net-dialup/ppp
-		dev-lang/perl
-		tcltk? ( dev-perl/perl-tk )"
-
-src_compile() {
-	make || die "make failed"
-}
-
-src_install() {
-	dosbin pptp
-	dodoc AUTHORS COPYING 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 options.pptp
-	dosbin ${DISTDIR}/pptp-command pptp_fe.pl
-	use tcltk && dosbin xpptp_fe.pl
-}
diff --git a/net-dialup/pptpclient/pptpclient-1.3.1.ebuild b/net-dialup/pptpclient/pptpclient-1.3.1.ebuild
index 53a23f115a06..4de413cd5009 100644
--- a/net-dialup/pptpclient/pptpclient-1.3.1.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.3.1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.3.1.ebuild,v 1.6 2004/10/04 22:52:59 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.3.1.ebuild,v 1.7 2004/10/06 07:27:59 dragonheart Exp $
 
 MY_P=pptp-linux-${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Linux client for PPTP"
 HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/pptp-command
+	mirror://sourceforge/pptpclient/${MY_P}.tar.gz"
 RESTRICT="nomirror"
 
 SLOT="0"
diff --git a/net-dialup/pptpclient/pptpclient-1.4.0.ebuild b/net-dialup/pptpclient/pptpclient-1.4.0.ebuild
index 995f63fc75b2..cdcb59635d17 100644
--- a/net-dialup/pptpclient/pptpclient-1.4.0.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.4.0.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.4.0.ebuild,v 1.4 2004/10/02 12:50:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.4.0.ebuild,v 1.5 2004/10/06 07:27:59 dragonheart Exp $
 
 MY_P=pptp-linux-${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Linux client for PPTP"
 HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/pptp-command
+	mirror://sourceforge/pptpclient/${MY_P}.tar.gz"
 RESTRICT="nomirror"
 
 SLOT="0"
diff --git a/net-dialup/pptpclient/pptpclient-1.5.0.ebuild b/net-dialup/pptpclient/pptpclient-1.5.0.ebuild
index 3767417c4fb8..0a8b722f4ade 100644
--- a/net-dialup/pptpclient/pptpclient-1.5.0.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.5.0.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 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.ebuild,v 1.2 2004/10/02 12:50:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.5.0.ebuild,v 1.3 2004/10/06 07:27:59 dragonheart Exp $
 
 MY_P=pptp-linux-${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Linux client for PPTP"
 HOMEPAGE="http://pptpclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/pptp-command
+	mirror://sourceforge/pptpclient/${MY_P}.tar.gz"
 RESTRICT="nomirror"
 
 SLOT="0"