Add moduledb worlaround, remove old ebuilds

Package-Manager: portage-2.1_rc1

10 files changed, 28 insertions, 278 deletions

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index a72eed5a756c..060a1a1e3335 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,14 +1,30 @@
-MD5 20a0e1f498a73d2c6789999e0462cbfa ChangeLog 7272
-MD5 875ccb2f04c962dedc90c43d94d90866 files/digest-fuse-2.4.1-r1 232
-MD5 b3a2e724ad0f3ed8280457e2738860f1 files/digest-fuse-2.4.2 232
-MD5 a78482757391a27ede18b0d374dcad07 files/digest-fuse-2.5.2 232
-MD5 f44dcfc4420f3adf7c14d8ddefc4fd03 files/digest-fuse-2.6.0_pre2 247
-MD5 cd6d8213487f9be260e992e612bd23c4 files/fuse-2.6.16.patch 1328
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fuse-fix-lazy-binding.patch 398 RMD160 e8663cdbf720378839bf3ac786a49a9927b81afe SHA1 59a923f6263e954a7db488021005448cefcc8f5a SHA256 d9733aaece65a0c864edbfebae205cdec096174165e943a569adb216ec73f9e1 size 398
 MD5 c1ef6366ba5892111ddef08887328663 files/fuse-fix-lazy-binding.patch 398
