4 files changed, 7 insertions, 65 deletions
diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index 583e9cec71f5..3136dda6655e 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.11 2007/07/19 06:51:19 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.12 2007/08/25 15:58:16 mrness Exp $
+
+  25 Aug 2007; Alin Năstac <mrness@gentoo.org> -xl2tpd-1.1.09.ebuild,
+  xl2tpd-1.1.11.ebuild:
+  Remove obsolete version. Stable on x86 and amd64.
 
 *xl2tpd-1.1.11 (19 Jul 2007)
 
diff --git a/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.09 b/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.09
deleted file mode 100644
index 341d55096c21..000000000000
--- a/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.09
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7782de2b3a37631bcf83305127aca9ac xl2tpd-1.1.09.tar.gz 165465
-RMD160 e12b12157371b3f4d66aaa4b5f60a1fc9beef708 xl2tpd-1.1.09.tar.gz 165465
-SHA256 bb04450d4890e7c29af572c949bd274ece133d1de15ed7eb52d42856a2a776ea xl2tpd-1.1.09.tar.gz 165465
diff --git a/net-dialup/xl2tpd/xl2tpd-1.1.09.ebuild b/net-dialup/xl2tpd/xl2tpd-1.1.09.ebuild
deleted file mode 100644
index e94afeb5a7a3..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.1.09.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.1.09.ebuild,v 1.2 2007/04/12 22:13:15 opfer Exp $
-
-inherit eutils
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/software/xl2tpd/"
-SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="!net-dialup/l2tpd
-	net-dialup/ppp"
-
-src_install() {
-	dosbin xl2tpd || die 'xl2tpd binary not found'
-	doman doc/*.[85]
-
-	dodoc CREDITS README \
-		doc/rfc2661.txt doc/*.sample
-
-	dodir /etc/xl2tpd
-	head -n 2 doc/l2tp-secrets.sample > "${D}/etc/xl2tpd/l2tp-secrets"
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-	newinitd "${FILESDIR}/xl2tpd-init" xl2tpd
-
-	keepdir /var/run/xl2tpd
-}
-
-#TODO: remove preinst and postinst functions some time around July 2007
-pkg_preinst() {
-	if has_version "<=${CATEGORY}/${PN}-1.1.05" && [[ -d "${ROOT}/etc/l2tpd" ]]; then
-		ebegin "Migrating /etc/l2tpd to /etc/xl2tpd"
-		if [[ -f "${ROOT}/etc/l2tpd/l2tpd.conf" ]] ; then
-			sed -i -e 's:/etc/l2tpd/:/etc/xl2tpd/:g' "${ROOT}/etc/l2tpd/l2tpd.conf"
-			mv "${ROOT}/etc/l2tpd/l2tpd.conf" "${ROOT}/etc/l2tpd/xl2tpd.conf"
-		fi
-		mv -f "${ROOT}/etc/l2tpd" "${ROOT}/etc/xl2tpd"
-		eend
-	fi
-}
-
-pkg_postinst() {
-	if has_version "<=${CATEGORY}/${PN}-1.1.05"; then
-		ewarn "The daemon and service have been renamed from l2tpd to xl2tpd."
-		ewarn "Please remove the old init script and configure your system to use"
-		ewarn "the new init script:"
-		ewarn "   /etc/init.d/l2tpd stop"
-		ewarn "   rc-update del l2tpd"
-		ewarn "   rm /etc/init.d/l2tpd"
-		ewarn "   rc-update add xl2tpd"
-		ewarn "   /etc/init.d/xl2tpd start"
-		ebeep
-	fi
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.1.11.ebuild b/net-dialup/xl2tpd/xl2tpd-1.1.11.ebuild
index 90c4cb8e83ec..7d628feb772e 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.1.11.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.1.11.ebuild,v 1.1 2007/07/19 06:51:19 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.1.11.ebuild,v 1.2 2007/08/25 15:58:16 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="!net-dialup/l2tpd