Bump sys-fs/zfs to 0.6.0_rc14

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

3 files changed, 131 insertions, 2 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index cfc8278e2a1e..9ea73edd2ee2 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.57 2013/01/23 14:20:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.58 2013/02/02 16:44:40 ryao Exp $
+
+*zfs-0.6.0_rc14 (02 Feb 2013)
+
+  02 Feb 2013; Richard Yao <ryao@gentoo.org> +zfs-0.6.0_rc14.ebuild:
+  Bump sys-fs/zfs to 0.6.0_rc14
 
   23 Jan 2013; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc13-r1.ebuild,
   zfs-9999.ebuild:
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 451cded2f6ba..e03a425d17ca 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,10 +3,12 @@ DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9
 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
 DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535afefafde4aef0f112f8c833a09 SHA512 c9bbf1fb7f293a0f5b1247e17c411073994bf419d5f6c1b781efeeb4022f62851e8ea3cf7ee0330b0609bfe13b8084c48f00e942ce52323d706733cccf49699e WHIRLPOOL 97083a6f5d66addc9bc7b3cc3f7dd3bc1696980affbd4033d71cd09ecad413ffb666a8a185dfa2e4f20dd4003746ad61d12142f7a6556db5b34008716c933798
+DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d
 EBUILD zfs-0.6.0_rc10-r3.ebuild 2467 SHA256 d7f870e42e5176a46f881879ef6e125ce3ded2d388fcd35acdbfbf12ecb19c3a SHA512 5969552979dee690aab05e2d938b7f0966c7b296c06dcdccb4c694cacda3aa263bdb440e11e050dcd6bc1c915235ae64f3681d8ba14bc4e99c3880d7b43fbcac WHIRLPOOL de0286ce2e2b3667fb2677fa018119995d484f521dd8762a14a3d24749c13cc2886c0d889dc57a6ba72695e2b500d9f7fdc05215d66ce337612ad428ee3c6f9e
 EBUILD zfs-0.6.0_rc11-r2.ebuild 2467 SHA256 7056cd5086c08bb7fd7b2b1b573ae1e5535ba4f37564ff43dfdee8c2b533a8c2 SHA512 5474b8d3ff1d9a8116a4659e0739f46f16d71cfb90ccd04507471a00223c42940ea7f44084b8d318488862ae5f86e2d07cbfe74665b0bd720593593a4492097d WHIRLPOOL 3d42751fb60873ec2b78023c85e296dc6beaea5c231586d59f9315a600bf17815893df10a7f1fd6a1e0bd902cb2b83b0b2b4beddf8f0c3d3fc7e7fa7eceecfee
 EBUILD zfs-0.6.0_rc12-r2.ebuild 2467 SHA256 9c93b75f2cf728c527a21db81e6b4dd9a6c1e9fc7a74f33f8a599423aaffb6e6 SHA512 394b109689887030331b4a6a729be9a6f8265cfebb247a48e072ff211e8022d255127f251ca33522f7679c2aa0a84b635f1bf8ebda680c5e4158fb9746e503a1 WHIRLPOOL 138b65decb7a8f4f6fd420ab8477d37b473ea4a7be15256c93fb0003147fa35c2a722847eba867ca8a9efbd171574b690e6370f446b8dc570e4478736af90ab1
 EBUILD zfs-0.6.0_rc13-r1.ebuild 2796 SHA256 a920b0a307abab65ee7143a0fa8cff8651a0893c1729d4dba19b4c5062d07895 SHA512 64116e2ec6515a8e4c6dcc53ff1e32b6f269249b02639afb380cd511d63f91aa0d30dbd2d2d70a27e7129433355d7705c8e9c3d4b7676c0940a44643135a27ad WHIRLPOOL 666f153409fa24faae8943925c14c7b0be5c2ecea9978ebcad6f654aa38bdec95a1deea45721c8eea370989850b946395370c29ab7fec38e4d23b029af3d49f1
+EBUILD zfs-0.6.0_rc14.ebuild 2793 SHA256 035c443d9ec4d798559731a5a0775f2996f26a581c15ed38829f2b8a81ed4e43 SHA512 64e050d03e48e30fca5850dfb735efdc061339a250b2e0a4e3eac56e7b0a17bd02fc0d68fc0b6927b15f30c6cf7be8aa9025aeee0674650b13ca74014545b6de WHIRLPOOL c238931f25a84fc1456a33db3b7e953b63dce66ba7602168f23359185cdd978676fbeefc621968c5cd6cd248318686a90c9a1ef8b158e7179a19048bd7c14293
 EBUILD zfs-9999.ebuild 2788 SHA256 a1fbf89caa474fd54206f4b14e8c1524235021bc9c54ede0861007b1a8a3f775 SHA512 5cc56ceb5d86c0145fcef5275842df7d26a7483f717731d51d94fef4497173dce49b54de16141c0da8d9cc01b69b64041022650402e1079622639154a6755a22 WHIRLPOOL 2ebd1e1c3514ef6ab5fa623149279662f9bf0d2092c45f829da752d819cb11fa94281714bda11b3f9d22103f96d174d90cc56122f5a4ceec1fc0785876b8a31e
-MISC ChangeLog 10883 SHA256 5c6c4ce5522d83c6cf2845020c2c3d4a0f5f2c961697e0e69e422b5ba0092df7 SHA512 d637ec6a008ebac6d3fa0e7f0bfcfb994064681c80d8de53521be369ca535c1b22e3b5e6107051af83c5423c93a638eb51420f6e0d4c450fef42bd03790503f4 WHIRLPOOL 2b1fba46025f89edac6dfe7277aeedecd6e2f00a169b66ac64a37dbb9c333956a2a53e77eab94d44b906de00a903e99e768e074fab08f82b1bc2b9664a7accbe
+MISC ChangeLog 11016 SHA256 fc94f9087b8b72712c61bbcd7e3a93b2cfe8458135dfc8027f0318d2aea96b97 SHA512 202e27b6a630e13e25074422c7cd82da5fde87b4a73fd7dece5f2d199fbf2cccc3bb208ff04eb624febd7ab2b76a504237be3ec4f21a77bcad07a4155c16b848 WHIRLPOOL cf60473585870f3022c7e2d2d270269d6b4c5d21146cb0067bb43671bb36f672313e7651f075b08c299ff1cbfe4e976727c74e6b0a129de9ac0bc99ac8646f44
 MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a
diff --git a/sys-fs/zfs/zfs-0.6.0_rc14.ebuild b/sys-fs/zfs/zfs-0.6.0_rc14.ebuild
new file mode 100644
index 000000000000..d312ed63d1f4
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.0_rc14.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2013 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_rc14.ebuild,v 1.1 2013/02/02 16:44:40 ryao Exp $
+
+EAPI="4"
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-2 linux-mod
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	inherit eutils versionator
+	MY_PV=$(replace_version_separator 3 '-')
+	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev
+
+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? ( virtual/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
+		)
+"
+
+pkg_setup() {
+	:
+}
+
+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="$(udev_get_udevdir)"
+	)
+	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"
+
+	newbashcomp "${FILESDIR}/bash-completion" zfs
+
+}
+
+pkg_postinst() {
+
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
+		|| ewarn 'You should add zfs to the boot runlevel.'
+
+	if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		remove_moduledb
+	fi
+}