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 16A191382C5 for ; Fri, 11 Jun 2021 02:07:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6ED5DE08C8; Fri, 11 Jun 2021 02:07:38 +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 567EBE08C8 for ; Fri, 11 Jun 2021 02:07:38 +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 7415933D3D0 for ; Fri, 11 Jun 2021 02:07:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 202AB7AC for ; Fri, 11 Jun 2021 02:07:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1623377233.68c48d16aec7330135cecb64ded53f535c2b4b74.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-2.1.0_rc7.ebuild sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 68c48d16aec7330135cecb64ded53f535c2b4b74 X-VCS-Branch: master Date: Fri, 11 Jun 2021 02:07:34 +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: b511aa80-a0ae-49cf-9653-6b9a1d63cbe9 X-Archives-Hash: e2714a79e676fe427eb699ddaf16cfc5 commit: 68c48d16aec7330135cecb64ded53f535c2b4b74 Author: Sam James gentoo org> AuthorDate: Fri Jun 11 02:07:13 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jun 11 02:07:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c48d16 sys-fs/zfs: run eautoreconf unconditionally Closes: https://bugs.gentoo.org/792627 Signed-off-by: Sam James gentoo.org> sys-fs/zfs/zfs-2.1.0_rc7.ebuild | 8 +++++--- sys-fs/zfs/zfs-9999.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sys-fs/zfs/zfs-2.1.0_rc7.ebuild b/sys-fs/zfs/zfs-2.1.0_rc7.ebuild index 1cd4e63b4e6..90a0325d284 100644 --- a/sys-fs/zfs/zfs-2.1.0_rc7.ebuild +++ b/sys-fs/zfs/zfs-2.1.0_rc7.ebuild @@ -153,9 +153,11 @@ src_prepare() { default libsoversion_check - if [[ ${PV} == "9999" ]]; then - eautoreconf - else + # Run unconditionally (bug #792627) + eautoreconf + + + if [[ ${PV} != "9999" ]]; then # Set revision number sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" fi diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 1cd4e63b4e6..90a0325d284 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -153,9 +153,11 @@ src_prepare() { default libsoversion_check - if [[ ${PV} == "9999" ]]; then - eautoreconf - else + # Run unconditionally (bug #792627) + eautoreconf + + + if [[ ${PV} != "9999" ]]; then # Set revision number sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" fi