Fix lns IP allocation by removing flag-o-matic inheritance (FFLAGS is used in Makefile).

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 11 insertions, 63 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index 749120c4eb6d..1e9d6976ea86 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.20 2010/08/15 20:33:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.21 2010/09/19 11:31:22 mrness Exp $
+
+*xl2tpd-1.2.6-r1 (19 Sep 2010)
+
+  19 Sep 2010; Alin Năstac <mrness@gentoo.org> -xl2tpd-1.2.3.ebuild,
+  -files/xl2tpd-1.2.3-as-needed.patch, -xl2tpd-1.2.6.ebuild,
+  +xl2tpd-1.2.6-r1.ebuild:
+  Fix lns IP allocation by removing flag-o-matic inheritance (FFLAGS is used
+  in Makefile).
 
 *xl2tpd-1.2.6 (15 Aug 2010)
 
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
deleted file mode 100644
index fce2349471f5..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-1.2.3-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.2.3.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild
deleted file mode 100644
index c264bb565dee..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.2.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.2 2009/07/16 06:19:19 mrness Exp $
-
-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_unpack() {
-	unpack ${A}
-
-	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
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.2.6.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.6-r1.ebuild
index 526835dfb64a..7273d731bc98 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.2.6.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.2.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.6.ebuild,v 1.1 2010/08/15 20:33:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.6-r1.ebuild,v 1.1 2010/09/19 11:31:22 mrness Exp $
 
 EAPI="2"
 
-inherit eutils flag-o-matic
+inherit eutils
 
 DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
 HOMEPAGE="http://www.xelerance.com/software/xl2tpd/"
@@ -25,11 +25,6 @@ src_prepare() {
 	use dnsretry && epatch "${FILESDIR}"/${PN}-dnsretry.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"