Version bump (#169123).

(Portage version: 2.1.2-r9)

5 files changed, 71 insertions, 35 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index 1f20db71c456..98e50c6bf258 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.4 2007/02/10 12:22:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.5 2007/03/05 10:50:54 mrness Exp $
+
+*xl2tpd-1.1.08 (05 Mar 2007)
+
+  05 Mar 2007; Alin Nastac <mrness@gentoo.org> -files/l2tpd-init,
+  files/xl2tpd-init, +xl2tpd-1.1.08.ebuild:
+  Version bump (#169123).
 
   10 Feb 2007; Alin Năstac <mrness@gentoo.org> -xl2tpd-1.1.05.ebuild:
   Remove old version.
diff --git a/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.08 b/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.08
new file mode 100644
index 000000000000..ad862d596896
--- /dev/null
+++ b/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.08
@@ -0,0 +1,3 @@
+MD5 d0c310b7a135b385ab5a61325e56566a xl2tpd-1.1.08.tar.gz 165439
+RMD160 208433daac898e781540dac6ba3658f5a5cfb902 xl2tpd-1.1.08.tar.gz 165439
+SHA256 05c344e134853234c53b58a85cc204a85498b6b1985780a63690f21b2d7a6e24 xl2tpd-1.1.08.tar.gz 165439
diff --git a/net-dialup/xl2tpd/files/l2tpd-init b/net-dialup/xl2tpd/files/l2tpd-init
deleted file mode 100644
index b118736cc36b..000000000000
--- a/net-dialup/xl2tpd/files/l2tpd-init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/l2tpd-init,v 1.1 2006/05/30 20:54:12 mrness Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [[ ! -f /etc/l2tpd/l2tpd.conf ]] ; then
-		eerror "Missing /etc/l2tpd/l2tpd.conf configuration file!"
-		eerror "Example configuration file could be found in doc directory."
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting l2tpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/l2tpd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping l2tpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/l2tpd.pid
-	eend $?
-}
diff --git a/net-dialup/xl2tpd/files/xl2tpd-init b/net-dialup/xl2tpd/files/xl2tpd-init
index 1f32d2657b77..639007b577ae 100644
--- a/net-dialup/xl2tpd/files/xl2tpd-init
+++ b/net-dialup/xl2tpd/files/xl2tpd-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init,v 1.1 2006/12/08 21:12:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init,v 1.2 2007/03/05 10:50:54 mrness Exp $
 
 depend() {
 	need net
@@ -27,6 +27,6 @@ start() {
 
 stop() {
 	ebegin "Stopping xl2tpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/xl2tpd/xl2tpd.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/xl2tpd.pid
 	eend $?
 }
diff --git a/net-dialup/xl2tpd/xl2tpd-1.1.08.ebuild b/net-dialup/xl2tpd/xl2tpd-1.1.08.ebuild
new file mode 100644
index 000000000000..9f97caed63a4
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.1.08.ebuild
@@ -0,0 +1,59 @@
+# 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.08.ebuild,v 1.1 2007/03/05 10:50:54 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 ~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 "   ${HILITE}/etc/init.d/l2tpd stop${NORMAL}"
+		ewarn "   ${HILITE}rc-update del l2tpd${NORMAL}"
+		ewarn "   ${HILITE}rm /etc/init.d/l2tpd${NORMAL}"
+		ewarn "   ${HILITE}rc-update add xl2tpd${NORMAL}"
+		ewarn "   ${HILITE}/etc/init.d/xl2tpd start${NORMAL}"
+		ebeep
+	fi
+}