sys-fs/zfs: changing blocker deps for 0.7.0 ebuilds, and removing 0.7.0-r0
authorJonathan Vasquez <fearedbliss@gentoo.org>
Tue, 12 Sep 2017 13:06:37 +0000 (09:06 -0400)
committerJonathan Vasquez <fearedbliss@gentoo.org>
Tue, 12 Sep 2017 13:06:37 +0000 (09:06 -0400)
Package-Manager: Portage-2.3.6, Repoman-2.3.2

sys-fs/zfs/zfs-0.7.0-r2.ebuild [moved from sys-fs/zfs/zfs-0.7.0-r1.ebuild with 97% similarity]
sys-fs/zfs/zfs-0.7.0.ebuild [deleted file]
sys-fs/zfs/zfs-0.7.1-r1.ebuild [moved from sys-fs/zfs/zfs-0.7.1.ebuild with 97% similarity]

similarity index 97%
rename from sys-fs/zfs/zfs-0.7.0-r1.ebuild
rename to sys-fs/zfs/zfs-0.7.0-r2.ebuild
index 1fa9e5745224d94bc40b950b5fa03c39eb8ce669..b20cb49f36adb02ca28658f10def3c59472ce745 100644 (file)
@@ -50,8 +50,10 @@ RDEPEND="${COMMON_DEPEND}
                app-arch/cpio
                app-misc/pax-utils
                !<sys-boot/grub-2.00-r2:2
-               || ( >=sys-kernel/genkernel-3.5.1.1
-                    >=sys-kernel/bliss-initramfs-7.1.0 )
+               !<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
 "
diff --git a/sys-fs/zfs/zfs-0.7.0.ebuild b/sys-fs/zfs/zfs-0.7.0.ebuild
deleted file mode 100644 (file)
index 535d865..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-# 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="https://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-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
-}
similarity index 97%
rename from sys-fs/zfs/zfs-0.7.1.ebuild
rename to sys-fs/zfs/zfs-0.7.1-r1.ebuild
index 48136e7a0c66fd9a18210d7b62ad1af358325b64..c5bf93725371a3fba328cf0791850647b98bf9a7 100644 (file)
@@ -50,8 +50,10 @@ RDEPEND="${COMMON_DEPEND}
                app-arch/cpio
                app-misc/pax-utils
                !<sys-boot/grub-2.00-r2:2
-               || ( >=sys-kernel/genkernel-3.5.1.1
-                    >=sys-kernel/bliss-initramfs-7.1.0 )
+               !<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
 "