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