version bump

Package-Manager: portage-2.1.2.4

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index 762c18b50f521fef28997f1cef4f0dd4c31a0f8a..8e8d87f55c75eb9b6903189e6035c83968867edf 100644 (file)
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.85 2007/04/24 18:55:18 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.86 2007/04/27 22:55:51 genstef Exp $
+
+*fuse-2.6.4 (27 Apr 2007)
+
+  27 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/fuse-2.6.0_rc3-no-mknod.patch, -files/fuse-2.6.20.patch,
+  -fuse-2.6.1.ebuild, +fuse-2.6.4.ebuild:
+  version bump
 
   24 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> fuse-2.6.3.ebuild:
   ppc stable, bug #172537

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index d76aca3eee1b0079966ce63391cd12e07765c6dc..b84e4d405b78113c19bad94c44e29efc7c27a310 100644 (file)
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,11 +1,3 @@
-AUX fuse-2.6.0_rc3-no-mknod.patch 476 RMD160 c21064b080b70fb3757638b4e98e5d83a25a9d57 SHA1 3935d74d2744fdeb55d15a1e840db27052e55645 SHA256 a9181c2e453680680105eb3799806eb2f5a54094568c1998f843651a34ce82fc
-MD5 69d0114b2cdbf042c20325071bf6db38 files/fuse-2.6.0_rc3-no-mknod.patch 476
-RMD160 c21064b080b70fb3757638b4e98e5d83a25a9d57 files/fuse-2.6.0_rc3-no-mknod.patch 476
-SHA256 a9181c2e453680680105eb3799806eb2f5a54094568c1998f843651a34ce82fc files/fuse-2.6.0_rc3-no-mknod.patch 476
-AUX fuse-2.6.20.patch 1443 RMD160 06847bb8d4442d88132237dc21924bf8c4f79bf2 SHA1 71e410ef0b8e02254c3e7d9ec875009327b65c08 SHA256 41c931e893fcb21a266581f72161c6ec747e41572ba750926105e324ae815a17
-MD5 29d96bad0ea391dc858beecfae58bee9 files/fuse-2.6.20.patch 1443
-RMD160 06847bb8d4442d88132237dc21924bf8c4f79bf2 files/fuse-2.6.20.patch 1443
-SHA256 41c931e893fcb21a266581f72161c6ec747e41572ba750926105e324ae815a17 files/fuse-2.6.20.patch 1443
 AUX fuse-fbsd.init 467 RMD160 ac8ce54b189b3433cede1c8360b63d38a4203e67 SHA1 8f0f10dac4653a82677f31a079a3b006cc8e122d SHA256 d896a80d67668246f586c6283f95f624fdbecb306408bec6f2c944601aae7273
 MD5 377334eb85baa4cefe0cb821d994907d files/fuse-fbsd.init 467
 RMD160 ac8ce54b189b3433cede1c8360b63d38a4203e67 files/fuse-fbsd.init 467
@@ -18,27 +10,27 @@ AUX fuse.init 873 RMD160 e51e06604bc4b651dcffa7705115fba68583487c SHA1 b7805c67f
 MD5 2c93a7311f2921c2e0b24e80a5c2b5a2 files/fuse.init 873
 RMD160 e51e06604bc4b651dcffa7705115fba68583487c files/fuse.init 873
 SHA256 e20653bc2e6fa30f59e8abf4166f7c267740c178bdba9ddad0ba2196a13ab7aa files/fuse.init 873
-DIST fuse-2.6.1.tar.gz 472606 RMD160 99624de23edb634b5e92c86fb75fa266aeff5a65 SHA1 85ec4458d0ab2647b6b43605f0200006d89981ed SHA256 e5d039f1adcb5fcc16f5f3eb1c7d95918b62ace79f75d327c72707cafdd8be7c
 DIST fuse-2.6.3.tar.gz 473147 RMD160 df05bc42cb4c97f9e54048662f64a8cac5713f18 SHA1 d6ecda7341008ac157f55cf901309dda10f58faf SHA256 804d7fae424c97dc3790ad12d798e7b27dc6c12e4116f8bd69ca0130773d3f9d
