Remove obsolete version. Mark stable on x86. Version bump. Remove INSTALL from docs

(Portage version: 2.0.51.22-r2)

8 files changed, 44 insertions, 42 deletions

diff --git a/net-dialup/pptpclient/ChangeLog b/net-dialup/pptpclient/ChangeLog
index 0d90ed6f10d6..6dd9a54c0bb4 100644
--- a/net-dialup/pptpclient/ChangeLog
+++ b/net-dialup/pptpclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/pptpclient
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.29 2005/09/17 12:05:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.30 2005/10/04 19:41:23 mrness Exp $
+
+*pptpclient-1.7.0 (04 Oct 2005)
+
+  04 Oct 2005; Alin Nastac <mrness@gentoo.org> -pptpclient-1.3.1.ebuild,
+  pptpclient-1.5.0-r1.ebuild, pptpclient-1.5.0-r2.ebuild,
+  pptpclient-1.6.0.ebuild, +pptpclient-1.7.0.ebuild:
+  Remove obsolete version. Mark stable on x86. Version bump. Remove INSTALL
+  from docs.
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   pptpclient-1.5.0-r2.ebuild:
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index c3656dd555a6..260784fc5fbc 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 6f9302a1736918cbbd1a3e82e73d3307 pptpclient-1.3.1.ebuild 1027
-MD5 320b285b53c31af72ee0db09214c972e pptpclient-1.5.0-r1.ebuild 1082
-MD5 77cbfb3af01995f350eed8a9abf00f4e pptpclient-1.5.0-r2.ebuild 1143
-MD5 8555f7d4944711bf8013248431910dfd pptpclient-1.6.0.ebuild 1135
+MD5 ed8b1900ec1bbddc148dfee83d9be7a1 pptpclient-1.7.0.ebuild 1127
+MD5 a347423b3dda6150d0b2757868b80c18 pptpclient-1.5.0-r1.ebuild 1074
+MD5 36a6bc33786d71c408119ef6613a4318 pptpclient-1.5.0-r2.ebuild 1134
 MD5 03f8ba3133251f923890389c48684abf ChangeLog 4510
-MD5 5e3ae8ec4aa13dfc12f71d856a170c99 files/digest-pptpclient-1.3.1 124
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 4c2f7db2a928d9defa5104aa2f6f1d2a pptpclient-1.6.0.ebuild 1126
+MD5 dad6352a156cbe6ce71b057f50af2eec files/options.pptp 359
+MD5 34862b5af00d851d068eb3e384093c3b files/pptp_fe.pl 8100
 MD5 2ae5d625d43dc891c4e445b5049bb947 files/digest-pptpclient-1.5.0-r1 124
 MD5 10a1583f3984e35a544b59b0d9595b2c files/digest-pptpclient-1.5.0-r2 135
 MD5 9dcb3e6b02bf8092a58d76b6d262e94b files/digest-pptpclient-1.6.0 129
