--- /usr/portage/net-dialup/ppp/ppp-2.4.5-r2.ebuild 2012-06-14 10:01:20.000000000 +0800 +++ ppp-2.4.5-r2.ebuild 2012-08-07 15:53:08.701617012 +0800 @@ -25,6 +25,8 @@ RDEPEND="${DEPEND}" src_prepare() { + # #427684, conflict with linux-headers-3.5 + rm include/linux/if_pppol2tp.h epatch "${WORKDIR}/patch/make-vars.patch" epatch "${WORKDIR}/patch/mpls.patch" epatch "${WORKDIR}/patch/killaddr-smarter.patch" @@ -40,7 +42,6 @@ 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"