Define KDIR to build against userspace headers. Fixes 'error: asm/swab.h: No such file or directory' build problem.

svn path=/; revision=300

2 files changed, 32 insertions, 20 deletions

diff --git a/net-dialup/accel-pptp/Manifest b/net-dialup/accel-pptp/Manifest
index 22ccc6d..85e69f0 100644
--- a/net-dialup/accel-pptp/Manifest
+++ b/net-dialup/accel-pptp/Manifest
@@ -10,5 +10,5 @@ DIST accel-pptp-0.8.3.tar.bz2 512438 RMD160 bd66670b31afc62fdb031759d8a8310d8b94
 EBUILD accel-pptp-0.7.13.ebuild 2135 RMD160 7c44fafe97f185f9c0a8ec36b429ee43df044778 SHA1 292204fb78004ecd1720e3e3bd6702cd85efb477 SHA256 726473bf8456fa8097113ae837d9e4d78fff4f1f898319265c1cfca5f13cc45a
 EBUILD accel-pptp-0.8.1.ebuild 2135 RMD160 7c44fafe97f185f9c0a8ec36b429ee43df044778 SHA1 292204fb78004ecd1720e3e3bd6702cd85efb477 SHA256 726473bf8456fa8097113ae837d9e4d78fff4f1f898319265c1cfca5f13cc45a
 EBUILD accel-pptp-0.8.2.ebuild 2021 RMD160 f0e77f2e48b52a692facde2581a4262b270405dc SHA1 ef906e967402ea65c40c377294b215893e3df83a SHA256 cce17724ff7b1152b4ef6609a253a4f32f734c5db5c329f49d43c1cb4c9b3114
-EBUILD accel-pptp-0.8.3.ebuild 2084 RMD160 c70fd39f40fdf156bcb15a91ad2ad880a87fc37a SHA1 7398981afedf540fd24c7f1f549f27d10fecc33a SHA256 7662e351ac37afec512b6c78e31914db4540e5a9b7079e8095cafd0654fb85b6
+EBUILD accel-pptp-0.8.3.ebuild 2291 RMD160 b37e624eb7e46b5fd7675da4e5f404de84ca0803 SHA1 2d11a20c7b32091adee08ec31a8d7314ea59d19f SHA256 333f71121eb222a12cf09aa75252c5ff582937ffec88c066977280a5f77899e6
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
diff --git a/net-dialup/accel-pptp/accel-pptp-0.8.3.ebuild b/net-dialup/accel-pptp/accel-pptp-0.8.3.ebuild
index dd6087d..ef2f5a8 100644
--- a/net-dialup/accel-pptp/accel-pptp-0.8.3.ebuild
+++ b/net-dialup/accel-pptp/accel-pptp-0.8.3.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 inherit linux-mod eutils autotools
 
 DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
@@ -13,11 +15,13 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="tcpd server"
 
-DEPEND="server? ( !net-dialup/pptpd )
-	>=net-dialup/ppp-2.4.2
-	>=virtual/linux-sources-2.6.15
+COMMON_DEPEND=">=net-dialup/ppp-2.4.2
+	server? ( !net-dialup/pptpd )
 	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="virtual/modutils"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linux-sources-2.6.15"
+RDEPEND="${COMMON_DEPEND}
+	virtual/modutils"
 
 MODULE_NAMES="pptp(misc:${S}/kernel/driver)"
 BUILD_TARGETS="all"
@@ -25,25 +29,33 @@ BUILD_PARAMS="KDIR=${KERNEL_DIR}"
 CONFIG_CHECK="PPP PPPOE"
 MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	epatch "${FILESDIR}/accel-pptp-0.8.3-redudant-log-line.patch"
 	convert_to_m "${S}/kernel/driver/Makefile"
 	use server && cd "${S}/pptpd-1.3.3" && eautoreconf
 	cd "${S}/pppd_plugin" && eautoreconf
 }
 
+src_configure() {
+	if use server; then
+		cd "${S}/pptpd-1.3.3"
+		# Define KDIR to build against userspace headers...
+		KDIR='/usr' \
+		    econf --enable-bcrelay \
+				$(use_with tcpd libwrap)
+	fi
+
+	cd "${S}/pppd_plugin"
+	KDIR='/usr' econf
+}
+
 src_compile() {
 	if use server; then
-		cd pptpd-1.3.3
-	    econf --enable-bcrelay \
-			$(use_with tcpd libwrap)
+		cd "${S}/pptpd-1.3.3"
 	    emake COPTS="${CFLAGS}" || die "make failed"
 	fi
 
-	cd "${S}"/pppd_plugin
-	econf
+	cd "${S}/pppd_plugin"
 	emake COPTS="${CFLAGS}" || die "make failed"
 
 	cd "${S}/kernel/driver"
@@ -52,7 +64,7 @@ src_compile() {
 
 src_install () {
 	if use server; then
-	    cd "${S}"/pptpd-1.3.3
+	    cd "${S}/pptpd-1.3.3"
 	    einstall || die "make install failed"
 
 	    insinto /etc
@@ -62,24 +74,24 @@ src_install () {
 	    doins samples/options.pptpd
 
 	    exeinto /etc/init.d
-	    newexe "${FILESDIR}/pptpd-init" pptpd
+	    newexe "${FILESDIR}/pptpd-init" pptpd || die
 
 	    insinto /etc/conf.d
-	    newins "${FILESDIR}/pptpd-confd" pptpd
+	    newins "${FILESDIR}/pptpd-confd" pptpd || die
 	fi
 
-	cd "${S}"/pppd_plugin/src/.libs
+	cd "${S}/pppd_plugin/src/.libs"
 	local PPPD_VER=$(best_version net-dialup/ppp)
 	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
 	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
 	insinto /usr/lib/pppd/${PPPD_VER}
-	newins pptp.so.0.0.0 pptp.so
+	newins pptp.so.0.0.0 pptp.so || die
 	doman "${S}"/pppd_plugin/src/pppd-pptp.8 || die
 
-	cd "${S}"/kernel/driver
+	cd "${S}/kernel/driver"
 	linux-mod_src_install
 
 	cd "${S}"
-	dodoc README
+	dodoc README || die
 	cp -R example "${D}/usr/share/doc/${P}/example"
 }