-MD5 dad6352a156cbe6ce71b057f50af2eec files/options.pptp 359
-MD5 34862b5af00d851d068eb3e384093c3b files/pptp_fe.pl 8100
+MD5 437731fcd809ae5dd2adfc4bd5746c09 files/digest-pptpclient-1.7.0 129
 MD5 bd60480b6ba90362342540fb9cbe7ebe files/xpptp_fe.pl 5620
 MD5 eeee374ec64214d7f9c26a21ce8f4a36 files/new-mppe/options.pptp 340
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLAaKKf2g/qXtneoRAoDrAJ4p2+Ab54FlLf2Djlt6dhwGAOiEkACeMuYR
-BXuDhIdGkRXAWHX7VJopKPw=
-=knrz
------END PGP SIGNATURE-----
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.3.1 b/net-dialup/pptpclient/files/digest-pptpclient-1.3.1
deleted file mode 100644
index f6d0032bc315..000000000000
--- a/net-dialup/pptpclient/files/digest-pptpclient-1.3.1
+++ /dev/null
@@ -1,2 +0,0 @@
-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.7.0 b/net-dialup/pptpclient/files/digest-pptpclient-1.7.0
new file mode 100644
index 000000000000..af65248414c7
--- /dev/null
+++ b/net-dialup/pptpclient/files/digest-pptpclient-1.7.0
@@ -0,0 +1,2 @@
+MD5 0bc7dbd1c265e4263008fa7883de58dd pptp-1.7.0.tar.gz 227699
+MD5 a2fd08077b4c6ab1edd9e959901639cd pptp-command-20050401.gz 7662
diff --git a/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild b/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild
index f811777b14d0..4a3c4f4c5583 100644
--- a/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2005/06/17 20:24:32 hansmi Exp $
+# $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}
@@ -24,7 +24,7 @@ src_compile() {
 
 src_install() {
 	dosbin pptp
-	dodoc AUTHORS COPYING ChangeLog DEVELOPERS NEWS README TODO USING
+	dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
 	dodoc Documentation/*
 	dodoc Reference/*
 	dodir /etc/pptp.d
diff --git a/net-dialup/pptpclient/pptpclient-1.5.0-r2.ebuild b/net-dialup/pptpclient/pptpclient-1.5.0-r2.ebuild
index 95570499d7e3..6191d0a1a37b 100644
--- a/net-dialup/pptpclient/pptpclient-1.5.0-r2.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2005/09/15 22:22:43 agriffis Exp $
+# $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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~ppc ppc64 ~x86"
+KEYWORDS="alpha ~amd64 ~ppc ppc64 x86"
 IUSE="tcltk"
 
 DEPEND=">=net-dialup/ppp-2.4.2
@@ -27,7 +27,7 @@ src_compile() {
 
 src_install() {
 	dosbin pptp
-	dodoc AUTHORS COPYING ChangeLog DEVELOPERS NEWS README TODO USING
+	dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
 	dodoc Documentation/*
 	dodoc Reference/*
 	dodir /etc/pptp.d
diff --git a/net-dialup/pptpclient/pptpclient-1.6.0.ebuild b/net-dialup/pptpclient/pptpclient-1.6.0.ebuild
index afb5c4c6830c..22cedd30cb54 100644
--- a/net-dialup/pptpclient/pptpclient-1.6.0.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2005/04/16 16:34:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.6.0.ebuild,v 1.2 2005/10/04 19:41:23 mrness Exp $
 
 MY_P=${P/client}
 MY_CMD=pptp-command-20050401
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 x86"
 IUSE="tcltk"
 
 DEPEND=">=net-dialup/ppp-2.4.2
@@ -27,7 +27,7 @@ src_compile() {
 
 src_install() {
 	dosbin pptp
-	dodoc AUTHORS COPYING ChangeLog DEVELOPERS NEWS README TODO USING
+	dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
 	dodoc Documentation/*
 	dodoc Reference/*
 	dodir /etc/pptp.d
diff --git a/net-dialup/pptpclient/pptpclient-1.3.1.ebuild b/net-dialup/pptpclient/pptpclient-1.7.0.ebuild
index b7762f51c6b2..e0962587cb43 100644
--- a/net-dialup/pptpclient/pptpclient-1.3.1.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.7.0.ebuild
@@ -1,30 +1,33 @@
 # 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.3.1.ebuild,v 1.9 2005/02/12 09:23:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.0.ebuild,v 1.1 2005/10/04 19:41:23 mrness Exp $
+
+MY_P=${P/client}
+MY_CMD=pptp-command-20050401
 
-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"
+SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
+	mirror://gentoo/${MY_CMD}.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc amd64 alpha"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE="tcltk"
 
-DEPEND="net-dialup/ppp
-		dev-lang/perl
-		tcltk? ( dev-perl/perl-tk )"
+DEPEND=">=net-dialup/ppp-2.4.2
+	dev-lang/perl
+	tcltk? ( dev-perl/perl-tk )"
+
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	make || die "make failed"
+	emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
 	dosbin pptp
-	dodoc AUTHORS COPYING ChangeLog DEVELOPERS NEWS README TODO USING
+	dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING
 	dodoc Documentation/*
 	dodoc Reference/*
 	dodir /etc/pptp.d
@@ -33,7 +36,8 @@ src_install() {
 	# RH-specific portions, so include them ourselves.
 	cd ${FILESDIR}
 	insinto /etc/ppp
-	doins options.pptp
-	dosbin ${DISTDIR}/pptp-command pptp_fe.pl
+	doins new-mppe/options.pptp
+	newsbin ${WORKDIR}/${MY_CMD} pptp-command
+	dosbin pptp_fe.pl
 	use tcltk && dosbin xpptp_fe.pl
 }