sci-mathematics/prover9: fix tests; bump to EAPI 8

Closes: https://bugs.gentoo.org/725594
Signed-off-by: Maciej Barć <xgqt@gentoo.org>

1 files changed, 23 insertions, 25 deletions

diff --git a/sci-mathematics/prover9/prover9-2009.11a.ebuild b/sci-mathematics/prover9/prover9-2009.11a-r1.ebuild
index 0fa79ab74422..63b9fad1839f 100644
--- a/sci-mathematics/prover9/prover9-2009.11a.ebuild
+++ b/sci-mathematics/prover9/prover9-2009.11a-r1.ebuild
@@ -1,49 +1,48 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 MY_PN="LADR"
 typeset -u MY_PV
-MY_PV=$(ver_rs 1 '-')
+MY_PV="$(ver_rs 1 '-')"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Automated theorem prover for first-order and equational logic"
 HOMEPAGE="https://www.cs.unm.edu/~mccune/mace4/"
 SRC_URI="
 	https://www.cs.unm.edu/~mccune/mace4/download/${MY_P}.tar.gz
-	https://dev.gentoo.org/~jlec/distfiles/${MY_PN}-2009-11A-makefile.patch.xz"
+	https://dev.gentoo.org/~jlec/distfiles/${MY_PN}-2009-11A-makefile.patch.xz
+"
+S="${WORKDIR}/${MY_P}/"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
 IUSE="examples"
 
 PATCHES=(
-	"${WORKDIR}"/${MY_PN}-2009-11A-makefile.patch
-	"${FILESDIR}"/${MY_PN}-2009-11A-manpages.patch
-	)
-
-S="${WORKDIR}/${MY_P}/"
+	"${WORKDIR}/${MY_PN}-2009-11A-makefile.patch"
+	"${FILESDIR}/${MY_PN}-2009-11A-manpages.patch"
+)
 
 src_prepare() {
 	default
-	MAKEOPTS+=" -j1"
-	sed \
-		-e "/^CC =/s:gcc:$(tc-getCC):g" \
-		-i */Makefile || die
+
+	sed -e "/^CC =/s:gcc:$(tc-getCC):g" -i */Makefile || die
+
+	export MAKEOPTS+=" -j1 "
+	tc-export AR CC
 }
 
 src_compile() {
-	emake all
+	emake CFLAGS="${CFLAGS} ${LDFLAGS}" -j1 all
 }
 
 src_test() {
-	emake test1
-	emake test2
-	emake test3
+	LD_LIBRARY_PATH="${S}/ladr/.libs/" emake -j1 test1 test2 test3
 }
 
 src_install() {
@@ -104,23 +103,22 @@ src_install() {
 	docinto html
 	dodoc -r ladr/index.html.master ladr/html/*
 
-	insinto /usr/$(get_libdir)
+	insinto "/usr/$(get_libdir)"
 	dolib.so ladr/.libs/libladr.so.4.0.0
 
-	dosym libladr.so.4.0.0 /usr/$(get_libdir)/libladr.so.4
-	dosym libladr.so.4.0.0 /usr/$(get_libdir)/libladr.so
+	dosym libladr.so.4.0.0 "/usr/$(get_libdir)/libladr.so.4"
+	dosym libladr.so.4.0.0 "/usr/$(get_libdir)/libladr.so"
 
-	dodir /usr/include/ladr
 	insinto /usr/include/ladr
 	doins ladr/*.h
 
-	if use examples; then
-		insinto /usr/share/${PN}/examples
+	if use examples ; then
+		insinto "/usr/share/${PN}/examples"
 		doins prover9.examples/*
 
 		# The prover9-mace4 script is installed as an example script
 		# to avoid confusion with the GUI sci-mathematics/p9m4 prover9mace4.py
-		insinto /usr/share/${PN}/scripts
+		insinto "/usr/share/${PN}/scripts"
 		doins bin/prover9-mace4
 	fi
 }