Kernel header fix, closes bug 62502, thank2 to Tobias Klauser <tklauser@nuerscht.ch>

4 files changed, 111 insertions, 6 deletions

diff --git a/net-fs/davfs2/ChangeLog b/net-fs/davfs2/ChangeLog
index 15bac5fb29bf..8528ca50e12f 100644
--- a/net-fs/davfs2/ChangeLog
+++ b/net-fs/davfs2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/davfs2
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.5 2004/11/24 19:55:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.6 2004/11/27 14:12:32 genstef Exp $
+
+  27 Nov 2004; Stefan Schweizer <genstef@gentoo.org>
+  +files/davfs2.nokernelsrc.patch, davfs2-0.2.3.ebuild:
+  Kernel header fix, closes bug 62502, thank2 to Tobias Klauser
+  <tklauser@nuerscht.ch>
 
 *davfs2-0.2.3 (24 Nov 2004)
 
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 07ba09862afd..236a361979c7 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,11 +1,12 @@
 MD5 d0057c0ad166e1aefc9bcf89ec876efe davfs2-0.2.2.ebuild 805
 MD5 f1654452dc14d2898b09e9c3aee7a424 davfs2-0.2.2-r1.ebuild 909
 MD5 ef94e04d2bfa9bb77cd4397541e0b513 davfs2-0.2.1.ebuild 801
-MD5 752461f2d003cd955edb70cb62943f41 davfs2-0.2.3.ebuild 970
-MD5 342778789b17c08afea7d1c8d162c9bf ChangeLog 1466
+MD5 20a4a064d71efa28bb43fde0e0223831 davfs2-0.2.3.ebuild 1142
+MD5 1ad53b797760d332f226b6769a1d8099 ChangeLog 1665
 MD5 90d54af17451a3725b7244f94d7ac81a metadata.xml 264
 MD5 222bb7c9a0ba144f42b188211d562cd3 files/digest-davfs2-0.2.1 64
 MD5 340445f0521e173e52743ac4f2889f56 files/digest-davfs2-0.2.2 64
 MD5 f0156f27602800056efdeb249b7ae579 files/digest-davfs2-0.2.3 64
 MD5 2a75243abdc7295fe437c748aec1ee5b files/davfs2-0.2.2-pid.patch 1235
 MD5 340445f0521e173e52743ac4f2889f56 files/digest-davfs2-0.2.2-r1 64
+MD5 834f6651a067dc38dfc2093d0bf641a3 files/davfs2.nokernelsrc.patch 3911
diff --git a/net-fs/davfs2/davfs2-0.2.3.ebuild b/net-fs/davfs2/davfs2-0.2.3.ebuild
index 5ee3a330aa0a..5efdb1dfeac5 100644
--- a/net-fs/davfs2/davfs2-0.2.3.ebuild
+++ b/net-fs/davfs2/davfs2-0.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-0.2.3.ebuild,v 1.1 2004/11/24 19:55:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-0.2.3.ebuild,v 1.2 2004/11/27 14:12:32 genstef Exp $
 
-inherit kernel-mod
+inherit kernel-mod eutils
 
 IUSE="ssl"
 
