4 files changed, 65 insertions, 3 deletions
diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index 5994bfc164d1..b9436482ff24 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.18 2009/01/11 12:56:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.19 2009/07/16 06:19:19 mrness Exp $
+
+*xl2tpd-1.2.4 (16 Jul 2009)
+
+  16 Jul 2009; Alin Năstac <mrness@gentoo.org>
+  +files/xl2tpd-1.2.4-as-needed.patch, xl2tpd-1.2.3.ebuild,
+  +xl2tpd-1.2.4.ebuild:
+  Stable on amd64 and x86. Migrate to EAPI 2. Version bump (#277951).
 
 *xl2tpd-1.2.3 (11 Jan 2009)
 
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.4-as-needed.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.4-as-needed.patch
new file mode 100644
index 000000000000..737f4480b533
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.2.4-as-needed.patch
@@ -0,0 +1,12 @@
+diff -Nru xl2tpd-1.2.4.orig/Makefile xl2tpd-1.2.4/Makefile
+--- xl2tpd-1.2.4.orig/Makefile	2009-03-09 00:25:30.000000000 +0100
++++ xl2tpd-1.2.4/Makefile	2009-07-16 08:16:28.000000000 +0200
+@@ -113,7 +113,7 @@
+ 
+ pfc:
+ 	$(CC) $(CFLAGS) -c contrib/pfc.c
+-	$(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o
++	$(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
+ 
+ romfs:
+ 	$(ROMFSINST) /bin/$(EXEC)
diff --git a/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild
index 8a597d04f4d1..c264bb565dee 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild,v 1.1 2009/01/11 12:56:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild,v 1.2 2009/07/16 06:19:19 mrness Exp $
 
 inherit eutils flag-o-matic
 
@@ -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=""
 
 DEPEND="net-libs/libpcap"
diff --git a/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild
new file mode 100644
index 000000000000..26aa6ff80c9d
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild,v 1.1 2009/07/16 06:19:19 mrness Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+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=""
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+	net-dialup/ppp"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+}
+
+src_compile() {
+	append-flags -DTRUST_PPPD_TO_DIE
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
+
+	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
+}