-EBUILD fuse-2.6.1.ebuild 2073 RMD160 a03f1450290a0b2bdd048b4ab2d44e6ecd4f2545 SHA1 2bbf07ff745cafd672f36a29794fd2d50383c09c SHA256 4e901d2056a7603a7e3efd0ba1fc407400fab79ef223d460c848822efa4c4a64
-MD5 b4184c791320598430e9ea32a1526c37 fuse-2.6.1.ebuild 2073
-RMD160 a03f1450290a0b2bdd048b4ab2d44e6ecd4f2545 fuse-2.6.1.ebuild 2073
-SHA256 4e901d2056a7603a7e3efd0ba1fc407400fab79ef223d460c848822efa4c4a64 fuse-2.6.1.ebuild 2073
+DIST fuse-2.6.4.tar.gz 473689 RMD160 38d83de8930b3e8f4b3a4e29036bc1260e69ff07 SHA1 f2ec1c6fc6ed6676ada3d11e244c2480882204a1 SHA256 c1eb7a8530315fd288a2c2e7449dfe4d2b491812902b2f151f8df41cfb5bd903
 EBUILD fuse-2.6.3.ebuild 2075 RMD160 8ea5b7765f7cd2db6c13f431e65f49f6a66b7ae9 SHA1 03bb2e1c6ff7af048c8769bc09074de0f040c577 SHA256 fd6a0364ed18b1152a5d04e2dfa14110c6a2c2f9979132c6901f5f5758848ce8
 MD5 44116824b9a059bce92435bbd571cef5 fuse-2.6.3.ebuild 2075
 RMD160 8ea5b7765f7cd2db6c13f431e65f49f6a66b7ae9 fuse-2.6.3.ebuild 2075
 SHA256 fd6a0364ed18b1152a5d04e2dfa14110c6a2c2f9979132c6901f5f5758848ce8 fuse-2.6.3.ebuild 2075
-MISC ChangeLog 11843 RMD160 845bdc34f9d951a5f86e9cd54a2f2047df8a1641 SHA1 0f9659cb5e208e0a15dee08c360ff2a236e8fbe6 SHA256 e81034bd2f57ad8c11df821c92f813bcce3e87ad495e3036b174b14becb05a41
-MD5 de7be8a27a47c7a4e58a7560febe6283 ChangeLog 11843
-RMD160 845bdc34f9d951a5f86e9cd54a2f2047df8a1641 ChangeLog 11843
-SHA256 e81034bd2f57ad8c11df821c92f813bcce3e87ad495e3036b174b14becb05a41 ChangeLog 11843
+EBUILD fuse-2.6.4.ebuild 2077 RMD160 48c41f2b823799dcf6410fc03faa877f5142cd4b SHA1 68551abc0207b2414c1b08ccfb44310d83f5a7a5 SHA256 31b4ac0aeb8d3173c343c77dc135d56910faf967981d9226b930659e23fe1295
+MD5 50fbd4f3132d56d6155aa2373ea03985 fuse-2.6.4.ebuild 2077
+RMD160 48c41f2b823799dcf6410fc03faa877f5142cd4b fuse-2.6.4.ebuild 2077
+SHA256 31b4ac0aeb8d3173c343c77dc135d56910faf967981d9226b930659e23fe1295 fuse-2.6.4.ebuild 2077
+MISC ChangeLog 12044 RMD160 02ccdfda7bb30afa8165654b1b22287c443f5f7d SHA1 3fc800605f33510c0916223cf85ad06c1ba1087a SHA256 3152c0150f10a88b0db77e509d6c5e87c7200730b2e611de621a876ba278a5ff
+MD5 3375d31ff3633a5b90e2f7fc3079ab8a ChangeLog 12044
+RMD160 02ccdfda7bb30afa8165654b1b22287c443f5f7d ChangeLog 12044
+SHA256 3152c0150f10a88b0db77e509d6c5e87c7200730b2e611de621a876ba278a5ff ChangeLog 12044
 MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b metadata.xml 264
