[gentoo-commits] repo/gentoo:master commit in: media-sound/timidity++/

["Sam James" <sam@gentoo.org>]

commit:     b48871811b67831bb9657d653af8b338239adbda
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 03:00:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 03:00:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4887181

media-sound/timidity++: add configure workarounds

- Rename configure.in -> configure.ac
- Avoid dodgy configure tests (written for old autoconf, fragile)

Closes: https://bugs.gentoo.org/665600
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/timidity++/timidity++-2.15.0-r2.ebuild | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/media-sound/timidity++/timidity++-2.15.0-r2.ebuild b/media-sound/timidity++/timidity++-2.15.0-r2.ebuild
index b776c4681ac2..f0377e343868 100644
--- a/media-sound/timidity++/timidity++-2.15.0-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop elisp-common systemd toolchain-funcs xdg
+inherit autotools desktop elisp-common flag-o-matic systemd toolchain-funcs xdg
 
 MY_PV="${PV/_/-}"
 MY_P="TiMidity++-${MY_PV}"
@@ -69,6 +69,9 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
@@ -79,6 +82,18 @@ src_configure() {
 	# List by preference
 	local xaw_provider=$(usex Xaw3d 'xaw3d' 'xaw')
 
+	# configure workarounds: configure.in here is written for an old version
+	# of autoconf and upstream seems quite dead.
+	#
+	# 1. Avoid janky configure test breaking
+	# ```checking for sys/wait.h that is POSIX.1 compatible... yes
+	# ./configure: 7995: test: =: unexpected operator```
+	export ac_cv_header_sys_time_h=yes
+	#
+	# 2. And yes, we expect standard header locations (this configure test is flaky for us too)
+	# This avoids a bunch of implicit decl. errors which only happen with USE=-Xaw3d(?!)
+	append-cppflags -DSTDC_HEADERS
+
 	local myeconfargs=(
 		--localstatedir=/var/state/${PN}
 		--with-module-dir="${EPREFIX}/usr/share/timidity"