gentoo resync : 10.10.2017

2 files changed, 203 insertions, 0 deletions

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 7f56c7386dbb..5bb17931a6ad 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -33,6 +33,7 @@ DIST zfs-0.6.5.8.tar.gz 2521921 SHA256 d77f43f7dc38381773e2c34531954c52f3de80361
 DIST zfs-0.6.5.9.tar.gz 2610650 SHA256 b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f SHA512 6e175f32421cf0f9e13429f12f0fac0564dc7059ab076831d0ebc4f6a17412160ca3526ebdf894bc7666e82580355b08701dd01c411d3177f82e7330b4529a37 WHIRLPOOL 149d730a26363b50691363b314669756d218c4a16e6d06e319c2b0866c5f8ed6e2da2396a516297c127d3343d51d78072d8b7371e3f4d327d30fa43c90be5cd3
 DIST zfs-0.7.0.tar.gz 6714094 SHA256 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2 SHA512 6e6cbf54399fc85b74b76a6ceb3f30e94903f755fe6386fccc56b5e6d307a907759e4b62acec5d32e8383ef1083423eaff8dee2b0ef01a99459171a42b47d217 WHIRLPOOL 74687be4220bab51f18fdd3c047400c4261acf16f38086c2485f5cb9d79af87f5adfafced92860b021814aece7446cb18e9ca310a363b90c6bac39343b72a4b6
 DIST zfs-0.7.1.tar.gz 6376234 SHA256 231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6 SHA512 64b0a3b5eeaf09ce824e3e029880a8e5dcb3e4567d1fb2fa24c89d8e55fee1ebe2d2f3a9f77d5468cc5637074e27d5ba7696b566829c93fd69c610b288200a37 WHIRLPOOL 700c83aadca96578ae8d6a9795f91c0c25b69afcc6ec6c02141daafcbcd550ae413438e96c4821c5c90816e0e29366ecfc3e7289623f14c255722c37d9f9a7f6
+DIST zfs-0.7.2.tar.gz 6389699 SHA256 f75f4d8bbb8241e3d06321b53914e53fa22d1ccc8be89819b578b46e5d3e5cf4 SHA512 fd10350b3ba5906b8d4968cee4f9febcc475b49e7d5499209566f7cfa39f29c4c2c1a4bae0698ce98244fa66657e7956a8c170de1e5f13b1bc05d2861d2c7722 WHIRLPOOL b1e270bddf9d34a6d60a9f3d80f767d6a19a7c2ae5b51d3fe83fb28432e267d494cd5b4f003b6049a074e8bf65fa9179793dec0b40f366cea493f7993dd3d19d
 DIST zfs-kmod-0.6.2-p4.tar.xz 63984 SHA256 9167edc4be86e3fcda6b3c198e51f92ab0c95ac5baca11666c28029a628cdac9 SHA512 13e4ec415c35d2f268d89565745f5898c0943423577a2ba6714b3a069c5a80f244cd06dff91464f38dd4ed60673d1145ead080bb03a56d4be33e328f948ffa64 WHIRLPOOL 8c399ec67119ed4fbebb5599d00f888918678bc4e4ea369b4bdc5c75bfc90fc76396087624c8011de370a54ff103bccaa8922d05ac7ccebb2b3481bbbcf44b19
 EBUILD zfs-0.6.0_rc13-r2.ebuild 2670 SHA256 75422b6fc4e7965f79d3f216111b4f5eee128978b2a1928b27c621a8e92c8973 SHA512 f2ad5697ae9c1f36a14952ed105153079323e911695089cf3c0ff8f0cc370598a69610d45d6edd3a95f3ff13cb855e96e9140d8e8f14561b7e34c6d64afaeee7 WHIRLPOOL 310fd967842bf67da3d8bbc05aa15b83bf180c8ef6eba39ea8a3ccb1f0679972874291dcd7d6bf7b51e2c02e544bd91bfd6c050965d962e7c6d698f87914aa20
 EBUILD zfs-0.6.0_rc14-r1.ebuild 2801 SHA256 6b344e1c08e713ee786002026c5f6cbee1bdf62f93d698e63787e7c55275db30 SHA512 c0cb816ead51e183bcd2ec7cb4469c6df5b5e68fa7e9ac707ea4863f10631cc096a14a755dc2824b4e4ea42a1ca9a7c506adde7044ed8bea1113118a077b46ba WHIRLPOOL 42c5c48c6f5a766284e4421ba221f60e229938dba0b2fc2223317561eee5ce7c20655a96c12b629294da44604b46a26f88d02e4dfe062994bdb238a7668fbdb6
@@ -58,6 +59,7 @@ EBUILD zfs-0.6.5.8.ebuild 5540 SHA256 bf3ee2e989a8bde4f44454bc682acf93ecb3b70026
 EBUILD zfs-0.6.5.9.ebuild 5534 SHA256 3d7b1890b009d8216c51623b7c0ad6ca46fa40bbfe9af537634c673d265b26e3 SHA512 641338ba22fa87e8725b89b508b3f5e1ae492a4e715eaaf506e07f0a6fc3cee14fdc1e8502ea8f619cddb57ee0dba1a0d6112161f8bfd216a44533c6e78678f7 WHIRLPOOL 20a7f40e9363c7c3e15bbc8599fc66e8e76bb6c5ca49f58b50e8b5c70de08934e8564313fd4ade69d1da79042459fab364d1cd89134a450f76346f0e96631155
 EBUILD zfs-0.7.0-r2.ebuild 5666 SHA256 227eaedd821399d1c04c45a2093e5f4befd7c5546f665381863d4478bd28f86e SHA512 57d4292cbe99bf889280e8d6096cae72d862c64d35146599ad1c8a746f7b70d58972d607128cf827a9219eb4594e8e555dd87204ee13ac4a0d8ecef8bfc7968e WHIRLPOOL d9059292f9dcdc897ae91172c3612438a8c0959096a9ac1a81a0c6dd1d4f6a7dde49392f1420b69b0ab610fd5d92f7ef8917355dc31cd942f452a46abd782ad8
 EBUILD zfs-0.7.1-r1.ebuild 5664 SHA256 b391f3b7e3854c80566c3829486b058708292c21587ede1e14421f83f68cd12d SHA512 bceacbfac5efce785f90d68b3ea35bc3e44e5b7561684d1157842047dd878ae50f43222b473989a4c71380e362b919baf7eba77c28cdfe4bb9c63e425a7e55b9 WHIRLPOOL e22b229a4455e73efc91daffea8184f9976942df17eb74027e65966f57c2df70df537cfe714b0ca83f375f0f43b102e5a34f59baca79009ad8d9f215e35fced0
+EBUILD zfs-0.7.2.ebuild 5664 SHA256 b391f3b7e3854c80566c3829486b058708292c21587ede1e14421f83f68cd12d SHA512 bceacbfac5efce785f90d68b3ea35bc3e44e5b7561684d1157842047dd878ae50f43222b473989a4c71380e362b919baf7eba77c28cdfe4bb9c63e425a7e55b9 WHIRLPOOL e22b229a4455e73efc91daffea8184f9976942df17eb74027e65966f57c2df70df537cfe714b0ca83f375f0f43b102e5a34f59baca79009ad8d9f215e35fced0
 EBUILD zfs-9999.ebuild 5805 SHA256 eaf5b0d4c9c3b4b104a186c37040d0653759726ea3863801a5fb376cc154d67c SHA512 3fd1ac15bd72bc98dff861e7860f83d63727aeafa9a35c3d355df9deb4c40009206f18d09794fd26f1fe9702238098452a8ab6fb67d84a5ac84be5776ad10f7a WHIRLPOOL 2d3107fc13230a9e55cf2b74eedf799070d70e82eea687260849568ed091f5674e3fc4abbb9df347a04d68684733bb04d99a5e284aa77b702b6a6c1548917e3e
 MISC ChangeLog 13217 SHA256 9c37690b8a7b7c6a33139009109f582ca82bf3e6c8684c7ba5aad6c1217ee18c SHA512 9ec9c5ae1b4de72eb4b54d4ca9b5e15efcbbf47a87e9c2456656f25a0ed67258e135cd7bba6cbffc2ada994d6ff86d313449c79fcf1843a994808bac57b12546 WHIRLPOOL 270399247f437617eb0ac51bdb0c4d11e97bb894e6166066c8ba8aaa5e84e8aa3684fae19682d6a7e7d7e970199ed0d3025db6fcea2aa7df5e839dc89ccc6923
 MISC ChangeLog-2015 18930 SHA256 d01fb1add9dfd385b0156efea669dae84679277406d78994ae799f3a27537422 SHA512 7f2544d7bb7481e9212f3f2eb46cd0cafb7161b403505faa7134498edb648847818c688b8b9fc2bceb40f1d9692a6156f088ebd0713e29e98affc447ba0b6bc9 WHIRLPOOL ce3cca1ab6903fd92fb32f511ab321b9377018c51786563898247b7383fd32ae5eca047e0b7e12e47eb5f885530cddfd5ff72693349efb265802f99b5e0d70af
diff --git a/sys-fs/zfs/zfs-0.7.2.ebuild b/sys-fs/zfs/zfs-0.7.2.ebuild
new file mode 100644
index 000000000000..c5bf93725371
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.7.2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3 linux-mod
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS=" ~amd64"
+fi
+
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	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
+		!<sys-kernel/genkernel-3.5.1.1
+		!<sys-kernel/genkernel-next-67
+		!<sys-kernel/bliss-initramfs-7.1.0
+		!<sys-kernel/dracut-044-r1
+		)
+	sys-fs/udev-init-scripts
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [ ] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+
+}
+
+src_prepare() {
+	# 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-dracutdir="/usr/$(get_libdir)/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-blkid
+		$(use_enable debug)
+	)
+	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 zfs_core
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	bashcomp_alias zfs zpool
+
+	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
+
+	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
+	then
+		einfo 'The zfs boot script has been split into the zfs-import,'
+		einfo 'zfs-mount and zfs-share scripts.'
+		einfo
+		einfo 'You had the zfs script in your boot runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the three'
+		einfo 'scripts that replace it have been configured to start.'
+		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
+		einfo 'runlevel while the zfs-share script is in the default runlevel.'
+
+		rm "${EROOT}etc/runlevels/boot/zfs"
+		ln -snf "${EROOT}etc/init.d/zfs-import" \
+			"${EROOT}etc/runlevels/boot/zfs-import"
+		ln -snf "${EROOT}etc/init.d/zfs-mount" \
+			"${EROOT}etc/runlevels/boot/zfs-mount"
+		ln -snf "${EROOT}etc/init.d/zfs-share" \
+			"${EROOT}etc/runlevels/default/zfs-share"
+	else
+		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
+			einfo "You should add zfs-share to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/default/zed" ]
+	then
+		einfo 'The downstream OpenRC zed script has replaced by the upstream'
+		einfo 'OpenRC zfs-zed script.'
+		einfo
+		einfo 'You had the zed script in your default runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the zfs-zed'
+		einfo 'script that replaced it has been configured to start.'
+
+		rm "${EROOT}etc/runlevels/boot/zed"
+		ln -snf "${EROOT}etc/init.d/zfs-sed" \
+			"${EROOT}etc/runlevels/default/zfs-zed"
+	else
+		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+
+	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
+}