version bump, bug 216572

Package-Manager: portage-2.1.4.4

6 files changed, 12 insertions, 231 deletions

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index 9ccd34eec726..948da167e579 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.112 2008/03/23 21:46:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.113 2008/04/29 07:07:12 genstef Exp $
+
+*fuse-2.7.3 (29 Apr 2008)
+
+  29 Apr 2008; Stefan Schweizer <genstef@gentoo.org>
+  -files/fuse-2.6.22.patch, -fuse-2.6.4-r1.ebuild, -fuse-2.7.1.ebuild,
+  -fuse-2.7.2.ebuild, +fuse-2.7.3.ebuild:
+  version bump, bug 216572
 
   23 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> fuse-2.6.4-r1.ebuild,
   fuse-2.7.0.ebuild, fuse-2.7.1.ebuild, fuse-2.7.2.ebuild:
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index d00bf8e00381..8db677ec2da8 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,14 +1,9 @@
-AUX fuse-2.6.22.patch 1467 RMD160 7cffb02d2e7742e7db4da52eebebe359ae97826b SHA1 263156a40cc3d9ee5961b1cbcf99f021cbbba277 SHA256 e39d6833f850201a26c1350e76fdb95f71b374f7e9a728002eec794b1e5df03d
 AUX fuse-fbsd.init 467 RMD160 ac8ce54b189b3433cede1c8360b63d38a4203e67 SHA1 8f0f10dac4653a82677f31a079a3b006cc8e122d SHA256 d896a80d67668246f586c6283f95f624fdbecb306408bec6f2c944601aae7273
 AUX fuse-fix-lazy-binding.patch 398 RMD160 e8663cdbf720378839bf3ac786a49a9927b81afe SHA1 59a923f6263e954a7db488021005448cefcc8f5a SHA256 d9733aaece65a0c864edbfebae205cdec096174165e943a569adb216ec73f9e1
 AUX fuse.init 756 RMD160 0950f906866311b19c0712f88911e83f6481b5f7 SHA1 96551a5d9ebf21560adafeb2b65c339fa8cfe898 SHA256 22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda
-DIST fuse-2.6.4.tar.gz 473689 RMD160 38d83de8930b3e8f4b3a4e29036bc1260e69ff07 SHA1 f2ec1c6fc6ed6676ada3d11e244c2480882204a1 SHA256 c1eb7a8530315fd288a2c2e7449dfe4d2b491812902b2f151f8df41cfb5bd903
 DIST fuse-2.7.0.tar.gz 502261 RMD160 b2a84bc0a72b931d7bfeabf3e79dce7f25f6fb38 SHA1 985db21b2ebebf3f0813c5f2f30f2d8af8c33ef6 SHA256 a26117fb74b3bf6a3c6867611c46c53b75d6749198933486ec8a778ac315f855
-DIST fuse-2.7.1.tar.gz 506312 RMD160 2d0fcc475590f7c2d2d62261c370f7fa6eadb51a SHA1 ea28a61ff63cd0cf12cd7c9c092a57d79c12edf8 SHA256 e4639f9e08f0b8cc9f4a0bb8cbe47da06fa57cb310b2c5a82221e0a9ba969e9a
-DIST fuse-2.7.2.tar.gz 505855 RMD160 bb07e9720131043fe2f5d68869d3aace124e2169 SHA1 cd0feca90dd0605e1af05e8afec3f98381823394 SHA256 fb390948aa27628e4fb48aa6658a20ad8c1ee304fe76bb60ac29b81c63d3baff
-EBUILD fuse-2.6.4-r1.ebuild 2367 RMD160 d03b9343a455309466a74fbf2ccbf502e95e19bb SHA1 953e988aa57a3fb98b8f77993abeceb4beb7a278 SHA256 ff36d24a3a3d3b0e7a8d8084b7c3e9c9f4c94b0057df5a8610b4110dc960906a
+DIST fuse-2.7.3.tar.gz 506362 RMD160 0f7969445d21409b97b5ff5aa77d204dd79aae46 SHA1 631722f5cf7213a398834927dadafa2c746bd14c SHA256 62c2bcbbb116d19451e9546753c835cf07bc1a79843ac92ee665426a8a3e97ba
 EBUILD fuse-2.7.0.ebuild 2285 RMD160 2f947d97e2d15ad2aa0b58913778b7159324ed19 SHA1 51fb1892d5fc0d4a02b9d5ae13bbd62132d98d87 SHA256 78ceedff2e46d6723cd3017f839bb81cd2142aeb8da8f25ed4902bd1b0ee847f
-EBUILD fuse-2.7.1.ebuild 2289 RMD160 900d02c58bd8fa7b15656a14deebb5c6bfd85f8c SHA1 2febdaff8a84ff4d1fa9cc75ecf53f54bc6c64df SHA256 9daf18a4bf84411d22e40b6926c14c1fb5c36c8c1361a3eed5706e5586473584
-EBUILD fuse-2.7.2.ebuild 2554 RMD160 5b6e84d5acddc5789bbf060d1645a866f835bad8 SHA1 72e19d8a0bce11020da939ad9af39519e2c77913 SHA256 ea7fc05fb5491092596a65367a583b2464fa39452b6fdb7b05d188ab2c30e55a
-MISC ChangeLog 15472 RMD160 1d5464e7b008cd7ba699ce8b25cd7a68178c7027 SHA1 ca7dced329ab253cd7b497901d8f1f92d0900762 SHA256 a4d462257bf544e87518b9a0b06c8a767a148d36bc78942d6da636f002554a64
+EBUILD fuse-2.7.3.ebuild 2554 RMD160 e613e851006317d9ded88aa697a98a5a0591c6cb SHA1 4155b82d516c6fc8c44a8698cf35d04378a2a441 SHA256 a655ff574cf758b0efbdf8ec29b07d7b10accab9b2c2217dfd6055e84681ac91
+MISC ChangeLog 15693 RMD160 18fc4c5749335e5241bc7dd4df7e2acf7e549cea SHA1 b16d803c92abb772b8046353e2d478db63de9f33 SHA256 ecc6dde1fc9f92c7a9eb011e5b154c4b8b00ed8d26c56f1afebc17d1250a4044
 MISC metadata.xml 269 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 SHA1 87192fbb5e58ab4854c26ea5fcfe535700f462be SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6
