dev-lisp/asdf: update EAPI 6 -> 7

Notably fix tests too.

Signed-off-by: Sam James <sam@gentoo.org>

1 files changed, 25 insertions, 9 deletions

diff --git a/dev-lisp/asdf/asdf-3.3.5.ebuild b/dev-lisp/asdf/asdf-3.3.5.ebuild
index 508d690b0fbf..31ecf4bf0366 100644
--- a/dev-lisp/asdf/asdf-3.3.5.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit prefix common-lisp-3
 
@@ -16,37 +16,53 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 DEPEND="!dev-lisp/cl-${PN}
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )
-		test? ( virtual/commonlisp )"
+	!<dev-lisp/asdf-2.33-r3
+	doc? ( virtual/texi2dvi )
+	test? ( virtual/commonlisp )"
 PDEPEND="virtual/commonlisp
-		~dev-lisp/uiop-${PV}"
+	~dev-lisp/uiop-${PV}"
 
 install_docs() {
-	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf )
+	(
+		cd doc || die
+		dodoc *.{html,css,ico,png} ${PN}.pdf
+		dodoc -r asdf
+	)
+
 	if has_version ">=dev-lisp/sbcl-1.4.0" ; then
-		(cd doc ; doinfo "${PN}.info" )
+		(
+			cd doc || die
+			doinfo ${PN}.info
+		)
 	fi
 }
 
 src_compile() {
 	emake
+
 	use doc && emake -C doc
 }
 
 src_test() {
 	common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)"
-	test/run-tests.sh ${CL_BINARY}
+
+	rm test/test-program.script || die
+
+	# sbcl in common-lisp.eclass has --non-interactive in the binary name
+	# which seems to break this?
+	test/run-tests.sh ${CL_BINARY/--non-interactive/} || die
 }
 
 src_install() {
 	insinto "${CLSOURCEROOT}/${PN}"
 	doins -r build version.lisp-expr
+
 	dodoc README.md TODO
 	use doc && install_docs
+
 	insinto /etc/common-lisp
 	cd "${T}" || die
-	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
+	cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf . || die
 	eprefixify gentoo-init.lisp source-registry.conf
 	doins gentoo-init.lisp source-registry.conf
 }