Version bump, removing kernel layer in favour of lufis/fuse, only working filesystems, closes Bug 67212

7 files changed, 205 insertions, 10 deletions

diff --git a/sys-fs/lufs/ChangeLog b/sys-fs/lufs/ChangeLog
index 2a766aa1b29a..8b6825541d62 100644
--- a/sys-fs/lufs/ChangeLog
+++ b/sys-fs/lufs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/lufs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.16 2004/09/03 19:16:58 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.17 2004/12/14 17:59:50 genstef Exp $
+
+*lufs-0.9.7-r3 (14 Dec 2004)
+
+  14 Dec 2004; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
+  +files/lufs-0.9.7-enable-gnome-2.patch, +files/lufs-automount-port.diff,
+  +lufs-0.9.7-r3.ebuild:
+  Version bump, removing kernel layer in favour of lufis/fuse, only working
+  filesystems, closes Bug 67212
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   lufs-0.9.7-r2.ebuild:
diff --git a/sys-fs/lufs/Manifest b/sys-fs/lufs/Manifest
index 66f39a45e83a..2f229d2e420d 100644
--- a/sys-fs/lufs/Manifest
+++ b/sys-fs/lufs/Manifest
@@ -1,15 +1,19 @@
-MD5 898362e875d6137886e5efc07c753b2b ChangeLog 4246
+MD5 3b9f1b71925c390fe5e2e466aefae2f7 lufs-0.9.5.ebuild 1570
+MD5 e873cd574d66adb439c1e37fa9fcdfda lufs-0.9.7-r3.ebuild 1702
 MD5 fdf9c76c961a60b2ad866baec4704be3 lufs-0.7.0.ebuild 1299
 MD5 cd9691605fd082deeae3d8369ed8735c lufs-0.8.0-r1.ebuild 1336
-MD5 3b9f1b71925c390fe5e2e466aefae2f7 lufs-0.9.5.ebuild 1570
 MD5 7b3efe7adca5d3e9f79087d52cc2da7c lufs-0.9.7-r2.ebuild 2257
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 c574a7036eebafdb31765fec945e0498 files/digest-lufs-0.7.0 62
+MD5 95c4fa629ad0bdceb7977f849ed466cf ChangeLog 4552
+MD5 2d8e24e9e409e35ee446ec8d59f23c8d metadata.xml 269
+MD5 3f5d97db2f2eedc51f0ae99618a924c2 files/lufs-0.7.0-init 361
+MD5 5bb142fc118cf319966c128949fba3bb files/gentoo-gcc332fix-0.9.7.patch 453
 MD5 589f3dad16a475a1f541a2be26ff9d33 files/digest-lufs-0.8.0-r1 62
-MD5 c5059868c2a7c434b87106a9b7901a96 files/digest-lufs-0.9.5 62
+MD5 09d17da22336bf2a8b5327a76a02e72c files/lufs-0.9.3-init 471
 MD5 41054752e68ab9784f5f8a1baed3f7a5 files/digest-lufs-0.9.7-r2 62
-MD5 5bb142fc118cf319966c128949fba3bb files/gentoo-gcc332fix-0.9.7.patch 453
-MD5 3f5d97db2f2eedc51f0ae99618a924c2 files/lufs-0.7.0-init 361
+MD5 41054752e68ab9784f5f8a1baed3f7a5 files/digest-lufs-0.9.7-r3 62
+MD5 c574a7036eebafdb31765fec945e0498 files/digest-lufs-0.7.0 62
+MD5 c5059868c2a7c434b87106a9b7901a96 files/digest-lufs-0.9.5 62
+MD5 acf6168850b8d8eeb29cda95f24bf348 files/lufs-0.9.7-enable-gnome-2.patch 3079
+MD5 6b6cf45b49b2229781b000b9ae2a0027 files/lufs-automount-port.diff 754
 MD5 3f5d97db2f2eedc51f0ae99618a924c2 files/lufs-0.8.0-init 361
-MD5 09d17da22336bf2a8b5327a76a02e72c files/lufs-0.9.3-init 471
 MD5 1cc4c0f0d3a43f97ba10d59b026a6c6f files/lufs-0.9.7-fPIC.patch 714
