Bump sys-fs/zfs to 0.6.0_rc12

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

3 files changed, 117 insertions, 2 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 16027b210b2f..128379e10af6 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.49 2012/09/18 22:33:46 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.50 2012/11/14 21:57:19 ryao Exp $
+
+*zfs-0.6.0_rc12 (14 Nov 2012)
+
+  14 Nov 2012; Richard Yao <ryao@gentoo.org> +zfs-0.6.0_rc12.ebuild:
+  Bump sys-fs/zfs to 0.6.0_rc12
 
 *zfs-0.6.0_rc11 (18 Sep 2012)
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index beca2dbfb657..f5e31de9851f 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,8 +3,10 @@ AUX linuxrc 225 SHA256 69c5f407ae20a5e3000dc6389f8c75ee97e11c353489a00cb619134b1
 AUX zfs-shutdown 1252 SHA256 cba63ddf086044c7e041c296ea86f68a1579ac830b8bea56b9f74b4204f96553 SHA512 1c04ba8c1f533efdc2ea938ba508d1789fc6bb653e5ad84dfcd78e41f1271f05309df670b9b8246c3317c96060028266230c83b8c21b7abf71442320cd33a219 WHIRLPOOL 58a3e23d316f673bee78e9837c6aea3be6bfceab5e89a0717b0290257a7a682bef67e6ae98e6f92a0c41a1da043a6ba6eded5974bbff3ee50c39e48ea8d3c77f
 DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
 DIST zfs-0.6.0-rc11.tar.gz 2099538 SHA256 4701f9d32d3475650068d0c07b968f0de443103d73db315b4f328c296cd6a073 SHA512 4bd2fc3cd5eb89f64b7b92a16e416edb245b0a9b90b5e1aa3bd1560c7d568322de03fdb40ede2d8417b0b642bbf70a1e804d51e4537babbfa9c767271b701138 WHIRLPOOL c56034028fd7c21f516ceb268cc25eeedd129a2a7cb8c1615f43982a86bb4400e80ab74159c4fc5d24a79610e2c0935f54cbc33c447751f29cecec882bfef89e
+DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c1501f0159c80a1b1ff961b6f137d6 SHA512 55f0d9ea9f085d78a4929250949449ec4329a71c00ecd6fe76322716b64dc1152d93a23bb8b18e4ba7e1fbd6110b170366763f730c1e5006998aee3870e3635e WHIRLPOOL ea8fbe2edb2e0029affed261916d10ef350129c496b71064d34749b805d83c1531d886a55802839bb4226e298719f708f6816ee5411626b431b1d506bbf10232
 EBUILD zfs-0.6.0_rc10-r1.ebuild 2552 SHA256 d5bdec5b4ae175fa0e6d5e7a902c30b9bfcc35a971a51016ce31ac4751d5ed76 SHA512 21b8edfaa58d7ec6d060c1593b72452e053e9ea808b1a5a1f9a65febe13fc9a45039f33f6a1cd4ca40332f590f8f533d0dddf98eb59f441008afbf9d374c2773 WHIRLPOOL 427ac1455714e166972974955fa4be9b0fda4cf5215c3ed6503bdc397f1b7dddad889947abbfd257ca9c761d68537157024285a47d61a7f047f76923c556f419
 EBUILD zfs-0.6.0_rc11.ebuild 2549 SHA256 ac6015cb9e76a2edb49e2b11e28f7f374e4ee874dabee38cdc7753d2cf1c4f75 SHA512 2fd78b9092dc476aa94e34f0793227f3c63168adf64456271558e6e09126361e686d379d0f039d6026e9206bdc9e1bbfe916cf61fcb4f03e5a88d30c00defdb0 WHIRLPOOL c97783c8d10b3c67748d462cc29c7d41297c4cb505597d7dbc2a52f48d40efffb6bc0b32dd16c7c6cb9eb530513559edf4cd08408192874f537e7a7a11e87e61
+EBUILD zfs-0.6.0_rc12.ebuild 2549 SHA256 081b840a7c0a15bb50ba37fa7bfafe9a2b599ef7c3b25c1085f26f486ade77a3 SHA512 0cdfd8f86b43a33729f423025c87473a9dfbd6a250b884f19dfb92a909e2319aef03c0acb503c0f304f76339b3a569bd63e43c4bf0b2b1be087c4104113edaaa WHIRLPOOL 649b5f037a3d9f8e3b8f19d2f7991d02877aac26933125269d3ffc8a4b99fee85f26ea41784eb867bc70088b8c3d8b4f80b27c99c2abc79dd7266e76f57b9d19
 EBUILD zfs-9999.ebuild 2544 SHA256 57f43d9cd944ebcba355b59b087554f418bfeab91af7ab23a22476e9936241d6 SHA512 b53bb77e2a0af86bf09adaf789431ddaabc6b9359e9581db6848912c7ab0f84d7872140127c3b01dbf5bf60eb07ae3543ee71923a549dc415f0a593b466eeb50 WHIRLPOOL 7ea93a6d1bc8a7a3ee285825d98d07b56540545d255c124d8efe2cd1304432d716271d07bacc5947b45be4004991e688e58329b6989467e526cdb58f04bda9f7
-MISC ChangeLog 8903 SHA256 1bd0c82f6c4a63196340fe2655c871361f68324979722476326eb499b0c0d340 SHA512 89ffa8b953d264c31757e55ba55f766255de77d1310ccdeb4746c9181c0f19f2f5e1c334bd4aac468e7ad82b722795aa0d8b9711b994600d17b2e64b27e3359c WHIRLPOOL 2e90082da6c521be290472bce66db10694b736aea57cf00a29705a10e65aba46efd8c952e9f23345be84960e66f53d913f1f026759b050527256c60a5345f914
+MISC ChangeLog 9036 SHA256 55ac6e870903bf80b23de0cae8f3e947006bb53e8098f6460ddcedef856e1db6 SHA512 fe3aff2526080c76b39270208a6bbdf6fc853707d495a246a8a2196dafa39ed28d8242f6f62bd123e80b1e898487740c0d5aed0337c114ec29a3a3cf8fb62fc6 WHIRLPOOL e919119ed50facaa78d04e1d5ab6108a6808c4cf0f4a13fff4b91535316beaec187106808eba4d9594bc054b0fb42d8fdc1b6d3541381a0c5b25496918171fd6
 MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a
diff --git a/sys-fs/zfs/zfs-0.6.0_rc12.ebuild b/sys-fs/zfs/zfs-0.6.0_rc12.ebuild
new file mode 100644
index 000000000000..7095d042fb09
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.0_rc12.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12.ebuild,v 1.1 2012/11/14 21:57:19 ryao Exp $
+
+EAPI="4"
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	inherit eutils versionator
+	MY_PV=$(replace_version_separator 3 '-')
+	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!sys-fs/zfs-fuse
+	!prefix? ( sys-fs/udev )
+	test-suite? (
+		sys-apps/gawk
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		)
+"
+
+src_prepare() {
+	# Workaround for hard coded path
+	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
+	# Workaround rename
+	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs
+	rm -rf "${ED}usr/share/dracut"
+	use test-suite || rm -rf "${ED}usr/libexec"
+
+	if use rootfs
+	then
+		doinitd "${FILESDIR}/zfs-shutdown"
+		exeinto /usr/share/zfs
+		doexe "${FILESDIR}/linuxrc"
+	fi
+
+	newbashcomp "${FILESDIR}/bash-completion" zfs
+
+}
+
+pkg_postinst() {
+
+	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
+		|| ewarn 'You should add zfs to the boot runlevel.'
+
+	use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
+		|| ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
+
+}