-MD5 81328cc7f4476f5108b84616640dd357 files/digest-fuse-2.6.1 232
-RMD160 40711bf2a0395378d5535039106d313bf0025a56 files/digest-fuse-2.6.1 232
-SHA256 e1bc84008f8176c0769fa99e8de7fc61bf291dab8173f792f9bcecb9bfd6fe4b files/digest-fuse-2.6.1 232
 MD5 c7231e8a36c319190b7eb75b83f1ef40 files/digest-fuse-2.6.3 232
 RMD160 c797934218623ae564318739ac3a3782e8885713 files/digest-fuse-2.6.3 232
 SHA256 c8581faf6e90c4c6a181d6de1c8ead042654269af6313984fa00886db15cf9ed files/digest-fuse-2.6.3 232
+MD5 99824676751c75115bc8a1a24a6b2886 files/digest-fuse-2.6.4 232
+RMD160 90e78ac98ee1cbdc18a90a9378e366b1e337b8be files/digest-fuse-2.6.4 232
+SHA256 9f95ae0cfc9de856b53278c8bf253f6fbe6714189554e45b4551980fb24e6b39 files/digest-fuse-2.6.4 232

diff --git a/sys-fs/fuse/files/digest-fuse-2.6.1 b/sys-fs/fuse/files/digest-fuse-2.6.1
deleted file mode 100644 (file)
index 1ef700c..0000000
--- a/sys-fs/fuse/files/digest-fuse-2.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13e1873086a1d7a95f470bbc7428c528 fuse-2.6.1.tar.gz 472606
-RMD160 99624de23edb634b5e92c86fb75fa266aeff5a65 fuse-2.6.1.tar.gz 472606
-SHA256 e5d039f1adcb5fcc16f5f3eb1c7d95918b62ace79f75d327c72707cafdd8be7c fuse-2.6.1.tar.gz 472606

diff --git a/sys-fs/fuse/files/digest-fuse-2.6.4 b/sys-fs/fuse/files/digest-fuse-2.6.4
new file mode 100644 (file)
index 0000000..e65bf85
--- /dev/null
+++ b/sys-fs/fuse/files/digest-fuse-2.6.4
@@ -0,0 +1,3 @@
+MD5 d21f9f01a2d9dabd2cf4a0299affb94d fuse-2.6.4.tar.gz 473689
+RMD160 38d83de8930b3e8f4b3a4e29036bc1260e69ff07 fuse-2.6.4.tar.gz 473689
+SHA256 c1eb7a8530315fd288a2c2e7449dfe4d2b491812902b2f151f8df41cfb5bd903 fuse-2.6.4.tar.gz 473689

diff --git a/sys-fs/fuse/files/fuse-2.6.0_rc3-no-mknod.patch b/sys-fs/fuse/files/fuse-2.6.0_rc3-no-mknod.patch
deleted file mode 100644 (file)
index 0f06d38..0000000
--- a/sys-fs/fuse/files/fuse-2.6.0_rc3-no-mknod.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-let udev handle this
-
-http://bugs.gentoo.org/152032
-
---- util/Makefile.in
-+++ util/Makefile.in
-@@ -490,11 +490,6 @@
- install-exec-hook:
-       -chown root $(DESTDIR)$(bindir)/fusermount
-       -chmod u+s $(DESTDIR)$(bindir)/fusermount
--      @if test ! -e $(DESTDIR)/dev/fuse; then \
--              $(mkdir_p) $(DESTDIR)/dev; \
--              echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229"; \
--              mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229; \
--      fi
- 
- install-exec-local:
-       $(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH)

