Version bump (#252810).

Package-Manager: portage-2.1.4.5

4 files changed, 47 insertions, 15 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/Manifest b/net-dialup/xl2tpd/Manifest
index 98d243a4f420..280b21a9335a 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xl2tpd-1.2.3-as-needed.patch 387 RMD160 54101417ac33ac14dc5f2ca09f5900c64644bea8 SHA1 fb268380ff6365235a864e67692b68b9c861aecc SHA256 6dd9be7702e36014ad4de4eb7df7636efd5db8d3a8de82a604f61b8b2f74e8ac
 AUX xl2tpd-init 728 RMD160 d4692c30a510c2a765700136eef2e360d368943b SHA1 7608f6d2ad884bf8031084e9132cb6a2e33a7214 SHA256 895a49a590b04fbeef02e5b53064fec31ee0ea9c19141bb7d3898cd2815ef42d
 DIST xl2tpd-1.1.12.tar.gz 328349 RMD160 4b0e06a50c748bbabb90c4d21b55565040f4e649 SHA1 a2449c6c64d83e10f0fee5286bad00f0dd2c7d8f SHA256 f3ca288040502dc30e0759cea6ddb134738bdf54c2459746257e9a96399fdc68
+DIST xl2tpd-1.2.3.tar.gz 332454 RMD160 73528e1f5e28eb60e2a25509b59dcbc141721908 SHA1 fee344f7771ae295f882a16c46c71234fe1b733a SHA256 db8fa5f7c19cd7928d7e87ea5c99c6a89bc1ad66f27132aaf12d4b3b3febf2e3
 EBUILD xl2tpd-1.1.12-r1.ebuild 992 RMD160 5e6f3a10b48eabb8a26d088bc7ec8e86019be8bb SHA1 ed182c17d5a068d21b6983cdabb9e234481cd327 SHA256 8f73237f8235b6a9a54aca11f578b862c5e471366a0552f7e633a7336c451338
-EBUILD xl2tpd-1.1.12.ebuild 888 RMD160 216fa09e829285c9647eae8702d829547ae39a76 SHA1 357f44620dafb2786ace0115bea920bfc1513a64 SHA256 c71fe1409fd01ed0db5feb77f524be966996e7a36b33d1a55eeddd31edfe6a74
-MISC ChangeLog 2661 RMD160 38d7ff38418694c395706c457ac6f5e3a8885057 SHA1 bb6fb3a15fd34dce7de5867e12c40e323cc4daf8 SHA256 0be3795c81cd21adb8a16c27308cfbf1d4b8adac92462277160b00d61f44da21
+EBUILD xl2tpd-1.2.3.ebuild 1083 RMD160 da99b8abc8bb94a372a033967a681ca7a145cc5f SHA1 d278616202e1f876e9c004f6740c524178144066 SHA256 48af4781cda05ceb100de90b8ce6b73cdd58b751d5a78b973488cc9fde6ecdc4
+MISC ChangeLog 2851 RMD160 44b67ce470be4b63f7589a8e47acd0224fe6048f SHA1 d664c2c8d0ebc01275d8e97cd5229f8d3ef54a58 SHA256 668ead8cd4b17b51973d736f57922af1dc68c816d9665320e61f426c12a034a5
 MISC metadata.xml 281 RMD160 6ba88d0228fd7f974f70d63fb0cc2d762ba82bb5 SHA1 38a78c92947a085d595b7a85d9de2525c69e3fb7 SHA256 3e259d9615cfeebaea3e58571404538766c8d2adc6e7a800c09f3b15756cc0c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkioQycACgkQkKaRLQcq0GLT7gCgnPFmVatumBbNNYBOu3P/7lPs
-mrIAnRuHNyeaEISZcJKKuCwAJybUz07i
-=2VHa
+iEYEARECAAYFAklp7H8ACgkQts85UDFmaOXtpgCbBZejC4Q7cXWcoWL0TBULH6XO
+uR4AnRVBQmWrQ0R4LvG1Fnfrs7NA+jOu
+=820B
 -----END PGP SIGNATURE-----
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
 }