-MD5 da9f962a4e5f50406efd2cbda5ce3381 files/fuse-fix-memleak.patch 587
-MD5 341eb75e58827ef58b4c5b445c721362 files/fusermount.patch 1300
-MD5 f552be18e87f9c498393e7c02013b5ea fuse-2.4.1-r1.ebuild 1355
-MD5 646e658bda057dcc2d187c30b1022c8c fuse-2.4.2.ebuild 1494
-MD5 d05ca596a814289ffef3c77c4329fbdc fuse-2.5.2.ebuild 1458
-MD5 7fdafba26d72bf4aaf47b006985259b6 fuse-2.6.0_pre2.ebuild 1464
+RMD160 e8663cdbf720378839bf3ac786a49a9927b81afe files/fuse-fix-lazy-binding.patch 398
+SHA256 d9733aaece65a0c864edbfebae205cdec096174165e943a569adb216ec73f9e1 files/fuse-fix-lazy-binding.patch 398
+DIST fuse-2.6.0-pre2.tar.gz 419045 RMD160 208b0f5dd50398c73b8c6956c1e1443f3cd5cf37 SHA256 d9b008d10558a4bce9e91a561d38263ddfb889f925ea63913c43205fc223be10 size 419045
+EBUILD fuse-2.6.0_pre2.ebuild 1617 RMD160 9b0250e1db8d46434e4f3ad6f2a0032e135e99b3 SHA1 5bd1b6bac59fbf04d7ac4636b5eddb5f5cb36c5a SHA256 d9c17de81103b01181c060eb83f4fb3fc19a9697479e79d399b55716bd5701b3 size 1617
+MD5 7e1ad83d3ab9b987a5f546b80f4c600c fuse-2.6.0_pre2.ebuild 1617
+RMD160 9b0250e1db8d46434e4f3ad6f2a0032e135e99b3 fuse-2.6.0_pre2.ebuild 1617
+SHA256 d9c17de81103b01181c060eb83f4fb3fc19a9697479e79d399b55716bd5701b3 fuse-2.6.0_pre2.ebuild 1617
+MISC ChangeLog 7548 RMD160 e4ffe9f4f4151de198835965859d8eb25abdf6e5 SHA1 705b9c227d8d17fed52a2cf5e16c55ff1b32e273 SHA256 6e7f63d01c6d371167f25b9b5af8bc6202a4ca19ddea21f5eb7d1494c98824cb size 7548
+MD5 7997c37ad86e9641343458e607c6d57a ChangeLog 7548
+RMD160 e4ffe9f4f4151de198835965859d8eb25abdf6e5 ChangeLog 7548
+SHA256 6e7f63d01c6d371167f25b9b5af8bc6202a4ca19ddea21f5eb7d1494c98824cb ChangeLog 7548
+MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b size 264
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
+RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
+SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b metadata.xml 264
+MD5 f44dcfc4420f3adf7c14d8ddefc4fd03 files/digest-fuse-2.6.0_pre2 247
+RMD160 8a138bdc61f9c13d49ee71f1ac9d2d3525aaa60e files/digest-fuse-2.6.0_pre2 247
+SHA256 38c46baa7614a894ce000c094a96e72574c972ca6b43fdc24168b7bc7463e55a files/digest-fuse-2.6.0_pre2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEaF+RNJowsmZ/PzARApHwAJsHyH9+ddC7MGMT2shresHiWbIoJgCePlFZ
+lPdAnGeUWB0iXhGtQ/StQSc=
+=rJIc
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/fuse/files/digest-fuse-2.4.1-r1 b/sys-fs/fuse/files/digest-fuse-2.4.1-r1
deleted file mode 100644
index 0914538c7177..000000000000
--- a/sys-fs/fuse/files/digest-fuse-2.4.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 553bd9c5a4f3cd27f3e2b93844711e4c fuse-2.4.1.tar.gz 384631
-RMD160 ea0919fe6b907733d519b6daadb274848e6a5ef3 fuse-2.4.1.tar.gz 384631
-SHA256 8627cf269f4abe5974bf286cf746bb41463909b67282b48fc692d73aeb224f15 fuse-2.4.1.tar.gz 384631
diff --git a/sys-fs/fuse/files/digest-fuse-2.4.2 b/sys-fs/fuse/files/digest-fuse-2.4.2
deleted file mode 100644
index 866afa57f1ef..000000000000
--- a/sys-fs/fuse/files/digest-fuse-2.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e3d9a580c45ddf4a06558c135c158c2 fuse-2.4.2.tar.gz 384993
-RMD160 e88ebf356aa29b22a4638c8af44e723b2c458509 fuse-2.4.2.tar.gz 384993
-SHA256 f2b530d8bc94fb48d0595bea8367bf7909021053e6c9ee308c63fe74f6b2e9d0 fuse-2.4.2.tar.gz 384993
diff --git a/sys-fs/fuse/files/digest-fuse-2.5.2 b/sys-fs/fuse/files/digest-fuse-2.5.2
deleted file mode 100644
index 55a106156e4c..000000000000
--- a/sys-fs/fuse/files/digest-fuse-2.5.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea565debe6c7486963bef05c45c50361 fuse-2.5.2.tar.gz 407845
-RMD160 840f0f13d9d493b1c2969471cfb9414a5368780e fuse-2.5.2.tar.gz 407845
-SHA256 19aeaa8e9c63393ddde7114a74899161748accf7ff60d59144a876a65f4fb1b8 fuse-2.5.2.tar.gz 407845
diff --git a/sys-fs/fuse/files/fuse-2.6.16.patch b/sys-fs/fuse/files/fuse-2.6.16.patch
deleted file mode 100644
index 0ae6c3253aa6..000000000000
--- a/sys-fs/fuse/files/fuse-2.6.16.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: kernel/file.c
-===================================================================
-RCS file: /cvsroot/fuse/fuse/kernel/file.c,v
-retrieving revision 1.94
-retrieving revision 1.94.2.1
-diff -u -r1.94 -r1.94.2.1
---- kernel/file.c       6 Jan 2006 18:29:39 -0000       1.94
-+++ kernel/file.c       18 Jan 2006 12:17:33 -0000      1.94.2.1
-@@ -675,9 +675,15 @@
- 	struct inode *inode = file->f_dentry->d_inode;
- 	ssize_t res;
- 	/* Don't allow parallel writes to the same file */
-+#ifdef KERNEL_2_6_16_PLUS
-+	mutex_lock(&inode->i_mutex);
-+	res = fuse_direct_io(file, buf, count, ppos, 1);
-+	mutex_unlock(&inode->i_mutex);
-+#else
- 	down(&inode->i_sem);
- 	res = fuse_direct_io(file, buf, count, ppos, 1);
- 	up(&inode->i_sem);
-+#endif
- 	return res;
- }
-
-Index: kernel/fuse_i.h
-===================================================================
-RCS file: /cvsroot/fuse/fuse/kernel/fuse_i.h,v
-retrieving revision 1.99
-retrieving revision 1.99.2.1
-diff -u -r1.99 -r1.99.2.1
---- kernel/fuse_i.h     14 Jan 2006 14:47:21 -0000      1.99
-+++ kernel/fuse_i.h     18 Jan 2006 12:17:33 -0000      1.99.2.1
-@@ -40,6 +40,9 @@
- #  if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
- #    define KERNEL_2_6_13_PLUS
- #  endif
-+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+#    define KERNEL_2_6_16_PLUS
-+#  endif
- #endif
-
- #include "config.h"
diff --git a/sys-fs/fuse/files/fuse-fix-memleak.patch b/sys-fs/fuse/files/fuse-fix-memleak.patch
deleted file mode 100644
index f982f32ae112..000000000000
--- a/sys-fs/fuse/files/fuse-fix-memleak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur fuse fuseold
---- fuse/lib/fuse.c	2005-12-03 18:19:33.000000000 -0500
-+++ fuseold/lib/fuse.c	2005-12-03 18:19:33.000000000 -0500
-@@ -1656,6 +1656,7 @@
- void fuse_process_cmd(struct fuse *f, struct fuse_cmd *cmd)
- {
-     fuse_session_process(f->se, cmd->buf, cmd->buflen, cmd->ch);
-+    free_cmd(cmd);
- }
- 
- int fuse_exited(struct fuse *f)
-@@ -1693,6 +1694,8 @@
-         int res = fuse_chan_receive(ch, cmd->buf, bufsize);
-         if (res <= 0) {
-             free_cmd(cmd);
-+	    if (res == -1)
-+		fuse_exit(f);
-             return NULL;
-         }
-         cmd->buflen = res;
-
diff --git a/sys-fs/fuse/files/fusermount.patch b/sys-fs/fuse/files/fusermount.patch
deleted file mode 100644
index 7bd930e46a29..000000000000
--- a/sys-fs/fuse/files/fusermount.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: util/fusermount.c
-===================================================================
-RCS file: /cvsroot/fuse/fuse/util/fusermount.c,v
-retrieving revision 1.69
-diff -u -r1.69 fusermount.c
---- util/fusermount.c	11 Oct 2005 10:12:08 -0000	1.69
-+++ util/fusermount.c	18 Nov 2005 20:32:26 -0000
-@@ -120,6 +120,23 @@
-     }
- }
- 
-+/* Glibc addmntent() doesn't encode '\n', misencodes '\t' as '\n'
-+   (version 2.3.2), and encodes '\\' differently as mount(8).  So
-+   let's not allow those characters, they are not all that usual in
-+   filenames. */
-+static int check_name(const char *name)
-+{
-+    char *s;
-+    for (s = "\n\t\\"; *s; s++) {
-+        if (strchr(name, *s)) {
-+            fprintf(stderr, "%s: illegal character 0x%02x in mount entry\n",
-+                    progname, *s);
-+            return -1;
-+        }
-+    }
-+    return 0;
-+}
-+
- static int add_mount(const char *fsname, const char *mnt, const char *type,
-                      const char *opts)
- {
-@@ -128,6 +145,10 @@
-     struct mntent ent;
-     FILE *fp;
- 
-+    if (check_name(fsname) == -1 || check_name(mnt) == -1 || 
-+        check_name(type) == -1 || check_name(opts) == -1)
-+        return -1;
-+
-     fp = setmntent(mtab, "a");
-     if (fp == NULL) {
- 	fprintf(stderr, "%s: failed to open %s: %s\n", progname, mtab,
diff --git a/sys-fs/fuse/fuse-2.4.1-r1.ebuild b/sys-fs/fuse/fuse-2.4.1-r1.ebuild
deleted file mode 100644
index a9c802cfe8a7..000000000000
--- a/sys-fs/fuse/fuse-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.4.1-r1.ebuild,v 1.5 2006/01/07 21:11:10 genstef Exp $
-
-inherit linux-mod eutils
-
-MY_P=${P/_/-}
-DESCRIPTION="An interface for filesystems implemented in userspace."
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-
-MODULE_NAMES="fuse(fs:${S}/kernel)"
-BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR}
-			  fusemoduledir=${ROOT}/lib/modules/${KV_FULL}/fs"
-BUILD_TARGETS="all"
-ECONF_PARAMS="--with-kernel=${KV_OUT_DIR} --enable-kernel-module"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fuse-fix-lazy-binding.patch
-	epatch ${FILESDIR}/fusermount.patch
-}
-
-src_compile() {
-	einfo "Preparing fuse userland"
-	econf --disable-kernel-module --disable-example || \
-		die "econf failed for fuse userland"
-	emake || die "emake failed"
-
-	sed -i 's/.*depmod.*//g' ${S}/kernel/Makefile.in
-	convert_to_m ${S}/kernel/Makefile.in
-	linux-mod_src_compile
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog Filesystems README README-2.4 \
-		README.NFS NEWS doc/how-fuse-works
-	docinto example
-	dodoc example/*
-
-	linux-mod_src_install
-}
diff --git a/sys-fs/fuse/fuse-2.4.2.ebuild b/sys-fs/fuse/fuse-2.4.2.ebuild
deleted file mode 100644
index a2f3e1b88786..000000000000
--- a/sys-fs/fuse/fuse-2.4.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.4.2.ebuild,v 1.5 2006/02/16 14:28:27 gustavoz Exp $
-
-inherit linux-mod eutils
-
-MY_P=${P/_/-}
-DESCRIPTION="An interface for filesystems implemented in userspace."
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-
-MODULE_NAMES="fuse(fs:${S}/kernel)"
-CONFIG_CHECK="@FUSE_FS:fuse"
-BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR}
-			  fusemoduledir=${ROOT}/lib/modules/${KV_FULL}/fs"
-BUILD_TARGETS="all"
-ECONF_PARAMS="--with-kernel=${KV_OUT_DIR}"
-FUSE_FS_ERROR="We have detected FUSE already built into the kernel.
-We will continue, but we wont build the module this time."
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fuse-fix-lazy-binding.patch
-	epatch ${FILESDIR}/fuse-fix-memleak.patch
-}
-
-src_compile() {
-	einfo "Preparing fuse userland"
-	econf --disable-kernel-module --disable-example || \
-		die "econf failed for fuse userland"
-	emake || die "emake failed"
-
-	sed -i 's/.*depmod.*//g' ${S}/kernel/Makefile.in
-	convert_to_m ${S}/kernel/Makefile.in
-	linux-mod_src_compile
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog Filesystems README README-2.4 \
-		README.NFS NEWS doc/how-fuse-works
-	docinto example
-	dodoc example/*
-
-	linux-mod_src_install
-}
diff --git a/sys-fs/fuse/fuse-2.5.2.ebuild b/sys-fs/fuse/fuse-2.5.2.ebuild
deleted file mode 100644
index 5194ca85e121..000000000000
--- a/sys-fs/fuse/fuse-2.5.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.5.2.ebuild,v 1.2 2006/03/24 19:59:19 agriffis Exp $
-
-inherit linux-mod eutils
-
-MY_P=${P/_/-}
-DESCRIPTION="An interface for filesystems implemented in userspace."
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-
-MODULE_NAMES="fuse(fs:${S}/kernel)"
-CONFIG_CHECK="@FUSE_FS:fuse"
-BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR}
-			  fusemoduledir=${ROOT}/lib/modules/${KV_FULL}/fs"
-BUILD_TARGETS="all"
-ECONF_PARAMS="--with-kernel=${KV_OUT_DIR}"
-FUSE_FS_ERROR="We have detected FUSE already built into the kernel.
-We will continue, but we wont build the module this time."
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fuse-fix-lazy-binding.patch
-}
-
-src_compile() {
-	einfo "Preparing fuse userland"
-	econf --disable-kernel-module --disable-example || \
-		die "econf failed for fuse userland"
-	emake || die "emake failed"
-
-	sed -i 's/.*depmod.*//g' ${S}/kernel/Makefile.in
-	convert_to_m ${S}/kernel/Makefile.in
-	linux-mod_src_compile
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog Filesystems README README-2.4 \
-		README.NFS NEWS doc/how-fuse-works
-	docinto example
-	dodoc example/*
-
-	linux-mod_src_install
-}