gentoo auto-resync : 14:02:2024 - 17:36:28

2 files changed, 24 insertions, 26 deletions

diff --git a/sci-mathematics/prover9/Manifest b/sci-mathematics/prover9/Manifest
index 7750d4278653..2870eb375b49 100644
--- a/sci-mathematics/prover9/Manifest
+++ b/sci-mathematics/prover9/Manifest
@@ -1,5 +1,5 @@
 AUX LADR-2009-11A-manpages.patch 13832 BLAKE2B dfd8d0ba6722d788b4e7662c0c4113cc06c32f2f45cdd32327896147435d3f730b464189ee1766a1c162a90cd730d917d8b29c3c241a94d65a3fc5833f3bbca1 SHA512 4c9f862b33d7b6b33b5e4a82b38418c6ae41b7adae565d376cc741608eb989e3846c1e98589dea62f7cadeb0b1f0f5814afe95ee6cf0da63c6961620d8b2677c
 DIST LADR-2009-11A-makefile.patch.xz 4300 BLAKE2B 3ea0860901876c43aeadcee7cf7eca02c31c88ca6670c867ef4a41b9adc2aa13edf36f45807713f7b200355f5086b43a17722071be81f58af1bc5d70327e3e41 SHA512 c1d2e27d991036af24a29deb4401fbf9687415d2a37bebabb9cfc77d8672e0804d974f92cbd7b8e16c0a0c10b75831847f7b8ddb94244d7e632de7b1be5081f1
 DIST LADR-2009-11A.tar.gz 1795750 BLAKE2B ed44b1d0f5f5f3c9846ff578af10914421c79f580db9f9002f105b87d7af49fb6f2956b70d2ebfbd17b3a230d1065aadb1cc798ef7ebdad8749e66cea41120b6 SHA512 f26d3713eb2ba809fb3d55ce179e9d91555ab9166e075aa0843bafe57ce00f153cfed178b61993d4fd471655840e4f40775d75dac9fb5242a67e5d59c970dfc7
-EBUILD prover9-2009.11a.ebuild 2514 BLAKE2B 52b53007c8428c449b19c00324ddd3f84c9001bb9af2d453ea7b537348a5f6b48feb5a4ac6c000bd1a9e5b37317df4e6e0a58faa81332d440c36b48079ef4be9 SHA512 21d4294cb6ea5cbd1951751976e5872256e9e7de82e2b46f896efcbe5d5c7bc83321baaafbbefea59feabe77c2673b1a1cfed1daf0b806a498bc7ea90aa9aa9e
+EBUILD prover9-2009.11a-r1.ebuild 2579 BLAKE2B d865851dcefac71e1299db441c76b72663b4561b16a4ce20532dd4bca2881a4a4a59fdddc620b52fc2dbc5e5cdd0bcdca71473eddf0a0cad03f17d71600866f1 SHA512 18dd15a04f7e20570cde9fb3fd158db81858b6cab048111c515cd08d088147ee7cfe3bce665e0d744cb8f89824c10c8742f095b5e7ca5d8ec5e22b8ba9bba335
 MISC metadata.xml 535 BLAKE2B ba8d67e5b87bd740d24e591b21fdd1214ef0fcb2bb9442722c973fe1344b3d638b5aedbc332e74e82eb58fb16458343d22c752abaf2c913d49de89cf7b76e2f4 SHA512 f48643b65797eaa9f06513f41a54f857e349ef7ed111fb5611ef2741e4785dc33bb96be9405b6331b0a9c569e08eb1e6e0f104b8b6c8a0eb2593694ae3d6803d
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
 }