summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@gentoo.org>2005-04-04 20:40:43 +0000
committerGunnar Wrobel <wrobel@gentoo.org>2005-04-04 20:40:43 +0000
commit753d0554760a74bf8d6e5528387dcfff6626188e (patch)
treeb37bf0cb0a23a9a574504e4f219086ce0278ea03 /dev-java
parentAdded the fuse-j ebuild (diff)
downloadoverlay-753d0554760a74bf8d6e5528387dcfff6626188e.tar.gz
overlay-753d0554760a74bf8d6e5528387dcfff6626188e.tar.bz2
overlay-753d0554760a74bf8d6e5528387dcfff6626188e.zip
Added new fuse-j version
svn path=/; revision=102
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/fuse-j/Manifest5
-rw-r--r--dev-java/fuse-j/files/digest-fuse-j-2.2.11
-rw-r--r--dev-java/fuse-j/files/fuse-j-diffs-fuse2.125
-rw-r--r--dev-java/fuse-j/files/fuse_1.4-2.1.patch41
-rw-r--r--dev-java/fuse-j/fuse-j-1.4.ebuild6
-rw-r--r--dev-java/fuse-j/fuse-j-2.2.1.ebuild59
6 files changed, 134 insertions, 3 deletions
diff --git a/dev-java/fuse-j/Manifest b/dev-java/fuse-j/Manifest
index 8ebcbff..cb028e7 100644
--- a/dev-java/fuse-j/Manifest
+++ b/dev-java/fuse-j/Manifest
@@ -1,2 +1,5 @@
-MD5 e3d086ab44792880eeebb98ba770fbbe fuse-j-1.4.ebuild 828
+MD5 a24a9c9b792258b43cfa6d073ef74e4d fuse-j-1.4.ebuild 837
+MD5 c739d5920c0fdd3463a108c89a401f90 fuse-j-2.2.1.ebuild 882
+MD5 c88f94ffb35d7fc22c434fdc1e09fa7e files/digest-fuse-j-2.2.1 57
+MD5 ac5efa7010e2c62540eb75c110cce255 files/fuse-j-diffs-fuse2.1 1421
MD5 c88f94ffb35d7fc22c434fdc1e09fa7e files/digest-fuse-j-1.4 57
diff --git a/dev-java/fuse-j/files/digest-fuse-j-2.2.1 b/dev-java/fuse-j/files/digest-fuse-j-2.2.1
new file mode 100644
index 0000000..7ebb67b
--- /dev/null
+++ b/dev-java/fuse-j/files/digest-fuse-j-2.2.1
@@ -0,0 +1 @@
+MD5 3b3a73ea25d1441430c4be1fee305fd5 fuse-j.tar.gz 35358
diff --git a/dev-java/fuse-j/files/fuse-j-diffs-fuse2.1 b/dev-java/fuse-j/files/fuse-j-diffs-fuse2.1
new file mode 100644
index 0000000..de617ca
--- /dev/null
+++ b/dev-java/fuse-j/files/fuse-j-diffs-fuse2.1
@@ -0,0 +1,25 @@
+diff fuse-j/jni/javafs.c fuse-j-orig/jni/javafs.c
+715c715
+< static int javafs_statfs( const char *path, struct statfs *fst)
+---
+> static int javafs_statfs(struct fuse_statfs *fst)
+725,730c725,730
+< fst->f_bsize = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blockSize);
+< fst->f_blocks = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blocks);
+< fst->f_bfree = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blocksFree);
+< fst->f_files = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.files);
+< fst->f_ffree = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.filesFree);
+< fst->f_namelen = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.namelen);
+---
+> fst->block_size = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blockSize);
+> fst->blocks = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blocks);
+> fst->blocks_free = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blocksFree);
+> fst->files = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.files);
+> fst->files_free = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.filesFree);
+> fst->namelen = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.namelen);
+
+ diff fuse-j/jni/Makefile fuse-j-orig/jni/Makefile
+19c19
+< gcc -c ${INCLUDES} -D_FILE_OFFSET_BITS=64 $< -o $@
+---
+> gcc -c ${INCLUDES} $< -o $@
diff --git a/dev-java/fuse-j/files/fuse_1.4-2.1.patch b/dev-java/fuse-j/files/fuse_1.4-2.1.patch
new file mode 100644
index 0000000..440401b
--- /dev/null
+++ b/dev-java/fuse-j/files/fuse_1.4-2.1.patch
@@ -0,0 +1,41 @@
+--- jni/Makefile.orig 2005-04-04 22:25:08.000000000 +0200
++++ jni/Makefile 2005-04-04 22:25:35.000000000 +0200
+@@ -15,7 +15,7 @@
+ gcc -shared -o ${LIB_SO} ${LDPATH} -ljvm ${OBJS} ${FUSE_HOME}/lib/libfuse.a -lpthread
+
+ .c.o: ${SRCS} ${HDRS}
+- gcc -c ${INCLUDES} $< -o $@
++ gcc -c ${INCLUDES} -D_FILE_OFFSET_BITS=64 $< -o $@
+
+ clean:
+ rm -f ${LIB_SO} ${OBJS}
+--- jni/javafs.c.orig 2005-03-11 08:54:01.000000000 +0100
++++ jni/javafs.c 2005-04-04 22:29:11.000000000 +0200
+@@ -712,7 +712,7 @@
+ }
+
+
+-static int javafs_statfs(struct fuse_statfs *fst)
++static int javafs_statfs( const char *path, struct statfs *fst)
+ {
+ JNIEnv *env = get_env();
+ jobject jStatfs = NULL;
+@@ -722,12 +722,12 @@
+ jStatfs = (*env)->CallObjectMethod(env, filesystem, Filesystem->method.statfs);
+ if ((*env)->ExceptionCheck(env)) break;
+
+- fst->block_size = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blockSize);
+- fst->blocks = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blocks);
+- fst->blocks_free = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blocksFree);
+- fst->files = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.files);
+- fst->files_free = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.filesFree);
+- fst->namelen = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.namelen);
++ fst->f_bsize = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blockSize);
++ fst->f_blocks = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blocks);
++ fst->f_bfree = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.blocksFree);
++ fst->f_files = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.files);
++ fst->f_ffree = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.filesFree);
++ fst->f_namelen = (*env)->GetIntField(env, jStatfs, FuseStatfs->field.namelen);
+ break;
+ }
+
diff --git a/dev-java/fuse-j/fuse-j-1.4.ebuild b/dev-java/fuse-j/fuse-j-1.4.ebuild
index 08e99d4..dd8f151 100644
--- a/dev-java/fuse-j/fuse-j-1.4.ebuild
+++ b/dev-java/fuse-j/fuse-j-1.4.ebuild
@@ -10,12 +10,12 @@ SRC_URI="http://www.cl.cam.ac.uk/~tdm25/fuse-j/fuse-j.tar.gz"
LICENSE="LGPL"
SLOT="1"
KEYWORDS="~x86"
-IUSE="doc jikes"
+IUSE=""
DEPEND=">=virtual/jdk-1.4
dev-java/ant-core
app-arch/unzip
- sys-fs/fuse
+ <sys-fs/fuse-2
jikes? ( dev-java/jikes )"
RDEPEND=">=virtual/jre-1.4
sys-fs/fuse
@@ -46,6 +46,8 @@ src_install() {
dolib.so jni/libjavafs.so
+ dodoc README
+
cd build
jar cf fuse-j.jar `find fuse -name *.class`
diff --git a/dev-java/fuse-j/fuse-j-2.2.1.ebuild b/dev-java/fuse-j/fuse-j-2.2.1.ebuild
new file mode 100644
index 0000000..e48d34e
--- /dev/null
+++ b/dev-java/fuse-j/fuse-j-2.2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils java-pkg
+
+DESCRIPTION="Java bindings for the fuse filesystem"
+HOMEPAGE="http://www.cl.cam.ac.uk/~tdm25/fuse-j/"
+SRC_URI="http://www.cl.cam.ac.uk/~tdm25/fuse-j/fuse-j.tar.gz"
+
+LICENSE="LGPL"
+SLOT="1"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+ dev-java/ant-core
+ app-arch/unzip
+ >=sys-fs/fuse-2.1
+ jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jre-1.4
+ sys-fs/fuse
+"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+ unpack ${A}
+
+ cd ${S}
+
+ epatch ${FILESDIR}/fuse_1.4-2.1.patch
+
+ sed -i -e 's/^include.*build.conf//' Makefile jni/Makefile
+
+}
+
+src_compile() {
+
+ cd ${S}
+
+ export FUSE_HOME="/usr"
+
+ make
+
+}
+
+src_install() {
+
+ dolib.so jni/libjavafs.so
+
+ dodoc README
+
+ cd build
+
+ jar cf fuse-j.jar `find fuse -name *.class`
+
+ java-pkg_dojar fuse-j.jar
+
+}