From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE363138335 for ; Wed, 14 Aug 2019 06:05:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B2A7E07A5; Wed, 14 Aug 2019 06:05:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37F01E084E for ; Wed, 14 Aug 2019 06:05:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0103349AD1 for ; Wed, 14 Aug 2019 06:05:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 171C675E for ; Wed, 14 Aug 2019 06:05:21 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1565762380.9e7c7b0f1a6fde0e35d4976ec1fa517d36a16b36.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/Manifest sys-fs/zfs/zfs-0.6.5.11-r2.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 9e7c7b0f1a6fde0e35d4976ec1fa517d36a16b36 X-VCS-Branch: master Date: Wed, 14 Aug 2019 06:05:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c4ba8047-58c9-42c9-a43a-064ea1d292a4 X-Archives-Hash: af29cd648721f61c92028c83f0929a48 commit: 9e7c7b0f1a6fde0e35d4976ec1fa517d36a16b36 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Aug 14 05:59:40 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Aug 14 05:59:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7c7b0f sys-fs/zfs: drop 0.6.5.11-r2 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs/Manifest | 1 - sys-fs/zfs/zfs-0.6.5.11-r2.ebuild | 212 -------------------------------------- 2 files changed, 213 deletions(-) diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 29e419297f2..daccededfad 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,3 +1,2 @@ -DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667 diff --git a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild deleted file mode 100644 index 10a8985e6e6..00000000000 --- a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,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 usr-ldscript - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - net-libs/libtirpc - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -# Adding glibc >= 2.25 blocker for ZFS versions lower -# than 0.7.0, due to bug 617628. -RDEPEND="${COMMON_DEPEND} - !>=sys-libs/glibc-2.25 - !=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 - !" - 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="${EPREFIX}/usr/lib/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" - $(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 - - systemd_reenable zfs-zed.service - systemd_reenable zfs-import-cache.service - systemd_reenable zfs-import-scan.service - systemd_reenable zfs-mount.service - systemd_reenable zfs-share.service - systemd_reenable zfs-import.target - systemd_reenable zfs.target - systemd_reenable zfs.service - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -}