[gentoo-commits] repo/gentoo:master commit in: dev-util/strace/

[Sam James]

commit:     8538cf87ad5782d028faca00ddc0ce13073e3bdc
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Fri Aug 26 12:50:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 22:38:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8538cf87

dev-util/strace: fix live ebuild

It is necessary to call ./bootstrap script before eautoreconf, otherwise
automake fails complaining about missing files or directories. The live
ebuild is broken since commit a6b222b1be5b, where eautoreconf started to
be used even for non-live ebuilds, but it was wrongly placed.

Additionally, edo function is used for ./bootstrap call.

Fixes: a6b222b1be5b ("dev-util/strace: Fix building with USE="static".")
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/27038
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/strace/strace-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index edcd42346ba7..49ada010927a 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic toolchain-funcs
+inherit autotools edo flag-o-matic toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/strace/strace.git"
@@ -45,16 +45,15 @@ PATCHES=(
 src_prepare() {
 	default
 
-	eautoreconf
-
 	if [[ ! -e configure ]] ; then
 		# git generation
 		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
+		edo ./bootstrap
 		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
 	fi
 
+	eautoreconf
+
 	# Stub out the -k test since it's known to be flaky. bug #545812
 	sed -i '1iexit 77' tests*/strace-k.test || die
 }