Version bump (#252810).

(Portage version: 2.1.4.5)

3 files changed, 40 insertions, 10 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index be4eb3b6c3b6..5994bfc164d1 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/xl2tpd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.17 2008/08/17 15:25:13 maekke Exp $
+# 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 $
+
+*xl2tpd-1.2.3 (11 Jan 2009)
+
+  11 Jan 2009; Alin Năstac <mrness@gentoo.org>
+  +files/xl2tpd-1.2.3-as-needed.patch, -xl2tpd-1.1.12.ebuild,
+  +xl2tpd-1.2.3.ebuild:
+  Version bump (#252810).
 
   17 Aug 2008; Markus Meier <maekke@gentoo.org> xl2tpd-1.1.12-r1.ebuild:
   amd64/x86 stable, bug #234795
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.3-as-needed.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.3-as-needed.patch
new file mode 100644
index 000000000000..fce2349471f5
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.2.3-as-needed.patch
@@ -0,0 +1,12 @@
+diff -Nru xl2tpd-1.2.3.orig/Makefile xl2tpd-1.2.3/Makefile
+--- xl2tpd-1.2.3.orig/Makefile	2008-10-27 17:28:14.000000000 +0000
++++ xl2tpd-1.2.3/Makefile	2009-01-11 12:49:37.000000000 +0000
+@@ -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.1.12.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild
index 8d8d5942b6e9..8a597d04f4d1 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.1.12.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1.12.ebuild,v 1.2 2008/01/03 14:25:38 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild,v 1.1 2009/01/11 12:56:17 mrness Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
 HOMEPAGE="http://www.xelerance.com/software/xl2tpd/"
@@ -10,15 +10,26 @@ 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
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
 	net-dialup/ppp"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+}
+
+src_compile() {
+	append-flags -DTRUST_PPPD_TO_DIE
+	emake || die "emake failed"
+}
+
 src_install() {
-	dosbin xl2tpd || die 'xl2tpd binary not found'
-	doman doc/*.[85]
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc CREDITS README.xl2tpd \
 		doc/README.patents doc/rfc2661.txt doc/*.sample
@@ -26,7 +37,7 @@ src_install() {
 	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
+	newinitd "${FILESDIR}"/xl2tpd-init xl2tpd
 
 	keepdir /var/run/xl2tpd
 }