Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
Date: Fri, 11 Jun 2021 02:07:39
Message-Id: 1623377233.68c48d16aec7330135cecb64ded53f535c2b4b74.sam@gentoo
1 commit: 68c48d16aec7330135cecb64ded53f535c2b4b74
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 11 02:07:13 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 11 02:07:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c48d16
7
8 sys-fs/zfs: run eautoreconf unconditionally
9
10 Closes: https://bugs.gentoo.org/792627
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sys-fs/zfs/zfs-2.1.0_rc7.ebuild | 8 +++++---
14 sys-fs/zfs/zfs-9999.ebuild | 8 +++++---
15 2 files changed, 10 insertions(+), 6 deletions(-)
16
17 diff --git a/sys-fs/zfs/zfs-2.1.0_rc7.ebuild b/sys-fs/zfs/zfs-2.1.0_rc7.ebuild
18 index 1cd4e63b4e6..90a0325d284 100644
19 --- a/sys-fs/zfs/zfs-2.1.0_rc7.ebuild
20 +++ b/sys-fs/zfs/zfs-2.1.0_rc7.ebuild
21 @@ -153,9 +153,11 @@ src_prepare() {
22 default
23 libsoversion_check
24
25 - if [[ ${PV} == "9999" ]]; then
26 - eautoreconf
27 - else
28 + # Run unconditionally (bug #792627)
29 + eautoreconf
30 +
31 +
32 + if [[ ${PV} != "9999" ]]; then
33 # Set revision number
34 sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
35 fi
36
37 diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
38 index 1cd4e63b4e6..90a0325d284 100644
39 --- a/sys-fs/zfs/zfs-9999.ebuild
40 +++ b/sys-fs/zfs/zfs-9999.ebuild
41 @@ -153,9 +153,11 @@ src_prepare() {
42 default
43 libsoversion_check
44
45 - if [[ ${PV} == "9999" ]]; then
46 - eautoreconf
47 - else
48 + # Run unconditionally (bug #792627)
49 + eautoreconf
50 +
51 +
52 + if [[ ${PV} != "9999" ]]; then
53 # Set revision number
54 sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
55 fi