2.6.0_pre3 fix thanks to Leo <sir_kalot@yahoo.it> in bug 143544

Package-Manager: portage-2.1.1_pre5

4 files changed, 38 insertions, 11 deletions

diff --git a/sys-fs/captive/ChangeLog b/sys-fs/captive/ChangeLog
index 40da97f801d2..8488e8557215 100644
--- a/sys-fs/captive/ChangeLog
+++ b/sys-fs/captive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/captive
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.16 2006/06/01 14:50:20 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.17 2006/08/12 22:58:10 genstef Exp $
+
+  12 Aug 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/captive-fuse-2.6.0_pre3.patch, captive-1.1.7-r1.ebuild:
+  2.6.0_pre3 fix thanks to Leo <sir_kalot@yahoo.it> in bug 143544
 
   01 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
   captive-1.1.7-r1.ebuild:
diff --git a/sys-fs/captive/Manifest b/sys-fs/captive/Manifest
index 65dbf38d833e..4d8939942ee2 100644
--- a/sys-fs/captive/Manifest
+++ b/sys-fs/captive/Manifest
@@ -1,12 +1,16 @@
-DIST captive-1.1.7.tar.gz 2896597 RMD160 cd1f7f8e0faf27374cfe25713bf9aebd8e3d27b7 SHA256 5bbeb56bd42a928737ee8bf804ce2b3532607bff80b398c6e2ab1762f719ef25
-EBUILD captive-1.1.7-r1.ebuild 2339 RMD160 a6fde6d764c8062f76f63b5ba9fd2f5d5f944854 SHA1 3966e675c25d551601bce7dfa67e96125a17f29f SHA256 c7579cfb6e43f4dfb0897fcb73fdd0973429b821266423449edd453244ec4924
-MD5 d8d9d9ea2f2133fd02b7538c8819b42e captive-1.1.7-r1.ebuild 2339
-RMD160 a6fde6d764c8062f76f63b5ba9fd2f5d5f944854 captive-1.1.7-r1.ebuild 2339
-SHA256 c7579cfb6e43f4dfb0897fcb73fdd0973429b821266423449edd453244ec4924 captive-1.1.7-r1.ebuild 2339
-MISC ChangeLog 3753 RMD160 6c93e0e1789cd3b87d1ab7452b8d522579c4dd6c SHA1 d35d2230e23b444de75ff45f205bdfb3ce7c5238 SHA256 3ed5eea2c9e6c0107717e2f40a2b5b4ea074835fd009f2fcad16f65b43c03468
-MD5 aaab4d88bc9e8fdbe68777308b21eeaf ChangeLog 3753
-RMD160 6c93e0e1789cd3b87d1ab7452b8d522579c4dd6c ChangeLog 3753
-SHA256 3ed5eea2c9e6c0107717e2f40a2b5b4ea074835fd009f2fcad16f65b43c03468 ChangeLog 3753
+AUX captive-fuse-2.6.0_pre3.patch 357 RMD160 8eb16ac396d52eb2b880690238b473b0661766ef SHA1 1145b070f494b13aa91d42f569e20713fdadcc21 SHA256 ece98c449381689f3dbf1858290266623ccba46ff93800dcc4f145b20e2fb053
+MD5 9de1490a39143b9ae317e3f902583e22 files/captive-fuse-2.6.0_pre3.patch 357
+RMD160 8eb16ac396d52eb2b880690238b473b0661766ef files/captive-fuse-2.6.0_pre3.patch 357
+SHA256 ece98c449381689f3dbf1858290266623ccba46ff93800dcc4f145b20e2fb053 files/captive-fuse-2.6.0_pre3.patch 357
+DIST captive-1.1.7.tar.gz 2896597 RMD160 cd1f7f8e0faf27374cfe25713bf9aebd8e3d27b7 SHA1 510afe3d9b5da69732b05a3195a2b0c654ab8c3b SHA256 5bbeb56bd42a928737ee8bf804ce2b3532607bff80b398c6e2ab1762f719ef25
+EBUILD captive-1.1.7-r1.ebuild 2483 RMD160 8741e831343a46b8e7295ffcfa1b82773bcd5547 SHA1 d735709e5d825d5199ecb1883a151f9d7fb92321 SHA256 871cdfa138b6b4daa97a8f452e06a4feda6a02b753290905c44d15927ed07b13
+MD5 ebab99125f76bff5d5d587b34badf016 captive-1.1.7-r1.ebuild 2483
+RMD160 8741e831343a46b8e7295ffcfa1b82773bcd5547 captive-1.1.7-r1.ebuild 2483
+SHA256 871cdfa138b6b4daa97a8f452e06a4feda6a02b753290905c44d15927ed07b13 captive-1.1.7-r1.ebuild 2483
+MISC ChangeLog 3938 RMD160 b3d1d605fde370b99c17717e3698251da4263f48 SHA1 0da05fe669ccba4382d5dfcb8d024897dfa8b306 SHA256 6be9cedc5bb7b4a1fb5deb3691c62e8beede13569e0d90582eed0adf84c3916b
+MD5 2513720307bac2e326e3ab088b0d7789 ChangeLog 3938
+RMD160 b3d1d605fde370b99c17717e3698251da4263f48 ChangeLog 3938
+SHA256 6be9cedc5bb7b4a1fb5deb3691c62e8beede13569e0d90582eed0adf84c3916b ChangeLog 3938
 MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
diff --git a/sys-fs/captive/captive-1.1.7-r1.ebuild b/sys-fs/captive/captive-1.1.7-r1.ebuild
index 8102daa3b89d..9f171d9829b0 100644
--- a/sys-fs/captive/captive-1.1.7-r1.ebuild
+++ b/sys-fs/captive/captive-1.1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.7-r1.ebuild,v 1.5 2006/06/01 16:22:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.7-r1.ebuild,v 1.6 2006/08/12 22:58:10 genstef Exp $
 
 inherit eutils
 
@@ -43,6 +43,14 @@ pkg_setup() {
 	enewuser captive -1 -1 /dev/null captive || die "enewuser captive failed"
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if has_version '>=sys-fs/fuse-2.6.0_pre3'; then
+		epatch ${FILESDIR}/captive-fuse-2.6.0_pre3.patch
+	fi
+}
+
 src_compile() {
 	# Addwrite to fix all sandbox problems, bug #133357 see also gnome2.eclass: bug #128289
 	addwrite /root/.gnome2_private /root/.gnome2 /root/.gconfd /root/.gconf
diff --git a/sys-fs/captive/files/captive-fuse-2.6.0_pre3.patch b/sys-fs/captive/files/captive-fuse-2.6.0_pre3.patch
new file mode 100644
index 000000000000..a653908caf5e
--- /dev/null
+++ b/sys-fs/captive/files/captive-fuse-2.6.0_pre3.patch
@@ -0,0 +1,11 @@
+--- captive-1.1.7/src/client/fuse/main.c.orig	2006-08-12 22:54:51.000000000 +0200
++++ captive-1.1.7/src/client/fuse/main.c	2006-08-12 23:06:58.000000000 +0200
+@@ -116,7 +116,7 @@
+ 		 * FIXME: Why?
+ 		 */
+ 		}
+-	fuse_teardown(capfuse_fuse,capfuse_fd,capfuse_mountpoint);
++	fuse_teardown(capfuse_fuse,capfuse_mountpoint);
+ }
+ 
+ int main(int argc,char **argv)