Fix amd64 compile thanks to Marc <marcpg@gmx.de> in bug 102357, remove old ebuilds

Package-Manager: portage-2.0.51.22-r2

9 files changed, 25 insertions, 251 deletions

diff --git a/net-fs/davfs2/ChangeLog b/net-fs/davfs2/ChangeLog
index 002ed953c824..58afd757ca8b 100644
--- a/net-fs/davfs2/ChangeLog
+++ b/net-fs/davfs2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/davfs2
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.14 2005/08/20 20:38:02 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.15 2005/08/21 09:49:34 genstef Exp $
+
+  21 Aug 2005; Stefan Schweizer <genstef@gentoo.org>
+  -files/davfs2.nokernelsrc.patch, files/include-compiler.patch,
+  -files/include_compiler.patch, -davfs2-0.2.3-r1.ebuild,
+  -davfs2-0.2.4.ebuild:
+  Fix amd64 compile thanks to Marc <marcpg@gmx.de> in bug 102357, remove old
+  ebuilds
 
 *davfs2-0.2.4-r1 (20 Aug 2005)
 
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 660dcd3f7984..69a455acad05 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,11 +1,5 @@
-MD5 ba90c82e723ac462f84b9164db109c13 davfs2-0.2.3-r1.ebuild 1380
-MD5 690902cafe3786a147ea9f05cb242b6d davfs2-0.2.4.ebuild 1737
 MD5 1f034d529715cbd1b04ed262a3c09327 davfs2-0.2.4-r1.ebuild 2006
-MD5 03ae43ca318b4c754c1bd9aecc3f78af ChangeLog 3310
+MD5 7b639ae5fc48a880b865ad59457764d1 ChangeLog 3598
 MD5 90d54af17451a3725b7244f94d7ac81a metadata.xml 264
-MD5 fcd02008e517ea0eb9ff6a675723e3bc files/digest-davfs2-0.2.4 64
-MD5 f0156f27602800056efdeb249b7ae579 files/digest-davfs2-0.2.3-r1 64
 MD5 fcd02008e517ea0eb9ff6a675723e3bc files/digest-davfs2-0.2.4-r1 64
-MD5 29c3251313e470d40c88dfc1ee45b402 files/include-compiler.patch 847
-MD5 a92df0afe8f5e52b12541bb87e0ac8f6 files/include_compiler.patch 655
-MD5 834f6651a067dc38dfc2093d0bf641a3 files/davfs2.nokernelsrc.patch 3911
+MD5 bc32f42062ca5fdd9ab06af3a2d28002 files/include-compiler.patch 1260
diff --git a/net-fs/davfs2/davfs2-0.2.3-r1.ebuild b/net-fs/davfs2/davfs2-0.2.3-r1.ebuild
deleted file mode 100644
index 67cbe7439db7..000000000000
--- a/net-fs/davfs2/davfs2-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.5 2005/07/12 15:32:57 blubb Exp $
-
-inherit linux-info eutils
-
-IUSE="ssl debug"
-
-DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses Coda for kernel driver and neon for WebDAV interface"
-SRC_URI="mirror://sourceforge/dav/${P}.tar.gz"
-HOMEPAGE="http://dav.sourceforge.net"
-KEYWORDS="~amd64 ~ppc x86"
-
-LICENSE="GPL-2"
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-		dev-libs/libxml2
-		sys-libs/zlib"
-SLOT="0"
-
-CONFIG_CHECK="CODA_FS"
-CODA_FS_ERROR="${P} requires kernel support for Coda to be found in filesystems, network filesystems"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	kernel_is 2 4 && epatch ${FILESDIR}/${PN}.nokernelsrc.patch
-
-	epatch ${FILESDIR}/include_compiler.patch #81507
-}
-
-src_compile() {
-	local myconf
-
-	if useq debug; then
-		myconf="--with-debug"
-	fi
-
-	econf --with-kernel-src=${KV_DIR} \
-		$(use_with ssl) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-
-	dodoc BUGS ChangeLog FAQ README THANKS TODO
-
-	dodir /etc/modules.d
-	cat >${D}/etc/modules.d/davfs2 <<EOF
-alias char-major-67	coda
-alias /dev/davfs*	coda
-EOF
-}
-
-pkg_postinst() {
-	update-modules
-}
diff --git a/net-fs/davfs2/davfs2-0.2.4.ebuild b/net-fs/davfs2/davfs2-0.2.4.ebuild
deleted file mode 100644
index b48c15c0705a..000000000000
--- a/net-fs/davfs2/davfs2-0.2.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-0.2.4.ebuild,v 1.1 2005/07/18 21:56:22 genstef Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses Coda for kernel driver and neon for WebDAV interface"
-SRC_URI="mirror://sourceforge/dav/${P}.tar.gz"
-HOMEPAGE="http://dav.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="ssl debug socks5"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-		socks5? ( >=net-proxy/dante-1.1.13 )
-		dev-libs/libxml2
-		net-misc/neon
-		sys-libs/zlib"
-SLOT="0"
-
-CONFIG_CHECK="CODA_FS"
-CODA_FS_ERROR="${P} requires kernel support for Coda to be found in filesystems, network filesystems"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/include-compiler.patch #81507
-}
-
-src_compile() {
-	local myconf
-
-	if use debug; then
-		myconf="--with-debug"
-	fi
-	if kernel_is 2 4; then
-		myconf="${myconf} --with-kernel-src=${KV_DIR}"
-	else
-		myconf="${myconf} --without-kernel-src"
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_with socks5 socks) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/sbin
-	einstall || die "einstall failed"
-
-	dodir /var/run/mount.davfs
-	keepdir /var/run/mount.davfs
-
-	dodoc BUGS ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO
-	cd ${D}/usr/share
-	rm COPYING ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO INSTALL
-
-	dodir /etc/modules.d
-	cat >${D}/etc/modules.d/davfs2 <<EOF
-alias char-major-67	coda
-alias /dev/davfs*	coda
-EOF
-}
-
-pkg_postinst() {
-	update-modules
-}
diff --git a/net-fs/davfs2/files/davfs2.nokernelsrc.patch b/net-fs/davfs2/files/davfs2.nokernelsrc.patch
deleted file mode 100644
index abc8247d1aa9..000000000000
--- a/net-fs/davfs2/files/davfs2.nokernelsrc.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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@ 
diff --git a/net-fs/davfs2/files/digest-davfs2-0.2.3-r1 b/net-fs/davfs2/files/digest-davfs2-0.2.3-r1
deleted file mode 100644
index 3387ff4a49e7..000000000000
--- a/net-fs/davfs2/files/digest-davfs2-0.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0802b15e43c45fd0e80a51600e5a5737 davfs2-0.2.3.tar.gz 276871
diff --git a/net-fs/davfs2/files/digest-davfs2-0.2.4 b/net-fs/davfs2/files/digest-davfs2-0.2.4
deleted file mode 100644
index a78b524a35ee..000000000000
--- a/net-fs/davfs2/files/digest-davfs2-0.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8f76634ddd7a26f0f277f86262887b6 davfs2-0.2.4.tar.gz 141438
diff --git a/net-fs/davfs2/files/include-compiler.patch b/net-fs/davfs2/files/include-compiler.patch
index 995a8ec66a72..5be460b2ea1a 100644
--- a/net-fs/davfs2/files/include-compiler.patch
+++ b/net-fs/davfs2/files/include-compiler.patch
@@ -1,6 +1,6 @@
 diff -ur davfs2-0.2.4.orig/src/davfsd.c davfs2-0.2.4/src/davfsd.c
