Remove pkg_{postinst,preinst}. Stable on amd64 and x86. Version bump.

(Portage version: 2.1.2.7)

4 files changed, 44 insertions, 30 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index 4791b7086fb6..583e9cec71f5 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2007/06/16 18:48:31 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.11 2007/07/19 06:51:19 mrness Exp $
+
+*xl2tpd-1.1.11 (19 Jul 2007)
+
+  19 Jul 2007; Alin Năstac <mrness@gentoo.org> xl2tpd-1.1.10.ebuild,
+  +xl2tpd-1.1.11.ebuild:
+  Remove pkg_{postinst,preinst}. Stable on amd64 and x86. Version bump.
 
   16 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   xl2tpd-1.1.10.ebuild:
diff --git a/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.11 b/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.11
new file mode 100644
index 000000000000..0549f2c3aa56
--- /dev/null
+++ b/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.11
@@ -0,0 +1,3 @@
+MD5 ab5656eb5a3d1973f7f69b039675332e xl2tpd-1.1.11.tar.gz 164926
+RMD160 45bd0050bd9abb46a6ed1ed5dc2f7f41b74847bc xl2tpd-1.1.11.tar.gz 164926
+SHA256 b4248afd8bc83f88d9239d6fdf458d78c59f52adc7a15e53c9a6bdedba99f907 xl2tpd-1.1.11.tar.gz 164926
diff --git a/net-dialup/xl2tpd/xl2tpd-1.1.10.ebuild b/net-dialup/xl2tpd/xl2tpd-1.1.10.ebuild
index 97a5fd347727..3270ea286f02 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.1.10.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.1.10.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.10.ebuild,v 1.2 2007/06/16 18:48:31 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.1.10.ebuild,v 1.3 2007/07/19 06:51:19 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
@@ -30,30 +30,3 @@ src_install() {
 
 	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
new file mode 100644
index 000000000000..90c4cb8e83ec
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.1.11.ebuild
@@ -0,0 +1,32 @@
+# 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 $
+
+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 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="!net-dialup/l2tpd
+	net-dialup/ppp"
+
+src_install() {
+	dosbin xl2tpd || die 'xl2tpd binary not found'
+	doman doc/*.[85]
+
+	dodoc CREDITS README.xl2tpd \
+		doc/README.patents 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
+}