Use libblkid to improve drive detection; Update drive database with additional entries

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

3 files changed, 176 insertions, 18 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index bcdeec76424b..3603a0c7916e 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.71 2013/09/05 19:44:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.72 2013/10/05 22:08:09 ryao Exp $
+
+*zfs-0.6.2-r1 (05 Oct 2013)
+
+  05 Oct 2013; Richard Yao <ryao@gentoo.org> +zfs-0.6.2-r1.ebuild:
+  Use libblkid to improve drive detection; Update drive database with additional
+  entries
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> zfs-0.6.2.ebuild,
   zfs-9999.ebuild:
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 5051efdc5c67..8644672e5091 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -16,32 +16,32 @@ DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535
 DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d
 DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b
 DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
+DIST zfs-kmod-0.6.2-p0.tar.xz 8244 SHA256 84456e1d52c6d44cc377d131ee34c042c289d00f74e7a9b521d8ef82bdfcf369 SHA512 ff29830e44aeb537d82d2c34070a245271b51013131f9191d03ab35eff2b86559c4bdadd3cf21f7aa7bec07c3556ef712db9cca2beedd1288036c29d750567e2 WHIRLPOOL 62b9a920a832f5715a24c2a0cdc914a5e77700b0e8723df868b1bf8b8a7ecec6f7df14cb294dfb4f4f219cc8253615c594b609a117b57b576e1796b8042bfdc5
 EBUILD zfs-0.6.0_rc10-r4.ebuild 2425 SHA256 43d49734f34c11cf4bb7f52ed60238f472a9d44f8571ecf5da5e3d0de866cbe3 SHA512 922b9e5a920da0cee6a3f02d55cfa2462f9f7d9d7783930075c642bebe981d3cbeaa7d510bff8867afdc63c9c089e598828688317c3d603f5580dc802c543a77 WHIRLPOOL f7451202156bef5884c7cf25e61bade72f4c1213e7aa95d1b455257bf421ca4e07a8130d4a9dad409def546f4c422ffd370d7b442a2561f2a60e7ad7d5c05894
 EBUILD zfs-0.6.0_rc11-r3.ebuild 2425 SHA256 91c81e66eb4cb7362810bc748d1cb05b2d515e6cf670fd9547761997bba71064 SHA512 1708af9529f0a7cc72c2d4f27ff7176d14842a5d7b5761ed9176fada6816a6f2d686c5997708f41a5ad634237aa5ecb68374045ad869848127a1ad0cdf2db93d WHIRLPOOL 86ef757aa5aac1d24eeb38d16eb87f5a4e34db02bdb3df74f5e884126fc90be2b4bb36c5cb5954908afa45d1d53d6c4857aed2c04e14f378c962586d458eb8f0
 EBUILD zfs-0.6.0_rc12-r3.ebuild 2425 SHA256 7ae28e9025453f623fdfddccbaba6d4f56448da1837df30fd4102babe853ae3c SHA512 d33c48ab59528413ffdba58aaaed0022d19a33cd402731c32ddf89ec043fb1552d57cc5a74d2c4efdc9bc2aa25140846c3ee1c80cf3b9d9f098cb54816d0e3ae WHIRLPOOL 59634e47aa9824b1397ea374433309928a71074d1cc7b415ff1fd125696cc8404e15e1f59091ec74acdab749a2a48b86cd0c3ff053dc70a12c6998b21c789eff
 EBUILD zfs-0.6.0_rc13-r2.ebuild 2767 SHA256 a01f304e92fd0fdb0c2d61d2924948a8184a31d6ff300d0b95cf10fdde20c4b7 SHA512 0c5280577004b38eab50beaa86d621e06eac648e7b5f9ba0af7e3522c9ea1ea9e12cb0ab4cf0a918c59bf919c9596ea23716be639a86a6bbc4ce3151d3cef744 WHIRLPOOL af66f26c293b926e52f729ef11fd5ac218c8a6ef78a73525a945fc843f9de2735ac65032a9a0c1a7b35f6d5bd083751c52e3301949212c2e284f67ef1afa33b7
 EBUILD zfs-0.6.0_rc14-r1.ebuild 2898 SHA256 94eec2441edd8094dad6bb73a576198fcb5c3221de9e4cff13193f86906897a3 SHA512 e948a46ab4560754896044411fb51b1188e601dca4cd9de56022b72ee6d8c942329813e71a9dadb9c9665d203c5d8dd04c1f9071472950eaead78898ed5826f1 WHIRLPOOL 84080714d51b18a663812115c16eb734f71ab2f02d5138a30dcc660a361caa198021ae46b744c35edd8b78edfcc3f9a2b5ece8fdf68b2ac26dae199eb76028a3
 EBUILD zfs-0.6.1-r4.ebuild 3733 SHA256 26dfaf61978ca7a74adf0cd5de815b348bf3a39fb553745bccdacbe0049af86a SHA512 6eba565e81c829c0c062f6b43795c3f937a012d794f164171b9f5a86a12d77f4c11bc8a0152a8151dd59175e584416e9cc02bb0b7b451e6864312d01cc324a4f WHIRLPOOL 5ae5fc47488e9724f4517c6e17508844ed13680491682aa301a4f944bae9bb95d870191ff5b751049193a5ca46939709b302a68d95cf8661d5bc4c305cf6cd14
