[patch] patch to apply to current zfs-fuse-0.6.9-r1.ebuild (in portage)

diff-0.6.9-r1_to_0.7.1_beta2.patch (text/plain), 4.42 KB, created by Stefan G. Weichinger on 2011-04-07 11:15:25 UTC

--- /usr/portage/sys-fs/zfs-fuse/zfs-fuse-0.6.9-r1.ebuild	2010-08-10 12:31:00.000000000 +0200
+++ zfs-fuse-0.7.1_beta2.ebuild	2011-04-06 21:40:41.006824357 +0200
@@ -1,64 +1,118 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-0.6.9-r1.ebuild,v 1.4 2010/08/10 10:31:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/speakup-9999.ebuild,v 1.3 2009/12/03 20:43:20 williamh Exp $
 
-EAPI=2
-inherit bash-completion
+IUSE="bash-completion doc debug"
 
 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"
+HOMEPAGE="http://zfs-fuse.net"
+
+EAPI="2"
+EGIT_REPO_URI="http://rainemu.swishparty.co.uk/git/zfs"
+EGIT_BRANCH="compress"
+
+inherit git linux-mod autotools bash-completion
+
+SRC_URI=""
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=">=sys-libs/glibc-2.3.3
+		>=dev-util/scons-0.96.1
+		>=dev-libs/libaio-0.3
+		>=dev-libs/lzo-2.0.4
+		>=sys-fs/fuse-2.6.1"
 
-RDEPEND="dev-libs/libaio
-	dev-libs/openssl
-	sys-fs/fuse
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	dev-util/scons
-	sys-apps/acl
-	sys-apps/attr"
+RDEPEND=">=sys-fs/fuse-2.6.1"
 
-S=${WORKDIR}/${P}/src
+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
+
+	cd "${S}"/src
+	git checkout compress
+
+	sed -i -e '/LINKFLAGS/s:-s::' -e '/CCFLAGS/s:-s -O2::' ${S}/src/SConstruct || die "failed to sed"
+	sed -i -e 's:../zdb/zdb:/usr/sbin/zdb:' cmd/ztest/ztest.c || die "sed failed"
+	epatch "${FILESDIR}"/${PV}/${PV}_cc_cflags_ldflags.patch
+
+	cd "${S}"/src/lib/libumem
+	eautoreconf
 }
 
 src_compile() {
-	local _debug=0
-	use debug && _debug=2
-
-	scons debug=${_debug} || die
+	cd "${S}"/src
+	scons || die "Make failed"
 }
 
 src_install() {
-	scons \
-		install_dir="${D}/usr/sbin" \
-		man_dir="${D}/usr/share/man/man8" \
-		cfg_dir="${D}/etc/zfs" \
-		install || die
-
-	insinto /etc/zfs
-	doins ../contrib/zfsrc || die
-
-	keepdir /var/{lock,run}/zfs
-	fowners root.disk /var/{lock,run}/zfs
-
-	doinitd "${FILESDIR}"/${PN}
-
-	dodoc ../{BUGS,CHANGES,HACKING,README*,STATUS,TESTING,TODO}
+	cd "${S}"
+	cd src
+	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}/${P}/src" || die
+
+	dodoc CHANGES || die
+
+	if use doc; then
+		dodoc {INSTALL,TODO,STATUS,TESTING,HACKING,BUGS} || die
+	fi
+
+	if use bash-completion; then
+		dobashcompletion ./contrib/zfs_completion.bash ${PN} || die
+	fi
+}
 
-	dobashcompletion ../contrib/zfs_completion.bash ${PN}
+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://zfs-fuse.net/"
+	einfo "website at http://developer.berlios.de/projects/zfs-fuse/"
+	echo
 }