@@ -12,7 +12,9 @@ HOMEPAGE="http://dav.sourceforge.net"
 KEYWORDS="~x86 ~ppc"
 
 LICENSE="GPL-2"
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
+		dev-libs/libxml2
+		sys-libs/zlib"
 SLOT="0"
 
 pkg_setup() {
@@ -27,6 +29,12 @@ pkg_setup() {
 
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}.nokernelsrc.patch
+}
+
 src_compile() {
 	econf $(use_with ssl) || die "econf failed"
 	emake || die "emake failed"
@@ -34,4 +42,6 @@ src_compile() {
 
 src_install() {
 	einstall || die "einstall failed"
+
+	dodoc BUGS ChangeLog FAQ README THANKS TODO
 }
diff --git a/net-fs/davfs2/files/davfs2.nokernelsrc.patch b/net-fs/davfs2/files/davfs2.nokernelsrc.patch
new file mode 100644
index 000000000000..abc8247d1aa9
--- /dev/null
+++ b/net-fs/davfs2/files/davfs2.nokernelsrc.patch
@@ -0,0 +1,89 @@
+diff -urN davfs2-0.2.3-orig/configure davfs2-0.2.3/configure
+--- davfs2-0.2.3-orig/configure	2004-11-02 05:45:26.000000000 +0000
++++ davfs2-0.2.3/configure	2004-11-27 13:16:21.962753349 +0000
+@@ -310,7 +310,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA top_builddir CPP EGREP NEON_CONFIG LIBOBJS PKG_CONFIG NEON_SUPPORTS_SSL KRB5_CONFIG NEON_CFLAGS NEON_LIBS NEON_BUILD_BUNDLED AR ac_pt_AR RANLIB ac_pt_RANLIB NEON_TARGET NEON_OBJEXT NEONOBJS NEON_EXTRAOBJS NEON_LINK_FLAGS NEON_SUPPORTS_DAV XML2_CONFIG DAV_DEBUG KERNEL_SRC LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA top_builddir CPP EGREP NEON_CONFIG LIBOBJS PKG_CONFIG NEON_SUPPORTS_SSL KRB5_CONFIG NEON_CFLAGS NEON_LIBS NEON_BUILD_BUNDLED AR ac_pt_AR RANLIB ac_pt_RANLIB NEON_TARGET NEON_OBJEXT NEONOBJS NEON_EXTRAOBJS NEON_LINK_FLAGS NEON_SUPPORTS_DAV XML2_CONFIG DAV_DEBUG LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -858,7 +858,6 @@
+   --with-expat            force use of expat
+   --with-included-expat   use bundled expat sources
+   --with-debug        Set DEBUG
+-  --with-kernel-src        Set kernel source directory
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -13119,21 +13118,6 @@
+ 
+ 
+ 
+-# Check whether --with-kernel-src or --without-kernel-src was given.
+-if test "${with_kernel_src+set}" = set; then
+-  withval="$with_kernel_src"
+-  KERNEL="$withval"
+-else
+-  KERNEL="no"
+-fi;
+-
+-if test "$KERNEL" = "no"; then
+-	KERNEL_SRC=/usr/src/linux
+-else
+-	KERNEL_SRC="$KERNEL"
+-fi
+-CFLAGS="-I$KERNEL_SRC/include $CFLAGS"
+-
+ 
+ 	echo "$as_me:$LINENO: checking for ViceFid" >&5
+ echo $ECHO_N "checking for ViceFid... $ECHO_C" >&6
+@@ -15739,7 +15723,6 @@
+ s,@NEON_SUPPORTS_DAV@,$NEON_SUPPORTS_DAV,;t t
+ s,@XML2_CONFIG@,$XML2_CONFIG,;t t
+ s,@DAV_DEBUG@,$DAV_DEBUG,;t t
+-s,@KERNEL_SRC@,$KERNEL_SRC,;t t
+ s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
+ 
+diff -urN davfs2-0.2.3-orig/configure.in davfs2-0.2.3/configure.in
+--- davfs2-0.2.3-orig/configure.in	2004-11-02 05:45:26.000000000 +0000
++++ davfs2-0.2.3/configure.in	2004-11-27 13:11:52.887371005 +0000
+@@ -40,23 +40,6 @@
+ ])
+ 
+ 
+-AC_DEFUN([DAV_CHECK_KERNEL],[
+-AC_ARG_WITH(kernel-src,
+-        [  --with-kernel-src        Set kernel source directory],
+-	[KERNEL="$withval"],
+-        [KERNEL="no"])
+-
+-if test "$KERNEL" = "no"; then
+-dnl #FIXME
+-dnl Kernel include and /usr/include dismatch problem
+-dnl 
+-	KERNEL_SRC=/usr/src/linux
+-else
+-	KERNEL_SRC="$KERNEL"
+-fi
+-CFLAGS="-I$KERNEL_SRC/include $CFLAGS"
+-])
+-
+ dnl Check for ViceFid in linux/coda.h
+ AC_DEFUN([DAV_CHECK_CODA_VICEFID], [
+ 	AC_CHECK_TYPE([ViceFid], [
+diff -urN davfs2-0.2.3-orig/Makefile.in davfs2-0.2.3/Makefile.in
+--- davfs2-0.2.3-orig/Makefile.in	2004-11-02 05:45:26.000000000 +0000
++++ davfs2-0.2.3/Makefile.in	2004-11-27 13:11:52.888371047 +0000
+@@ -14,7 +14,7 @@
+ # Toolchain settings
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+-CPPFLAGS = @DEFS@ @CPPFLAGS@ @DAV_DEBUG@ -I@KERNEL_SRC@/include -I$(top_srcdir)/src 
++CPPFLAGS = @DEFS@ @CPPFLAGS@ @DAV_DEBUG@ -I$(top_srcdir)/src 
+ 
+ LDFLAGS = @LDFLAGS@
+ LIBS = @NEON_LIBS@ @LIBS@