---- davfs2-0.2.4.orig/src/davfsd.c	2005-07-18 23:09:23.000000000 +0200
-+++ davfs2-0.2.4/src/davfsd.c	2005-07-18 23:09:48.000000000 +0200
+--- davfs2-0.2.4.orig/src/davfsd.c	2005-08-21 10:50:08.000000000 +0200
++++ davfs2-0.2.4/src/davfsd.c	2005-08-21 10:50:16.000000000 +0200
 @@ -33,6 +33,7 @@
  /* Linux Kernel Source */
  /* avoid inclusion of kernel time.h, since it conflicts with userland time.h */
@@ -10,8 +10,8 @@ diff -ur davfs2-0.2.4.orig/src/davfsd.c davfs2-0.2.4/src/davfsd.c
  
  /* Neon */
 diff -ur davfs2-0.2.4.orig/src/davfsd.h davfs2-0.2.4/src/davfsd.h
---- davfs2-0.2.4.orig/src/davfsd.h	2005-07-18 23:09:23.000000000 +0200
-+++ davfs2-0.2.4/src/davfsd.h	2005-07-18 23:09:53.000000000 +0200
+--- davfs2-0.2.4.orig/src/davfsd.h	2005-08-21 10:50:08.000000000 +0200
++++ davfs2-0.2.4/src/davfsd.h	2005-08-21 10:50:16.000000000 +0200
 @@ -25,6 +25,7 @@
  /* Linux Kernel Source */
  /* avoid inclusion of kernel time.h, since it conflicts with userland time.h */
@@ -20,3 +20,14 @@ diff -ur davfs2-0.2.4.orig/src/davfsd.h davfs2-0.2.4/src/davfsd.h
  #include <linux/coda.h>
  
  #ifndef DIRBLKSIZ
+diff -ur davfs2-0.2.4.orig/src/util.c davfs2-0.2.4/src/util.c
+--- davfs2-0.2.4.orig/src/util.c	2005-08-21 10:50:38.000000000 +0200
++++ davfs2-0.2.4/src/util.c	2005-08-21 10:47:40.000000000 +0200
+@@ -34,6 +34,7 @@
+ /* Linux coda head file */
+ /* avoid inclusion of kernel time.h, since it conflicts with userland time.h */
+ #define _LINUX_TIME_H
++#include <linux/compiler.h>
+ #include <linux/coda.h>
+ 
+ /* Neon */
diff --git a/net-fs/davfs2/files/include_compiler.patch b/net-fs/davfs2/files/include_compiler.patch
deleted file mode 100644
index 177da3b88931..000000000000
--- a/net-fs/davfs2/files/include_compiler.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/davfsd.c.orig	2004-11-02 06:45:26.000000000 +0100
-+++ src/davfsd.c	2005-02-10 16:57:36.895959566 +0100
-@@ -38,6 +38,7 @@
- /* Linux Kernel Source */
- /* avoid inclusion of kernel time.h, since it conflicts with userland time.h */
- #define _LINUX_TIME_H
-+#include <linux/compiler.h>
- #include <linux/coda.h>
- 
- /* Neon */
---- src/mount.c.orig	2004-11-02 06:45:26.000000000 +0100
-+++ src/mount.c	2005-02-10 16:58:22.818690708 +0100
-@@ -35,6 +35,7 @@
- /* Linux coda head file */
- /* avoid inclusion of kernel time.h, since it conflicts with userland time.h */
- #define _LINUX_TIME_H
-+#include <linux/compiler.h>
- #include <linux/coda.h>
- 
- /* Neon */