4 files changed, 9 insertions, 63 deletions
diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index 1a796b6dffd3..7f94a7a66ac7 100644
--- a/net-dialup/pptpd/ChangeLog
+++ b/net-dialup/pptpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/pptpd
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.13 2004/12/30 09:05:31 jhhudso Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.14 2005/02/12 09:36:50 mrness Exp $
+
+  12 Feb 2005; Alin Nastac <mrness@gentoo.org> -pptpd-1.1.4_beta4.ebuild,
+  pptpd-1.2.1.ebuild:
+  Mark stable on x86 and remove old ebuild.
 
 *pptpd-1.2.1 (30 Dec 2004)
 
diff --git a/net-dialup/pptpd/files/digest-pptpd-1.1.4_beta4 b/net-dialup/pptpd/files/digest-pptpd-1.1.4_beta4
deleted file mode 100644
index 430877937192..000000000000
--- a/net-dialup/pptpd/files/digest-pptpd-1.1.4_beta4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 58603224998f22542e8d7ecb357bc006 pptpd-1.1.4-b4.tar.gz 157684
diff --git a/net-dialup/pptpd/pptpd-1.1.4_beta4.ebuild b/net-dialup/pptpd/pptpd-1.1.4_beta4.ebuild
deleted file mode 100644
index 46a14d1dce8e..000000000000
--- a/net-dialup/pptpd/pptpd-1.1.4_beta4.ebuild
+++ /dev/null
@@ -1,57 +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/pptpd/pptpd-1.1.4_beta4.ebuild,v 1.5 2004/12/23 21:29:11 mrness Exp $
-
-S=${WORKDIR}/poptop-1.1.4
-DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server"
-SRC_URI="mirror://sourceforge/poptop/pptpd-1.1.4-b4.tar.gz"
-HOMEPAGE="http://www.poptop.org/"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	sys-devel/automake
-	net-dialup/ppp
-	tcpd? ( sys-apps/tcp-wrappers )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="tcpd"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	sed -i "s/^CFLAGS = -O2/CFLAGS = ${CFLAGS}/" Makefile.am || die "sed failed"
-}
-
-src_compile() {
-	ebegin "Updating autotools-generated files"
-	aclocal && \
-		automake -a && \
-		autoconf
-	eend $?
-
-	local myconf
-	use tcpd && myconf="--with-libwrap"
-	econf 	--with-bcrelay \
-		${myconf} || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-
-	insinto /etc
-	doins samples/pptpd.conf
-
-	insinto /etc/ppp
-	doins samples/options.pptpd
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pptpd-init pptpd
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pptpd-confd pptpd
-
-	dodoc README* AUTHORS COPYING INSTALL TODO ChangeLog
-	docinto samples
-	dodoc samples/{options*,chap*,pptp*}
-}
diff --git a/net-dialup/pptpd/pptpd-1.2.1.ebuild b/net-dialup/pptpd/pptpd-1.2.1.ebuild
index 81857a9df20b..488817359492 100644
--- a/net-dialup/pptpd/pptpd-1.2.1.ebuild
+++ b/net-dialup/pptpd/pptpd-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.2.1.ebuild,v 1.1 2004/12/30 09:05:31 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.2.1.ebuild,v 1.2 2005/02/12 09:36:50 mrness Exp $
 
 DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server"
 SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
@@ -12,7 +12,7 @@ DEPEND="virtual/libc
 RDEPEND="$DEPEND"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="tcpd"
 
 src_compile() {