diff --git a/sys-fs/fuse/files/fuse-2.6.22.patch b/sys-fs/fuse/files/fuse-2.6.22.patch
deleted file mode 100644
index c1af56511e3b..000000000000
--- a/sys-fs/fuse/files/fuse-2.6.22.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c	2007-05-19 19:54:45.000000000 +0930
-+++ fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c	2007-05-19 19:58:40.000000000 +0930
-@@ -781,7 +781,8 @@
- 
- 	if (cmd == F_GETLK) {
- 		if (fc->no_lock) {
--#ifdef KERNEL_2_6_17_PLUS
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) && \
-+		LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
- 			if (!posix_test_lock(file, fl, fl))
- 				fl->fl_type = F_UNLCK;
- #else
---- fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c	2007-05-20 09:13:34.000000000 +0930
-+++ fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c	2007-05-20 09:18:33.000000000 +0930
-@@ -809,9 +809,13 @@
- {
- 	struct inode * inode = foo;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
-+	inode_init_once(inode);
-+#else
- 	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
- 	    SLAB_CTOR_CONSTRUCTOR)
- 		inode_init_once(inode);
-+#endif
- }
- 
- static int __init fuse_fs_init(void)
-@@ -860,12 +864,20 @@
- 	if (err)
- 		return err;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
-+	kobj_set_kset_s(&fuse_subsys, fs_subsys);
-+#else
- 	kset_set_kset_s(&fuse_subsys, fs_subsys);
-+#endif
- 	err = subsystem_register(&fuse_subsys);
- 	if (err)
- 		goto out_err;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
-+	kobj_set_kset_s(&connections_subsys, fuse_subsys);
-+#else
- 	kset_set_kset_s(&connections_subsys, fuse_subsys);
-+#endif
- 	err = subsystem_register(&connections_subsys);
- 	if (err)
- 		goto out_fuse_unregister;
diff --git a/sys-fs/fuse/fuse-2.6.4-r1.ebuild b/sys-fs/fuse/fuse-2.6.4-r1.ebuild
deleted file mode 100644
index 914dbbe920aa..000000000000
--- a/sys-fs/fuse/fuse-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.4-r1.ebuild,v 1.12 2008/03/23 21:46:08 robbat2 Exp $
-
-inherit linux-mod eutils libtool
-
-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 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kernel_linux kernel_FreeBSD"
-S=${WORKDIR}/${MY_P}
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		if kernel_is ge 2 6 23; then
-			CONFIG_CHECK="FUSE_FS"
-			FUSE_FS_ERROR="You need to build the FUSE module from the kernel source, because your kernel is too new"
-		else
-			MODULE_NAMES="fuse(fs:${S}/kernel)"
-			CONFIG_CHECK="@FUSE_FS:fuse"
-			FUSE_FS_ERROR="We have detected FUSE already built into the kernel.
-				We will continue, but we wont build the module this time."
-
-		fi
-		linux-mod_pkg_setup
-		kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an
-			older version from viewcvs"
-
-		BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} \
-					fusemoduledir=\"${ROOT}\"/lib/modules/${KV_FULL/\ }/fs"
-		BUILD_TARGETS="all"
-		ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch
-	epatch "${FILESDIR}"/fuse-2.6.22.patch
-	sed -i -e "s:die {:die() {:" util/mount.fuse
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		--disable-kernel-module \
-		--disable-example \
-		|| die "econf failed for fuse userland"
-	emake || die "emake failed"
-
-	if use kernel_linux ; then
-		cd "${S}"
-		sed -i -e 's/.*depmod.*//g' kernel/Makefile.in
-		convert_to_m kernel/Makefile.in
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog Filesystems README \
-		README.NFS NEWS doc/how-fuse-works \
-		doc/kernel.txt FAQ
-	docinto example
-	dodoc example/*
-
-	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
-
-	rm -rf "${D}/dev"
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-}
diff --git a/sys-fs/fuse/fuse-2.7.1.ebuild b/sys-fs/fuse/fuse-2.7.1.ebuild
deleted file mode 100644
index ac1c29e0ab96..000000000000
--- a/sys-fs/fuse/fuse-2.7.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.7.1.ebuild,v 1.3 2008/03/23 21:46:08 robbat2 Exp $
-
-inherit linux-mod eutils libtool
-
-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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kernel_linux kernel_FreeBSD"
-S=${WORKDIR}/${MY_P}
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		if kernel_is ge 2 6 24; then
-			CONFIG_CHECK="FUSE_FS"
-			FUSE_FS_ERROR="You need to build the FUSE module from the kernel source, because your kernel is too new"
-		else
-			MODULE_NAMES="fuse(fs:${S}/kernel)"
-			CONFIG_CHECK="@FUSE_FS:fuse"
-			FUSE_FS_ERROR="We have detected FUSE already built into the kernel.
-				We will continue, but we wont build the module this time."
-
-		fi
-		linux-mod_pkg_setup
-		kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an
-			older version from viewcvs"
-
-		BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR} \
-					fusemoduledir=\"${ROOT}\"/lib/modules/${KV_FULL/\ }/fs"
-		BUILD_TARGETS="all"
-		ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		--disable-kernel-module \
-		--disable-example \
-		|| die "econf failed for fuse userland"
-	emake || die "emake failed"
-
-	if use kernel_linux ; then
-		cd "${S}"
-		sed -i -e 's/.*depmod.*//g' kernel/Makefile.in
-		convert_to_m kernel/Makefile.in
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog Filesystems README \
-		README.NFS NEWS doc/how-fuse-works \
-		doc/kernel.txt FAQ
-	docinto example
-	dodoc example/*
-
-	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
-
-	rm -rf "${D}/dev"
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-}
diff --git a/sys-fs/fuse/fuse-2.7.2.ebuild b/sys-fs/fuse/fuse-2.7.3.ebuild
index ba36b9e4612c..1f1ef46d5cc1 100644
--- a/sys-fs/fuse/fuse-2.7.2.ebuild
+++ b/sys-fs/fuse/fuse-2.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.7.2.ebuild,v 1.3 2008/03/23 21:46:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.7.3.ebuild,v 1.1 2008/04/29 07:07:12 genstef Exp $
 
 inherit linux-mod eutils libtool