[gentoo-commits] repo/gentoo:master commit in: dev-build/automake/

[Sam James]

commit:     0a775770d5e41e46d1b9026bf222191901584728
Author:     Raul E Rangel <rrangel <AT> chromium <DOT> org>
AuthorDate: Tue Aug 15 17:44:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 16:59:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a775770

dev-build/automake: Cleanup depends

The automake ./bootstrap script requires the `autom4te` tool.
```
: ${AUTOM4TE=autom4te}
export AUTOM4TE  # ditto
```

If it's not installed the package fails with the following error:
```
sh: line 1: autom4te: command not found
aclocal.tmp: error: autom4te failed with exit status: 127
 * ERROR: sys-devel/automake-1.16.5-r1::portage-stable failed (prepare phase):
 *   (no error message)
 *
 * Call stack:
 *               ebuild.sh, line  125:  Called src_prepare
 *             environment, line 2813:  Called die
 * The specific snippet of code:
 *       ./bootstrap || die;
```

We also need to add autoconf so the wrapper doesn't fail:
```
ac-wrapper: Unable to locate any usuable version of autoconf.
```

We also don't need to declare any DEPEND.

Signed-off-by: Raul E Rangel <rrangel <AT> chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/32327
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../automake/{automake-1.16.5-r1.ebuild => automake-1.16.5-r2.ebuild}  | 3 ++-
 dev-build/automake/automake-9999.ebuild                                | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-build/automake/automake-1.16.5-r1.ebuild 
b/dev-build/automake/automake-1.16.5-r2.ebuild
similarity index 98%
rename from dev-build/automake/automake-1.16.5-r1.ebuild
rename to dev-build/automake/automake-1.16.5-r2.ebuild
index 25e29244ced0..ce41b4760596 100644
--- a/dev-build/automake/automake-1.16.5-r1.ebuild
+++ b/dev-build/automake/automake-1.16.5-r2.ebuild
@@ -50,10 +50,11 @@ RDEPEND="
        >=dev-build/autoconf-2.69:*
        sys-devel/gnuconfig
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
        app-alternatives/gzip
        sys-apps/help2man
+       dev-build/autoconf-wrapper
+       dev-build/autoconf
        test? (
                ${PYTHON_DEPS}
                dev-util/dejagnu

diff --git a/dev-build/automake/automake-9999.ebuild 
b/dev-build/automake/automake-9999.ebuild
index b65ba04aa145..fbae9d59d81b 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -47,10 +47,11 @@ RDEPEND="
        >=dev-build/autoconf-2.69:*
        sys-devel/gnuconfig
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
        app-alternatives/gzip
        sys-apps/help2man
+       dev-build/autoconf-wrapper
+       dev-build/autoconf
        test? (
                ${PYTHON_DEPS}
                dev-util/dejagnu