diff --git a/sys-fs/fuse/files/fuse-2.6.20.patch b/sys-fs/fuse/files/fuse-2.6.20.patch
deleted file mode 100644 (file)
index 66b7df4..0000000
--- a/sys-fs/fuse/files/fuse-2.6.20.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naud fuse-2.6.1/work/fuse-2.6.1/kernel/dev.c fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/dev.c
---- fuse-2.6.1/work/fuse-2.6.1/kernel/dev.c    2006-11-19 17:02:34.000000000 +0100
-+++ fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/dev.c      2006-12-30 18:52:07.000000000 +0100
-@@ -43,7 +43,7 @@
- 
- struct fuse_req *fuse_request_alloc(void)
- {
--      struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, SLAB_KERNEL);
-+      struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, GFP_KERNEL);
-       if (req)
-               fuse_request_init(req);
-       return req;
-diff -Naud fuse-2.6.1/work/fuse-2.6.1/kernel/file.c fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/file.c
---- fuse-2.6.1/work/fuse-2.6.1/kernel/file.c   2006-10-20 19:33:56.000000000 +0200
-+++ fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/file.c     2006-12-30 19:00:13.000000000 +0100
-@@ -501,7 +501,6 @@
-               spin_unlock(&fc->lock);
- 
-               if (offset == 0 && to == PAGE_CACHE_SIZE) {
--                      clear_page_dirty(page);
-                       SetPageUptodate(page);
-               }
-       }
-diff -Naud fuse-2.6.1/work/fuse-2.6.1/kernel/inode.c fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/inode.c
---- fuse-2.6.1/work/fuse-2.6.1/kernel/inode.c  2006-11-28 15:04:45.000000000 +0100
-+++ fuse-2.6.1-fixed/work/fuse-2.6.1/kernel/inode.c    2006-12-30 18:52:26.000000000 +0100
-@@ -52,7 +52,7 @@
-       struct inode *inode;
-       struct fuse_inode *fi;
- 
--      inode = kmem_cache_alloc(fuse_inode_cachep, SLAB_KERNEL);
-+      inode = kmem_cache_alloc(fuse_inode_cachep, GFP_KERNEL);
-       if (!inode)
-               return NULL;
- 

diff --git a/sys-fs/fuse/fuse-2.6.1.ebuild b/sys-fs/fuse/fuse-2.6.4.ebuild
similarity index 85%
rename from sys-fs/fuse/fuse-2.6.1.ebuild
rename to sys-fs/fuse/fuse-2.6.4.ebuild
index 12c7a0f3efdd9626cae692f89951f8be3f371f4c..7709d5e0779b05a2b19ee51f2801d39d89a2d062 100644 (file)
--- a/sys-fs/fuse/fuse-2.6.1.ebuild
+++ b/sys-fs/fuse/fuse-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.1.ebuild,v 1.11 2007/03/09 14:58:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.4.ebuild,v 1.1 2007/04/27 22:55:51 genstef Exp $
 
 inherit linux-mod eutils libtool
 
@@ -9,7 +9,7 @@ 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 ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kernel_linux kernel_FreeBSD"
 S=${WORKDIR}/${MY_P}
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
@@ -26,7 +26,7 @@ pkg_setup() {
                        older version from viewcvs"
 
                BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR}
-                                         fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs"
+                                       fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs"
                BUILD_TARGETS="all"
                ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}"
        fi
@@ -36,7 +36,6 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch
-       epatch "${FILESDIR}"/fuse-2.6.20.patch
        elibtoolize
 }
 
@@ -65,13 +64,13 @@ src_install() {
 
        if use kernel_linux ; then
                linux-mod_src_install
+               newinitd ${FILESDIR}/fuse.init fuse
        else
                insinto /usr/include/fuse
                doins include/fuse_kernel.h
+               newinitd ${FILESDIR}/fuse-fbsd.init fuse
        fi
 
-       newinitd ${FILESDIR}/fuse.init fuse
-
        rm -rf "${D}/dev"
 }