Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 117 insertions, 4 deletions

diff --git a/sys-fs/zfs-fuse/ChangeLog b/sys-fs/zfs-fuse/ChangeLog
index b30fef2dbfad..81bb3f3b4abf 100644
--- a/sys-fs/zfs-fuse/ChangeLog
+++ b/sys-fs/zfs-fuse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/zfs-fuse
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/ChangeLog,v 1.10 2010/06/05 22:21:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/ChangeLog,v 1.11 2010/06/05 23:46:32 ssuominen Exp $
+
+*zfs-fuse-0.6.9 (05 Jun 2010)
+
+  05 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +zfs-fuse-0.6.9.ebuild, +files/zfs-fuse.rc:
+  Version bump.
 
   05 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> zfs-fuse-0.5.0.ebuild,
   -zfs-fuse-9999.ebuild:
diff --git a/sys-fs/zfs-fuse/Manifest b/sys-fs/zfs-fuse/Manifest
index c57a7a66e489..b3bd5744c7ac 100644
--- a/sys-fs/zfs-fuse/Manifest
+++ b/sys-fs/zfs-fuse/Manifest
@@ -2,7 +2,10 @@ AUX 0.5.0/fix_zdb_path.patch 483 RMD160 e212d2a3b69e75a3fe7ee8085763d681b9058270
 AUX 0.5.0/fix_zfs-fuse_path.patch 378 RMD160 9f1f1692e5fbbc6ea29c7a5d7284bc75593bc3a4 SHA1 f49abfca781065a21259cae422bcf7149e169040 SHA256 42df1294e8801330f848261024d29b2e8f51b860527629a010b00b1ea89f7dd4
 AUX 0.5.0/fix_ztest_path.patch 458 RMD160 085918e132c4103b3ac2c4208d4d915b8b423622 SHA1 9fb7685ed350b8aac86484d51d6bb8ccf8473a92 SHA256 d6b69995ea21ef2f556ff330f0bf25734445341b8f2b6f51ae68ce19e22ec9c8
 AUX 0.5.0/zfs-fuse.rc 915 RMD160 6d8f05590e6e4fd9bdb11ac4ca2937729816f2c2 SHA1 42fa42f93acd3c713a0098e0d9bce04cec966e88 SHA256 a5ce5642ba7da82245ed9d9c388d11833fa1d4d27b8b0cf1e529c0a3cbb78107
+AUX zfs-fuse.rc 927 RMD160 607417c2ab2df54ffba78f2c9aace382a7655251 SHA1 24f24be57d071978e0afc1d34506ff2e5c465c55 SHA256 35120742c553d9d90ecfca69f2dec1e8dc8d8361f7407c023d923a5b050e8abb
 DIST zfs-fuse-0.5.0.tar.bz2 875791 RMD160 9990c5800a7deff487381d01f90fb58619ea0b19 SHA1 28d7e58f53b1424b9279b7068f3cee9fda0a13f6 SHA256 d4e082f05005b8bd9167e7f61a6753bf219666dd6dcac581b6dadb01db7594f1
-EBUILD zfs-fuse-0.5.0.ebuild 2758 RMD160 06933d14bd0022de6210e0d7a5cfb26155f86eb1 SHA1 9caa6ed50224a5743f3a791c94e594b3092e43c3 SHA256 8c78a8d4431f826ae5a98e5679262dd2eb2c6a9d6bd540efd884ecba7e667040
-MISC ChangeLog 1911 RMD160 1d3f1fcb795120ac104c88e2c3ccc82680bfb671 SHA1 9061be0cd1daf24a8cdafce577b94e1e7a56266c SHA256 fa40ed081c50724968cf2c3ec3742027b418a6611af01f45845db02c127b2c86
+DIST zfs-fuse-0.6.9.tar.bz2 1383989 RMD160 3c2eaabd2b487478e4e9934150ee0f5f6d8610da SHA1 b7fe465f6165a777894bb9988ee02ea5c74ccdd3 SHA256 07a0fa52446552b12796e43c442768a2aaa72b25fbeba2dedc2bcfcdb8a1e8fe
+EBUILD zfs-fuse-0.5.0.ebuild 2775 RMD160 c1ce55aa277e2c922c7f5f4a0f00cdd67e556761 SHA1 864c0e5a81844371eadc0a1d8db35d90ba3274f6 SHA256 422ad0a06761600d1c74bf1988575ac44156081869eb3fa915fdcb59761fec59
+EBUILD zfs-fuse-0.6.9.ebuild 1201 RMD160 476e8c5c6b34e1ec567665027e90ef6b50788284 SHA1 9eba44489ba7017ec371e8f4d00fc8a2d4ff6a09 SHA256 833ef880ab64435033c96faa4d2c947cb964b64b39457fbb5698ce8aa45fa62a
+MISC ChangeLog 2059 RMD160 c2dd86885d7abe8f6f5cfb07897715a9f19eebca SHA1 25bb6d82082315be30f56336172da32158275ba6 SHA256 44df43514b78f151290a7dea9c683e4ea1edabc39439c3605d43b8d6d7606233
 MISC metadata.xml 220 RMD160 ba793b36fde5acec86d8150ceddf4f3cfb5c2ae9 SHA1 6eb5af4c500c3736062744a87af40484a47e6951 SHA256 9375701257b18e240ba4baf120f7ee473798d867728c9c3fdc50b3b305df7ded
diff --git a/sys-fs/zfs-fuse/files/zfs-fuse.rc b/sys-fs/zfs-fuse/files/zfs-fuse.rc
new file mode 100644
index 000000000000..415ea99fc429
--- /dev/null
+++ b/sys-fs/zfs-fuse/files/zfs-fuse.rc
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/zfs-fuse.rc,v 1.3 2010/06/05 23:46:32 ssuominen Exp $
+
+depend() {
+	before net
+	need fuse
+}
+
+PIDFILE="/var/run/zfs/zfs-fuse.pid"
+EXEFILE="/usr/sbin/zfs-fuse"
+
+checksystem() {
+	return 0 # TODO
+}
+
+start() {
+	ebegin "Starting ZFS-FUSE"
+	checksystem || return 1
+	start-stop-daemon --start --exec ${EXEFILE} \
+        	--user daemon --group disk -- --pidfile ${PIDFILE}
+	rv=$?
+	eend $rv
+
+	if [[ $rv -eq 0 ]]; then
+		ebegin "Mounting ZFS filesystems"
+		zfs mount -a
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Unmounting ZFS filesystems"
+	sync
+	sleep 1
+	zfs umount -f -a
+	eend $?
+	sync
+
+	ebegin "Stopping ZFS-FUSE"
+	checksystem || return 2
+	start-stop-daemon --stop --pidfile ${PIDFILE} \
+		--exec ${EXEFILE} --retry TERM/1/TERM/2/TERM/4/TERM/8/KILL
+	eend $?
+}
diff --git a/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild b/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild
index 968861a00873..094c3ceb2758 100644
--- a/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild
+++ b/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild,v 1.3 2010/06/05 22:21:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild,v 1.4 2010/06/05 23:46:32 ssuominen Exp $
 
 IUSE="doc debug"
 
@@ -73,6 +73,8 @@ src_install() {
 	if use doc; then
 		dodoc {INSTALL,TODO,STATUS,TESTING,HACKING,BUGS} || die
 	fi
+
+	dodir /etc/zfs
 }
 
 pkg_postinst() {
diff --git a/sys-fs/zfs-fuse/zfs-fuse-0.6.9.ebuild b/sys-fs/zfs-fuse/zfs-fuse-0.6.9.ebuild
new file mode 100644
index 000000000000..b28f73671f22
--- /dev/null
+++ b/sys-fs/zfs-fuse/zfs-fuse-0.6.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-0.6.9.ebuild,v 1.1 2010/06/05 23:46:32 ssuominen Exp $
+
+EAPI=2
+
+DESCRIPTION="An implementation of the ZFS filesystem for FUSE/Linux"
+HOMEPAGE="http://zfs-fuse.net/"
+SRC_URI="http://zfs-fuse.net/releases/${PV}/source-tar-ball -> ${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="sys-fs/fuse
+	sys-libs/zlib
+	dev-libs/libaio
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	dev-util/scons"
+
+S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	sed -i \
+		-e '/LINKFLAGS/s:-s::' \
+		-e '/CCFLAGS/s:-s -O2::' \
+		SConstruct || die
+
+	sed -i \
+		-e 's:../zdb/zdb:/usr/sbin/zdb:' \
+		cmd/ztest/ztest.c || die
+}
+
+src_compile() {
+	local _debug=0
+	use debug && _debug=2
+
+	scons debug=${_debug} || die
+}
+
+src_install() {
+	scons \
+		install_dir="${D}/usr/sbin" \
+		man_dir="${D}/usr/share/man/man8" \
+		cfg_dir="${D}/etc/zfs" \
+		install || die
+
+	dodir /etc/zfs
+	keepdir /var/{lock,run}/zfs
+	fowners daemon.disk /var/{lock,run}/zfs
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+
+	dodoc ../{BUGS,CHANGES,HACKING,README*,STATUS,TESTING,TODO}
+}