diff --git a/sys-fs/lufs/files/digest-lufs-0.9.7-r3 b/sys-fs/lufs/files/digest-lufs-0.9.7-r3
new file mode 100644
index 000000000000..54c98d3ea5f8
--- /dev/null
+++ b/sys-fs/lufs/files/digest-lufs-0.9.7-r3
@@ -0,0 +1 @@
+MD5 23f58fe232254a65df6eb4736a81d524 lufs-0.9.7.tar.gz 537772
diff --git a/sys-fs/lufs/files/lufs-0.9.7-enable-gnome-2.patch b/sys-fs/lufs/files/lufs-0.9.7-enable-gnome-2.patch
new file mode 100644
index 000000000000..f255fbbe8b56
--- /dev/null
+++ b/sys-fs/lufs/files/lufs-0.9.7-enable-gnome-2.patch
@@ -0,0 +1,72 @@
+diff -upr -x aclocal.m4 -x Makefile.in -x configure -x '.*' -x autom4te.cache -x kernel /var/tmp/portage/lufs-0.9.7-r1/work/lufs-0.9.7/config.h.in lufs-0.9.7/config.h.in
+--- /var/tmp/portage/lufs-0.9.7-r1/work/lufs-0.9.7/config.h.in	2003-10-29 22:48:48.000000000 +0000
++++ lufs-0.9.7/config.h.in	2004-01-13 22:51:00.000000000 +0000
+@@ -9,6 +9,9 @@
+ /* Define if libchipcard is present. */
+ #undef HAS_LIBCHIPCARD
+ 
++/* Define if using libgnome-2 rather than 1. */
++#undef HAS_LIBGNOME_2
++
+ /* Define if ssh is found. */
+ #undef HAS_SSH
+ 
+diff -upr -x aclocal.m4 -x Makefile.in -x configure -x '.*' -x autom4te.cache -x kernel /var/tmp/portage/lufs-0.9.7-r1/work/lufs-0.9.7/configure.in lufs-0.9.7/configure.in
+--- /var/tmp/portage/lufs-0.9.7-r1/work/lufs-0.9.7/configure.in	2003-10-29 22:40:28.000000000 +0000
++++ lufs-0.9.7/configure.in	2004-01-13 22:50:20.802647656 +0000
+@@ -164,7 +164,9 @@ AC_SUBST(SSHPROG)
+ dnl Checking gnome
+ AC_CHECK_PROG(GCONF, gnome-config, gnome-config)
+ AC_CHECK_PROG(GVFSCONF, gnome-vfs-config, gnome-vfs-config)
++AC_CHECK_PROG(PKGCONF, pkg-config, pkg-config)
+ AC_CHECK_LIB(gnomevfs, gnome_vfs_init, HAS_GNOMEVFS=1,)
++AC_CHECK_LIB(gnomevfs-2, gnome_vfs_init, HAS_GNOMEVFS2=1,`$PKGCONF --libs-only-l gnome-vfs-2.0`)
+ if test "$GCONF" -a "$GVFSCONF" -a "$HAS_GNOMEVFS"
+ then
+     AC_DEFINE([HAS_GVFS], 1, [Define if gvfs is to be built.])
+@@ -172,6 +174,16 @@ then
+     GVFS_LDADD="`$GCONF --libs gnome` `$GVFSCONF --libs`"
+     GVFS_CFLAGS="`$GCONF --cflags gnome` `$GVFSCONF --cflags`"
+     opt_fs="$opt_fs gvfs"
++elif test "$PKGCONF" -a "$HAS_GNOMEVFS2"
++then
++    AC_DEFINE([HAS_GVFS], 1, [Define if gvfs is to be built.])
++    AC_DEFINE([HAS_LIBGNOME_2], 1, [Define if using libgnome-2 rather than 1.])
++    define_has_libgnome_2="#define HAS_LIBGNOME_2"
++    AC_SUBST(define_has_libgnome_2)
++
++    GVFS_LDADD="`$PKGCONF --libs libgnome-2.0` `$PKGCONF --libs gnome-vfs-2.0`"
++    GVFS_CFLAGS="`$PKGCONF --cflags libgnome-2.0` `$PKGCONF --cflags gnome-vfs-2.0`"
++    opt_fs="$opt_fs gvfs"
+ fi
+ AC_SUBST(GVFS_LDADD)
+ AC_SUBST(GVFS_CFLAGS)
+diff -upr -x aclocal.m4 -x Makefile.in -x configure -x '.*' -x autom4te.cache -x kernel /var/tmp/portage/lufs-0.9.7-r1/work/lufs-0.9.7/filesystems/gvfs/gvfs.cpp lufs-0.9.7/filesystems/gvfs/gvfs.cpp
+--- /var/tmp/portage/lufs-0.9.7-r1/work/lufs-0.9.7/filesystems/gvfs/gvfs.cpp	2003-03-08 21:45:29.000000000 +0000
++++ lufs-0.9.7/filesystems/gvfs/gvfs.cpp	2004-01-13 22:55:44.906376400 +0000
+@@ -36,8 +36,13 @@
+ #include <lufs/fs.h>
+ 
+ #include "gvfs.h"
++#include "config.h"
+ 
++#ifdef HAS_LIBGNOME_2
++#include <libgnome/libgnome.h>
++#else
+ #include <gnome.h>
++#endif
+ #include <libgnomevfs/gnome-vfs.h>
+ 
+ extern "C" { 
+@@ -275,7 +280,11 @@ GVFS::do_readdir(char* d, struct directo
+ 	goto out_uri;
+     }
+ 
++#ifdef HAS_LIBGNOME_2
++    if(gnome_vfs_directory_open_from_uri(&dir, uri, GNOME_VFS_FILE_INFO_DEFAULT) != GNOME_VFS_OK){
++#else
+     if(gnome_vfs_directory_open_from_uri(&dir, uri, GNOME_VFS_FILE_INFO_DEFAULT, NULL) != GNOME_VFS_OK){
++#endif
+ 	WARN("could not open directory!");
+ 	goto out_info;
+     }
diff --git a/sys-fs/lufs/files/lufs-automount-port.diff b/sys-fs/lufs/files/lufs-automount-port.diff
new file mode 100644
index 000000000000..b184b20aba97
--- /dev/null
+++ b/sys-fs/lufs/files/lufs-automount-port.diff
@@ -0,0 +1,28 @@
+Files lufs-0.9.5.org/util/a.out and lufs-0.9.5/util/a.out differ
+diff -Nur lufs-0.9.5.org/util/auto.sshfs.c lufs-0.9.5/util/auto.sshfs.c
+--- lufs-0.9.5.org/util/auto.sshfs.c	2003-10-24 16:51:49.000000000 +0200
++++ lufs-0.9.5/util/auto.sshfs.c	2003-10-24 16:54:15.000000000 +0200
+@@ -26,6 +26,8 @@
+ int
+ main(int argc, char **argv){
+     char *c;
++    char *d;
++    int port = 22;
+ 
+     if(argc < 2)
+ 	return 1;
+@@ -34,8 +36,12 @@
+ 	return 1;
+ 
+     *c = 0;
+-
+-    printf("-fstype=lufs,fs=sshfs,quiet,host=%s,username=%s none\n", c + 1, argv[1]);
++    d = strchr(c + 1, ':');
++    if (d) {
++    	port = atoi(d + 1);
++	*d = 0;
++    } 
++    printf("-fstype=lufs,fs=sshfs,quiet,host=%s,port=%d,username=%s none\n", c + 1,port, argv[1]);
+ 
+     return 0;
+ }
diff --git a/sys-fs/lufs/lufs-0.9.7-r3.ebuild b/sys-fs/lufs/lufs-0.9.7-r3.ebuild
new file mode 100644
index 000000000000..6eea57bf56b4
--- /dev/null
+++ b/sys-fs/lufs/lufs-0.9.7-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r3.ebuild,v 1.1 2004/12/14 17:59:50 genstef Exp $
+
+inherit eutils
+
+DESCRIPTION="User-mode filesystem implementation"
+HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="debug"
+DEPEND="sys-fs/lufis
+		=sys-devel/automake-1.7*
+		=sys-devel/autoconf-2.5*"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-fPIC.patch
+	epatch ${FILESDIR}/lufs-automount-port.diff
+	epatch ${FILESDIR}/${P}-enable-gnome-2.patch
+
+	filesystems="ftpfs localfs sshfs"
+}
+
+src_compile() {
+	local WANT_AUTOMAKE="1.7" WANT_AUTOCONF="2.5"
+	aclocal
+	automake
+	autoconf
+
+	libtoolize --copy --force
+
+	einfo "Compiling for ${filesystems}"
+	unset ARCH
+	econf --with-kheaders=${ROOT}/usr/include \
+		 $(use_enable debug) || die
+
+	cd filesystems
+	for i in ${filesystems}
+	do
+		cd ${i}
+		emake || die "emake failed"
+		cd ..
+	done
+	cd ..
+
+	cd util; emake auto.sshfs auto.ftpfs ||  die "emake failed"; cd ..
+}
+
+src_install() {
+	cd filesystems
+	for i in ${filesystems}
+	do
+		cd ${i}
+		make DESTDIR=${D} install || die "make install failed"
+		cd ..
+	done
+	cd ..
+
+	cd util; dobin auto.sshfs auto.ftpfs; cd ..
+
+	dodir /etc/autofs
+	dosym /usr/bin/auto.sshfs /etc/autofs/auto.sshfs
+	dosym /usr/bin/auto.ftpfs /etc/autofs/auto.ftpfs
+}
+
+pkg_postinst() {
+	ewarn "Lufs Kernel support and lufsd,lufsmnt have been disabled in favour"
+	ewarn "of lufis, please use lufis to mount lufs-filesystems, eg:"
+	echo "# lufis fs=sshfs,host=dev.gentoo.org,username=genstef /mnt/lufis/ -s"
+	ewarn "If something does not work for you with this setup please"
+	ewarn "complain to bugs.gentoo.org"
+}
diff --git a/sys-fs/lufs/metadata.xml b/sys-fs/lufs/metadata.xml
index 96a2d586367d..209f080820d9 100644
--- a/sys-fs/lufs/metadata.xml
+++ b/sys-fs/lufs/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+  <herd>base-system</herd>
+  <maintainer>
+    <email>genstef@gentoo.org</email>
+    <name>Stefan Schweizer</name>
+  </maintainer>
 </pkgmetadata>