From 3ca252bf36bd2419a9a5bd96e44569fc101bb687 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 5 Jun 2010 22:21:17 +0000 Subject: [PATCH] =?utf8?q?Remove=20-Werror=20from=20SConstruct=20wrt=20#26?= =?utf8?q?0941=20by=20Diego=20E.=20Petten=C3=B2.=20Remove=20unmaintained?= =?utf8?q?=20mercurial=20ebuild=20wrt=20#284369.=20Package-Manager:=20port?= =?utf8?q?age-2.2=5Frc67/cvs/Linux=20x86=5F64?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- sys-fs/zfs-fuse/ChangeLog | 9 +- sys-fs/zfs-fuse/Manifest | 15 +-- sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch | 11 --- .../files/9999/fix_zfs-fuse_path.patch | 13 --- .../zfs-fuse/files/9999/fix_ztest_path.patch | 9 -- sys-fs/zfs-fuse/files/9999/zfs-fuse.rc | 43 -------- .../zfs-fuse-0.4.0_beta1-fix_zdb_path.patch | 11 --- ...s-fuse-0.4.0_beta1-fix_zfs-fuse_path.patch | 13 --- .../zfs-fuse-0.4.0_beta1-fix_ztest_path.patch | 9 -- sys-fs/zfs-fuse/files/zfs-fuse.rc-r1 | 39 -------- .../zfs-fuse/zfs-fuse-0.4.0_beta1-r2.ebuild | 93 ----------------- sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild | 8 +- sys-fs/zfs-fuse/zfs-fuse-9999.ebuild | 99 ------------------- 13 files changed, 14 insertions(+), 358 deletions(-) delete mode 100644 sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch delete mode 100644 sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch delete mode 100644 sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch delete mode 100644 sys-fs/zfs-fuse/files/9999/zfs-fuse.rc delete mode 100644 sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_zdb_path.patch delete mode 100644 sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_zfs-fuse_path.patch delete mode 100644 sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_ztest_path.patch delete mode 100644 sys-fs/zfs-fuse/files/zfs-fuse.rc-r1 delete mode 100644 sys-fs/zfs-fuse/zfs-fuse-0.4.0_beta1-r2.ebuild delete mode 100644 sys-fs/zfs-fuse/zfs-fuse-9999.ebuild diff --git a/sys-fs/zfs-fuse/ChangeLog b/sys-fs/zfs-fuse/ChangeLog index b4ee8bb2ed9e..b30fef2dbfad 100644 --- a/sys-fs/zfs-fuse/ChangeLog +++ b/sys-fs/zfs-fuse/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/zfs-fuse -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/ChangeLog,v 1.9 2009/11/14 14:06:40 scarabeus Exp $ +# 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 $ + + 05 Jun 2010; Samuli Suominen zfs-fuse-0.5.0.ebuild, + -zfs-fuse-9999.ebuild: + Remove -Werror from SConstruct wrt #260941 by Diego E. Pettenò. Remove + unmaintained mercurial ebuild wrt #284369. 14 Nov 2009; Tomáš Chvátal zfs-fuse-9999.ebuild: QA: Drop keywords from live ebuild. diff --git a/sys-fs/zfs-fuse/Manifest b/sys-fs/zfs-fuse/Manifest index 31af912574f1..c57a7a66e489 100644 --- a/sys-fs/zfs-fuse/Manifest +++ b/sys-fs/zfs-fuse/Manifest @@ -2,18 +2,7 @@ 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 9999/fix_zdb_path.patch 483 RMD160 e212d2a3b69e75a3fe7ee8085763d681b9058270 SHA1 1e78f4f8b4286626642d8393d3f75d0689f47f50 SHA256 d4cef9ffd277c699360a7f8a1b25503a89d661ecc8285f80ca1e8cc30172ee84 -AUX 9999/fix_zfs-fuse_path.patch 378 RMD160 9f1f1692e5fbbc6ea29c7a5d7284bc75593bc3a4 SHA1 f49abfca781065a21259cae422bcf7149e169040 SHA256 42df1294e8801330f848261024d29b2e8f51b860527629a010b00b1ea89f7dd4 -AUX 9999/fix_ztest_path.patch 458 RMD160 085918e132c4103b3ac2c4208d4d915b8b423622 SHA1 9fb7685ed350b8aac86484d51d6bb8ccf8473a92 SHA256 d6b69995ea21ef2f556ff330f0bf25734445341b8f2b6f51ae68ce19e22ec9c8 -AUX 9999/zfs-fuse.rc 914 RMD160 de00ff4921ba8eb11621d2375745caa45715e01c SHA1 c99d218eae02384298e2ad93439b30d57cc4e276 SHA256 8481af9b8faa800c8582a0776e65f0b9492341a7ab80a9f57873532fdb2f5f38 -AUX zfs-fuse-0.4.0_beta1-fix_zdb_path.patch 510 RMD160 7a20f11836d11dc131a1e5227c8b8e66cdfa8f2d SHA1 39645ff69b525d1b177bd890d58730f23c5774fa SHA256 9764181601d95d58d857d99754d28bdaa919bd46ad4e8381d72a3c96414d967d -AUX zfs-fuse-0.4.0_beta1-fix_zfs-fuse_path.patch 366 RMD160 c9a877d85a9baf48cd46ca6e48bd88ef693275f6 SHA1 27d1589c18b28dfc53c4d2297248e6389413fb57 SHA256 f9917fffcbfb75cda3adcb51d08779fa6e59ad174007fd5069b65d2976935917 -AUX zfs-fuse-0.4.0_beta1-fix_ztest_path.patch 458 RMD160 085918e132c4103b3ac2c4208d4d915b8b423622 SHA1 9fb7685ed350b8aac86484d51d6bb8ccf8473a92 SHA256 d6b69995ea21ef2f556ff330f0bf25734445341b8f2b6f51ae68ce19e22ec9c8 -AUX zfs-fuse.rc-r1 861 RMD160 899115bdacc991c1828e8827519e04fe8b62429b SHA1 0158221ddbdfc6b2ddc487e42be3d982c7b37f8c SHA256 cf835c4232997385e645af8447a70c784df9587ea6a656c9ee79e5dfe7bc7252 -DIST zfs-fuse-0.4.0_beta1.tar.bz2 606593 RMD160 93c4aea550f3b55d39c2657f90e863abf89b5f79 SHA1 8df16da89f541bccb06f60d620def2783c3ee9c9 SHA256 0904b7a031ad0b8ae591d3aefa9a62b83d973392c6a8f8426d17d9b37d9974bb DIST zfs-fuse-0.5.0.tar.bz2 875791 RMD160 9990c5800a7deff487381d01f90fb58619ea0b19 SHA1 28d7e58f53b1424b9279b7068f3cee9fda0a13f6 SHA256 d4e082f05005b8bd9167e7f61a6753bf219666dd6dcac581b6dadb01db7594f1 -EBUILD zfs-fuse-0.4.0_beta1-r2.ebuild 2487 RMD160 5a431138933213e45dfa8e93ee77877f7df204c7 SHA1 80d12ec5e7ce99d641ffcf2351c5f392fef9fbbf SHA256 cbf4130e75520b5ee892f49f93bbb960a7b1e39f801982fd300301c30268ea79 -EBUILD zfs-fuse-0.5.0.ebuild 2718 RMD160 48ca57eef40e438a1b514c36227bb6c968b61ae6 SHA1 0e7a6a64897e437014eb38f7c2be299c5f103527 SHA256 b44df6d7056299f6ecbbc6c558e5b6d8d143425f386ac6f741aa8dd024cda50e -EBUILD zfs-fuse-9999.ebuild 2632 RMD160 00978903b5625c223202c37783d66bb7b8dda1b6 SHA1 2aca8c19c31c31474f0f3e3ea815db9271f05e9b SHA256 c44831b4a5f31c389d29d5423da922fc2a4057a5a267b9ab0f145c2a9e115d1a -MISC ChangeLog 1688 RMD160 4b6ad80020942c8322da24bf6f89c8e0227bddff SHA1 3b88d281dd4b000425022266db857af21eae2f56 SHA256 79dc4ebc23492aa84e5a2cae3bfde9ae5cd16a379f48ecfc4f94d45f5d949ec2 +EBUILD zfs-fuse-0.5.0.ebuild 2758 RMD160 06933d14bd0022de6210e0d7a5cfb26155f86eb1 SHA1 9caa6ed50224a5743f3a791c94e594b3092e43c3 SHA256 8c78a8d4431f826ae5a98e5679262dd2eb2c6a9d6bd540efd884ecba7e667040 +MISC ChangeLog 1911 RMD160 1d3f1fcb795120ac104c88e2c3ccc82680bfb671 SHA1 9061be0cd1daf24a8cdafce577b94e1e7a56266c SHA256 fa40ed081c50724968cf2c3ec3742027b418a6611af01f45845db02c127b2c86 MISC metadata.xml 220 RMD160 ba793b36fde5acec86d8150ceddf4f3cfb5c2ae9 SHA1 6eb5af4c500c3736062744a87af40484a47e6951 SHA256 9375701257b18e240ba4baf120f7ee473798d867728c9c3fdc50b3b305df7ded diff --git a/sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch b/sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch deleted file mode 100644 index 770c1ae9dcf3..000000000000 --- a/sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/cmd/ztest/ztest.c 2008-06-24 13:52:22.000000000 -0400 -+++ b/src/cmd/ztest/ztest.c 2008-06-24 14:59:06.000000000 -0400 -@@ -2844,7 +2844,7 @@ - /* zfs-fuse: ztest is never installed, so zdb should be in ../zdb/ */ - /* LINTED */ - (void) sprintf(zdb, -- "../zdb/zdb -bc%s%s -U /tmp/zpool.cache -O %s %s", -+ "/usr/sbin/zdb -bc%s%s -U -O %s %s", - zopt_verbose >= 3 ? "s" : "", - zopt_verbose >= 4 ? "v" : "", - ztest_random(2) == 0 ? "pre" : "post", pool); diff --git a/sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch b/sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch deleted file mode 100644 index 3b5d656f5744..000000000000 --- a/sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/zfs-fuse/run.sh 2007-01-09 11:07:35.000000000 +0000 -+++ b/src/zfs-fuse/run.sh 2007-01-09 11:45:05.000000000 +0000 -@@ -1,5 +1,7 @@ - #!/bin/sh -- -+echo "" -+echo "On Gentoo ZFS-FUSE runs in debugging mode by default." -+echo "To run ZFS-FUSE without debugging please run /usr/bin/run-zfs-fuse" - ulimit -c unlimited -- --./zfs-fuse --no-daemon -+echo "" -+/usr/bin/run-zfs-fuse diff --git a/sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch b/sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch deleted file mode 100644 index d87979d4391c..000000000000 --- a/sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/cmd/ztest/runtest.sh 2007-01-09 11:07:35.000000000 +0000 -+++ b/src/cmd/ztest/runtest.sh 2007-01-09 11:08:51.000000000 +0000 -@@ -3,5 +3,5 @@ ulimit -c unlimited - echo "Start date: `date`" - #ZFS_DEBUG=on /usr/bin/time -v nice -n 20 ./ztest -V -T 86400 &> log.txt - #/usr/bin/time -v nice -n 20 ./ztest -V -T 86400 --nice -n 20 ./ztest -V $* && echo Test successful -+nice -n 20 /usr/sbin/run-ztest -V $* && echo Test successful - echo "End date: `date`" diff --git a/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc b/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc deleted file mode 100644 index f2ae98c7e4bd..000000000000 --- a/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc,v 1.2 2008/09/25 16:29:02 trapni Exp $ - -depend() { - need localmount - before net -} - -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" - zfs umount -f -a - eend $? - - 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/files/zfs-fuse-0.4.0_beta1-fix_zdb_path.patch b/sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_zdb_path.patch deleted file mode 100644 index ac1f94d89598..000000000000 --- a/sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_zdb_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/cmd/ztest/ztest.c 2007-01-08 17:17:51.000000000 +0000 -+++ b/src/cmd/ztest/ztest.c 2007-01-09 10:39:43.000000000 +0000 -@@ -2758,7 +2758,7 @@ ztest_verify_blocks(char *pool) - - /* LINTED */ - /* zfs-fuse: ztest is never installed, so zdb should be in ../zdb/ */ -- (void) sprintf(zdb, "../zdb/zdb -bc%s%s -U -O %s %s", -+ (void) sprintf(zdb, "/usr/sbin/zdb -bc%s%s -U -O %s %s", - zopt_verbose >= 3 ? "s" : "", - zopt_verbose >= 4 ? "v" : "", - ztest_random(2) == 0 ? "pre" : "post", pool); diff --git a/sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_zfs-fuse_path.patch b/sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_zfs-fuse_path.patch deleted file mode 100644 index 3947e7c31199..000000000000 --- a/sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_zfs-fuse_path.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/zfs-fuse/run.sh 2007-01-09 11:07:35.000000000 +0000 -+++ b/src/zfs-fuse/run.sh 2007-01-09 11:45:05.000000000 +0000 -@@ -1,5 +1,7 @@ - #!/bin/sh -- -+echo "" -+echo "On Gentoo ZFS-FUSE runs in debugging mode by default." -+echo "To run ZFS-FUSE without debugging please run /usr/bin/run-zfs-fuse" - ulimit -c unlimited -- --./zfs-fuse -+echo "" -+/usr/bin/run-zfs-fuse diff --git a/sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_ztest_path.patch b/sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_ztest_path.patch deleted file mode 100644 index d87979d4391c..000000000000 --- a/sys-fs/zfs-fuse/files/zfs-fuse-0.4.0_beta1-fix_ztest_path.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/cmd/ztest/runtest.sh 2007-01-09 11:07:35.000000000 +0000 -+++ b/src/cmd/ztest/runtest.sh 2007-01-09 11:08:51.000000000 +0000 -@@ -3,5 +3,5 @@ ulimit -c unlimited - echo "Start date: `date`" - #ZFS_DEBUG=on /usr/bin/time -v nice -n 20 ./ztest -V -T 86400 &> log.txt - #/usr/bin/time -v nice -n 20 ./ztest -V -T 86400 --nice -n 20 ./ztest -V $* && echo Test successful -+nice -n 20 /usr/sbin/run-ztest -V $* && echo Test successful - echo "End date: `date`" diff --git a/sys-fs/zfs-fuse/files/zfs-fuse.rc-r1 b/sys-fs/zfs-fuse/files/zfs-fuse.rc-r1 deleted file mode 100644 index c5b2f2170f6c..000000000000 --- a/sys-fs/zfs-fuse/files/zfs-fuse.rc-r1 +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 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-r1,v 1.1 2007/12/25 17:40:18 trapni Exp $ - -depend() { - need localmount - before net -} - -PIDFILE="/var/run/zfs-fuse.pid" -EXEFILE="/usr/sbin/zfs-fuse" - -checksystem() { - return 0 # TODO -} - -start() { - ebegin "Starting ZFS-FUSE" - checksystem || return 1 - start-stop-daemon --start --background --make-pidfile --pidfile ${PIDFILE} \ - --exec ${EXEFILE} --user daemon --group disk - rv=$? - eend $rv - - if [[ $rv -eq 0 ]]; then - ebegin "Mounting ZFS filesystems" - zfs mount -a - eend $? - fi -} - -stop() { - 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.4.0_beta1-r2.ebuild b/sys-fs/zfs-fuse/zfs-fuse-0.4.0_beta1-r2.ebuild deleted file mode 100644 index 91f925b6d14a..000000000000 --- a/sys-fs/zfs-fuse/zfs-fuse-0.4.0_beta1-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2007 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.4.0_beta1-r2.ebuild,v 1.1 2007/12/25 17:40:17 trapni Exp $ - -IUSE="doc debug" - -inherit eutils - -DESCRIPTION="An implementation of the ZFS filesystem for FUSE/Linux" -HOMEPAGE="http://www.wizy.org/wiki/ZFS_on_FUSE" -SRC_URI="http://download.berlios.de/zfs-fuse/zfs-fuse-${PV}.tar.bz2" - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="~x86 ~amd64" - -DEPEND=">=sys-libs/glibc-2.3.3 - >=dev-util/scons-0.96.1 - >=sys-fs/fuse-2.6.1" - -RDEPEND=">=sys-fs/fuse-2.6.1" - -S=${WORKDIR}/${P}/src - -src_unpack() { - unpack "${A}" - cd "${S}" - - epatch "${FILESDIR}/${P}-fix_zdb_path.patch" - epatch "${FILESDIR}/${P}-fix_zfs-fuse_path.patch" - epatch "${FILESDIR}/${P}-fix_ztest_path.patch" -} - -src_compile() { - scons || die "Make failed" -} - -src_install() { - if useq debug; then - mv cmd/ztest/ztest cmd/ztest/run-ztest || die - mv cmd/ztest/runtest.sh cmd/ztest/ztest || die - dosbin cmd/ztest/run-ztest || die - fi - dosbin cmd/ztest/ztest || die - - if useq debug; then - mv zfs-fuse/zfs-fuse zfs-fuse/run-zfs-fuse || die - mv zfs-fuse/run.sh zfs-fuse/zfs-fuse || die - dobin zfs-fuse/run-zfs-fuse || die - fi - dosbin "zfs-fuse/zfs-fuse" || die - - dosbin "cmd/zfs/zfs" || die - dosbin "cmd/zpool/zpool" || die - dosbin "cmd/zdb/zdb" || die - - newinitd "${FILESDIR}/zfs-fuse.rc-r1" "zfs-fuse" || die - - cd "${WORKDIR}/${P}" || die - - dodoc CHANGES || die - - if use doc; then - dodoc {INSTALL,TODO,STATUS,TESTING,HACKING,BUGS} || die - fi -} - -pkg_postinst() { - echo - einfo "To debug and play with ZFS-FUSE make sure you have a recent 2.6.xx" - einfo "series kernel with the FUSE module compiled in OR built as a" - einfo "kernel module." - einfo - einfo "You can start the ZFS-FUSE daemon by running" - einfo - einfo " /etc/init.d/zfs-fuse start" - einfo - einfo "as root from the command line. " - einfo - einfo "And don't forget to add it permanently, if you want to:" - einfo - einfo " rc-update add zfs-fuse boot" - einfo - einfo "For additional ZFS related commands I recommend the ZFS admin" - einfo "guide. http://opensolaris.org/os/community/zfs/docs/zfsadmin.pdf" - einfo - einfo "Don't forget this is an beta-quality release. Testing has been" - einfo "very limited so please make sure you backup any important data." - einfo - einfo "If you have any problems with zfs-fuse please visit the ZFS-FUSE." - einfo "website at http://developer.berlios.de/projects/zfs-fuse/" - echo -} 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 10fa5fa8ba8f..968861a00873 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-2008 Gentoo Foundation +# 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.2 2008/10/04 03:54:34 trapni Exp $ +# $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 $ IUSE="doc debug" @@ -25,12 +25,14 @@ RDEPEND=">=sys-fs/fuse-2.6.1" S="${WORKDIR}/${P}/src" src_unpack() { - unpack ${A} || die + unpack ${A} cd "${S}" epatch "${FILESDIR}/${PV}/fix_zdb_path.patch" epatch "${FILESDIR}/${PV}/fix_zfs-fuse_path.patch" epatch "${FILESDIR}/${PV}/fix_ztest_path.patch" + + sed -i -e 's:-Werror::' SConstruct || die } src_compile() { diff --git a/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild b/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild deleted file mode 100644 index 38d646926b4a..000000000000 --- a/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild,v 1.3 2009/11/14 14:06:40 scarabeus Exp $ - -IUSE="doc debug" - -inherit eutils mercurial - -DESCRIPTION="An implementation of the ZFS filesystem for FUSE/Linux" -HOMEPAGE="http://www.wizy.org/wiki/ZFS_on_FUSE" - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="" - -DEPEND=">=sys-libs/glibc-2.3.3 - >=dev-util/scons-0.96.1 - >=dev-libs/libaio-0.3 - >=sys-fs/fuse-2.6.1" - -RDEPEND=">=sys-fs/fuse-2.6.1" - -S=${WORKDIR}/trunk/src - -src_unpack() { - mercurial_fetch http://www.wizy.org/mercurial/zfs-fuse/trunk - cd "${S}" - - epatch "${FILESDIR}/${PV}/fix_zdb_path.patch" - epatch "${FILESDIR}/${PV}/fix_zfs-fuse_path.patch" - epatch "${FILESDIR}/${PV}/fix_ztest_path.patch" -} - -src_compile() { - scons || die "Make failed" -} - -src_install() { - if useq debug; then - mv cmd/ztest/ztest cmd/ztest/run-ztest || die - mv cmd/ztest/runtest.sh cmd/ztest/ztest || die - dosbin cmd/ztest/run-ztest || die - fi - dosbin cmd/ztest/ztest || die - - if useq debug; then - mv zfs-fuse/zfs-fuse zfs-fuse/run-zfs-fuse || die - mv zfs-fuse/run.sh zfs-fuse/zfs-fuse || die - dobin zfs-fuse/run-zfs-fuse || die - fi - dosbin "zfs-fuse/zfs-fuse" || die - - dosbin "cmd/zfs/zfs" || die - dosbin "cmd/zpool/zpool" || die - dosbin "cmd/zdb/zdb" || die - - newinitd "${FILESDIR}/${PV}/${PN}.rc" "zfs-fuse" || die - - keepdir /var/lock/zfs || die - fowners daemon.disk /var/lock/zfs || die - - keepdir /var/run/zfs || die - fowners daemon.disk /var/run/zfs || die - - cd "${WORKDIR}/trunk" || die - - dodoc CHANGES || die - - if use doc; then - dodoc {INSTALL,TODO,STATUS,TESTING,HACKING,BUGS} || die - fi -} - -pkg_postinst() { - echo - einfo "To debug and play with ZFS-FUSE make sure you have a recent 2.6.xx" - einfo "series kernel with the FUSE module compiled in OR built as a" - einfo "kernel module." - einfo - einfo "You can start the ZFS-FUSE daemon by running" - einfo - einfo " /etc/init.d/zfs-fuse start" - einfo - einfo "as root from the command line. " - einfo - einfo "And don't forget to add it permanently, if you want to:" - einfo - einfo " rc-update add zfs-fuse boot" - einfo - einfo "For additional ZFS related commands I recommend the ZFS admin" - einfo "guide. http://opensolaris.org/os/community/zfs/docs/zfsadmin.pdf" - einfo - einfo "Don't forget this is an beta-quality release. Testing has been" - einfo "very limited so please make sure you backup any important data." - einfo - einfo "If you have any problems with zfs-fuse please visit the ZFS-FUSE." - einfo "website at http://developer.berlios.de/projects/zfs-fuse/" - echo -} -- 2.26.2