summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-07 15:05:23 +0000
committerMike Frysinger <vapier@gentoo.org>2012-08-07 15:05:23 +0000
commitde888b5fa550f5e18530b7ee16454c3c27e68dcc (patch)
tree579ec022871ebe393105c5f036d67b8abc95b629 /net-dialup/ppp
parentadd category to mask entry :( (diff)
downloadgentoo-2-de888b5fa550f5e18530b7ee16454c3c27e68dcc.tar.gz
gentoo-2-de888b5fa550f5e18530b7ee16454c3c27e68dcc.tar.bz2
gentoo-2-de888b5fa550f5e18530b7ee16454c3c27e68dcc.zip
Remove local copies of linux-headers and rely on the system one being up-to-date #427684 by SpanKY.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'net-dialup/ppp')
-rw-r--r--net-dialup/ppp/ChangeLog6
-rw-r--r--net-dialup/ppp/ppp-2.4.5-r2.ebuild6
2 files changed, 9 insertions, 3 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 1be7977ae559..f6e4035a0a37 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dialup/ppp
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.277 2012/06/14 01:48:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.278 2012/08/07 15:05:23 vapier Exp $
+
+ 07 Aug 2012; Mike Frysinger <vapier@gentoo.org> ppp-2.4.5-r2.ebuild:
+ Remove local copies of linux-headers and rely on the system one being up-to-
+ date #427684 by SpanKY.
14 Jun 2012; Zac Medico <zmedico@gentoo.org> ppp-2.4.4-r25.ebuild,
ppp-2.4.5-r1.ebuild, ppp-2.4.5-r2.ebuild:
diff --git a/net-dialup/ppp/ppp-2.4.5-r2.ebuild b/net-dialup/ppp/ppp-2.4.5-r2.ebuild
index ba1b3c15e30b..a2619426dc17 100644
--- a/net-dialup/ppp/ppp-2.4.5-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r2.ebuild,v 1.3 2012/06/14 01:48:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r2.ebuild,v 1.4 2012/08/07 15:05:23 vapier Exp $
EAPI="2"
@@ -25,6 +25,9 @@ DEPEND="activefilter? ( net-libs/libpcap )
RDEPEND="${DEPEND}"
src_prepare() {
+ # Use the headers from the kernel #427684
+ rm include/linux/if_pppol2tp.h || die
+
epatch "${WORKDIR}/patch/make-vars.patch"
epatch "${WORKDIR}/patch/mpls.patch"
epatch "${WORKDIR}/patch/killaddr-smarter.patch"
@@ -40,7 +43,6 @@ src_prepare() {
epatch "${WORKDIR}/patch/pppd-usepeerwins.patch"
epatch "${WORKDIR}/patch/connect-errors.patch"
epatch "${WORKDIR}/patch/Makefile.patch"
- epatch "${WORKDIR}/patch/pppol2tpv3-2.6.35.patch"
epatch "${WORKDIR}/patch/pado-timeout.patch"
epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch"