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 A4C8413835A for ; Tue, 12 May 2020 22:44:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C24AFE092E; Tue, 12 May 2020 22:44:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 AE2ECE092E for ; Tue, 12 May 2020 22:44:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5E33035028C for ; Tue, 12 May 2020 22:44:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF6AC232 for ; Tue, 12 May 2020 22:44:20 +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: <1589323326.6abc4b173f308b319f6cdf81eaf7d3a698575082.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-0.8.4.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 6abc4b173f308b319f6cdf81eaf7d3a698575082 X-VCS-Branch: master Date: Tue, 12 May 2020 22:44:20 +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: 508a1d70-9f0f-4c57-8dd3-5d7b0522db2f X-Archives-Hash: b6e45ff35d292448d665747e16cc3b82 commit: 6abc4b173f308b319f6cdf81eaf7d3a698575082 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue May 12 22:27:58 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Tue May 12 22:42:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abc4b17 sys-fs/zfs: sync changes from live ebuild to 0.8.4 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs/zfs-0.8.4.ebuild | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/sys-fs/zfs/zfs-0.8.4.ebuild b/sys-fs/zfs/zfs-0.8.4.ebuild index 3fbc4b3ebd1..c7cc180b9ea 100644 --- a/sys-fs/zfs/zfs-0.8.4.ebuild +++ b/sys-fs/zfs/zfs-0.8.4.ebuild @@ -6,16 +6,16 @@ EAPI=7 DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{6,7} ) -inherit bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript +inherit autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://zfsonlinux.org/" +HOMEPAGE="https://github.com/openzfs/zfs" if [[ ${PV} == "9999" ]] ; then - inherit autotools git-r3 linux-mod - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" + inherit git-r3 linux-mod + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz" KEYWORDS="~amd64 ~arm64 ~ppc64" fi @@ -68,9 +68,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" -PATCHES=( - "${FILESDIR}/bash-completion-sudo.patch" -) +PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) pkg_setup() { if use kernel_linux && use test-suite; then @@ -176,7 +174,6 @@ src_install() { # enforce best available python implementation python_fix_shebang "${ED}/bin" - } pkg_postinst() { @@ -187,12 +184,6 @@ pkg_postinst() { elog " sys-kernel/dracut" elog " sys-kernel/genkernel" fi - - if has_version "<=sys-kernel/genkernel-3.5.3.3"; then - einfo "genkernel version 3.5.3.3 and earlier does NOT support" - einfo " unlocking pools with native zfs encryption enabled at boot" - einfo " use dracut or >=genkernel-4 if you requre this functionality" - fi fi if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then