+EBUILD zfs-0.6.2-r1.ebuild 3631 SHA256 953fb42a9707da13a2d0c6c066a46668b347add1b6f45c90048fcd1855944064 SHA512 02d7cd8451aff7cc9cc6b4b8bda8837787bebaac0c5f84b15e18de781d16a30fbc8ff16936d8d0c91fda1eaf00fa36608156b356502497a1d03268f62f6fc687 WHIRLPOOL f3fbd8db18bc1b3cce6769836e3258f3b248d98c1210c6fd503d0f37f537439ff2d8fa17b4094d19c7f049ef19810057e4ae8b85e0668644af829701840f514c
 EBUILD zfs-0.6.2.ebuild 3392 SHA256 18fcdc47bdbefdbc086b6fd6db8ca48d21560b1fa9ef0c1c3e5e64fc70802832 SHA512 a6405759c13611573dc04efa373bf9c1d33804dcb0977a598b0da775616b741e64d5ad25ab31a857117058b453ed7f3f617c92d27510506e323aeacfb9c64c75 WHIRLPOOL c19a40880679bda65244bfacc96ee3153b05903917d1f6dcfbb1d0bbc93e16a2307c37fbb4585b3d758fd187d0a5d419fbc9974d2198e1e476bc314e2e4b8cc3
 EBUILD zfs-9999.ebuild 3392 SHA256 c8d0aee5aedca86f24077bf8869edaef04df822a32406656ee651e8e43a02967 SHA512 2184d7aa13f6684b81132edcc7e02ed184d18782a031b16363d1edf25208b92487213ee0b26ccf31e217dafb0bec1511f09a4330ebf3938ef66284d6da89b144 WHIRLPOOL fe2a27898f2f06a9264bbac2712cb3bcaf63c10b126fb0d36ccb79cf17519297b360ee3da2b1b64b11d2410dd2e5959beb439be2811a1c2f802e431794e11e20
-MISC ChangeLog 14025 SHA256 560801d41040a5c39af962ccc8ef0c53bb0aa107ca990068db8fdb457e6e23b3 SHA512 55a387bc16c058b45cf101a55899b99cb2274cf780ab7ef520dee7d581f23e7b87119364da392dfbf9ef1c6feae4ba665393fbad39a0f17468c8e601d84a53a3 WHIRLPOOL 1d83b90734d6c20c5cbbba92398b767ab878b988cc3283c7a9c134b02d1147c18d932dcf7de03e882899c3cd169de450879c47098cda8439794a97fa2b2d8877
+MISC ChangeLog 14211 SHA256 6e53f85cd6b08fbd0f4bf473e26b37d5f0fed39d15ba87d4b8f5ee871f7c1168 SHA512 f368f21beb4d39b4f72fa6ac16c0d9310cc126baf69e5bd08136e6b6f15b639871da9a67e49be5110165bbe84a4b08ab73a0f558703539368d813b53eb4b6364 WHIRLPOOL 3b37330c36cacd52b9fecbb6d732af8f068cc498e5fe1054eabb7141c0a2e308efb4f2b62913aaf56bceed5768376776c13d190ce74947915d17cb73fce27b6d
 MISC metadata.xml 546 SHA256 980db453ce3112b91daa26f61bbc8eec61d12d0998d0bf76a1308aecad499c42 SHA512 33e25501a30e8cb8e890c1dbf98f5d5264a7958f7d710d37d4ee36efbb318d0db23533fefd51ca419cdc6f72416c1d0cc4fd3b1e68a157dca14890d54f411df6 WHIRLPOOL c96639028769b95ba23db8e8e20d71f5894b1ecebd6d3e62effc610d48e2c55797fa3536dea6e654185f288dd8edb6a2a063829598703f0f0ca61aa02f995314
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKN+DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIDgP/1H99ks0jf14GFlPuON/RZcP
-PatXYwpvYEQbY4BRTlN5inQd2+78xlSnDjD07A8r+Mi/780lgyTsIRXsD+KgNNI2
-ddxu2bt9f1PCS4buNAVErCtirodP/Y4jWtAUCKCQCPsw4bxkod3Js0YapgTs+ODe
-eKqipweKQx7YzlzU3IucAI9ybGyaXMtl3hgnVbrK9E6o1QvcpeWdZbTKG/OF/Z8Q
-hVcCCwZuzO23cmENaWPSkZasLgbXN48y1ep+if9XPKKykEYwdU5K5IVJNXXvnENj
-VatgjPMSs1+U9Ce9j7JOWDFjbi5rxGLNoCLC/GFTHbPxX6vHexe+AuFUlnTGn/2a
-H1jgbgt+1BjHqxlpIcnhwp+bGx3ktyS4cq/IgFx24DwN9gjYqEJh1v9TAW81ZBHD
-UE4Jpl1WzP63kO/qZZ+pM9VqMidbF4akdw+HS4FLJiPqBT2GeGwyw7Sm9seRqzOh
-OcZs8Czx+cyLI9eGV4qoueMdrgMVJEd0+9fFEif2xT/A+K9Y2iC9QdYgqxEOHpRq
-YyS+D6u5J0Ck3xfEypmO9A+7ZuGByjm2rnh96dd6S1v8dt3gLKlWKjm1eBjk/zsD
-NUpITCQEXezSMjs2i51Yq1cqKDXTkEOL1Uxr7jA8JttzzbymsBNnPKCFJAstUOPX
-x3mz0xLWfsNZ77Fy1lIX
-=cRog
+iQIcBAEBCAAGBQJSUI2iAAoJECDuEZm+6ExkrpwP/iPjJsJaKIE3fO5m0SDLpB49
+vTozRLEsTyYSFXbUHKMCYdnMHolMp2KcOjj3t8gxWb1J8nT1Dh3HusEvZmIHldty
+CGr0764iKKrwm/Il7vmysCH45yALtsg569AN+w9NsBvU+zSNwSrsX/y2dm5ss+bt
+byrtJy+vSZ58QNqfdQPwIwVlRwLs72NBA/FAKMjWkA9yveWVsKIvhDFaXySPrpLu
+Fe8qHLvsYKWV7USqmlI0dSUKqxTmnEQ5rBLH+O9KlfnDBFaVsUcahBr/19b2FMUk
+PBj9+kL4yxkCJZSaxY6ylQByhI6omyxZC2cBfyFPRKHIQozNGPfKKQwsF3u9nbsB
+CaiWZ4QozdIm7e41rd9p2jGY8x5FNSFEQDf5iK93oeELNP2JCAu4vbBBAc38y8iC
+h82hqyhP2RViM6Hn4Wf73+DQcrhItSmX36WgiSOgYpe0qkUCUYbV5UJH8r14jt8a
+oyifYjA5FaO+vRURkjO+7bEUuGvYfVUV0yM6Mut6czuOF8tBLHJMMsnqke5xnsg4
+UnPZW7BGPAnysriFJPhZDu6hkTfPRzvfk3bO8p96IKFS4l1T4Jxz7RUW51SSpz6A
+JwmBYCe1PdrNWocfMykar9YdFWUsErNoOkIQ8dKI9u4r6re1QreYjspaV5dM6GgQ
+4pyrQxgRxuN5MZu6kQqY
+=+i/Z
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-0.6.2-r1.ebuild b/sys-fs/zfs/zfs-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..39ae1d5a9c7f
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.2-r1.ebuild
@@ -0,0 +1,152 @@
+# 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.2-r1.ebuild,v 1.1 2013/10/05 22:08:09 ryao Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-single-r1
+
+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
+		http://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p0.tar.xz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	selinux? ( sys-libs/libselinux )
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+"
+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/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
+		!<sys-boot/grub-2.00-r2:2
+		)
+"
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	if [ ${PV} != "9999" ]
+	then
+		# Apply patch set
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches"
+	fi
+
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in
+
+	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)"
+		--with-blkid
+		$(use_with selinux)
+	)
+	autotools-utils_src_configure
+
+	# prepare systemd unit and helper script
+	cat "${FILESDIR}/zfs.service.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs.service" || die
+	cat "${FILESDIR}/zfs-init.sh.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs
+	rm -rf "${ED}usr/lib/dracut"
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	use bash-completion && newbashcomp "${FILESDIR}/bash-completion" zfs
+
+	exeinto /usr/libexec
+	doexe "${T}/zfs-init.sh"
+	systemd_dounit "${T}/zfs.service"
+}
+
+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
+}