Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/
Date: Thu, 28 Nov 2019 10:26:12
Message-Id: 1574936762.1f477f15f62ef116bd87b90cbe61119db2f3eb47.polynomial-c@gentoo
1 commit: 1f477f15f62ef116bd87b90cbe61119db2f3eb47
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 28 09:26:38 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 28 10:26:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f477f15
7
8 sys-devel/autoconf: Bumped live ebuild to EAPI-7
9
10 Package-Manager: Portage-2.3.80, Repoman-2.3.19
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-devel/autoconf/autoconf-9999.ebuild | 22 ++++++++++++----------
14 1 file changed, 12 insertions(+), 10 deletions(-)
15
16 diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
17 index f728a1a9f57..22cc7e63dcd 100644
18 --- a/sys-devel/autoconf/autoconf-9999.ebuild
19 +++ b/sys-devel/autoconf/autoconf-9999.ebuild
20 @@ -1,7 +1,7 @@
21 # Copyright 1999-2019 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=6
25 +EAPI=7
26
27 if [[ ${PV} == "9999" ]] ; then
28 EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
29 @@ -21,21 +21,23 @@ LICENSE="GPL-3"
30 SLOT="${PV}"
31 IUSE="emacs"
32
33 -DEPEND=">=sys-devel/m4-1.4.16
34 +BDEPEND=">=sys-devel/m4-1.4.16
35 >=dev-lang/perl-5.6"
36 -RDEPEND="${DEPEND}
37 +RDEPEND="${BDEPEND}
38 !~sys-devel/${P}:2.5
39 >=sys-devel/autoconf-wrapper-13"
40 -[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3"
41 +[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
42 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
43
44 src_prepare() {
45 - # Avoid the "dirty" suffix in the git version by generating it
46 - # before we run later stages which might modify source files.
47 - local ver=$(./build-aux/git-version-gen .tarball-version)
48 - echo "${ver}" > .tarball-version || die
49 -
50 - autoreconf -f -i || die
51 + if [[ ${PV} == *9999 ]] ; then
52 + # Avoid the "dirty" suffix in the git version by generating it
53 + # before we run later stages which might modify source files.
54 + local ver=$(./build-aux/git-version-gen .tarball-version)
55 + echo "${ver}" > .tarball-version || die
56 +
57 + autoreconf -f -i || die
58 + fi
59
60 toolchain-autoconf_src_prepare
61 }