gentoo auto-resync : 07:03:2024 - 19:06:58

3 files changed, 117 insertions, 4 deletions

diff --git a/sci-mathematics/acl2/Manifest b/sci-mathematics/acl2/Manifest
index c00a4e8d314f..ed5b21757147 100644
--- a/sci-mathematics/acl2/Manifest
+++ b/sci-mathematics/acl2/Manifest
@@ -1,4 +1,6 @@
 AUX 50acl2-gentoo.el 230 BLAKE2B 42394e3aa3c8925a09ae331c0e133ebe0eb917991301172a50630b53c80dfda75629e8bc1ae4e9f844b5ab606ffbe0ffd70778c8066f4da386f8dad10ccee7ab SHA512 8b367c76497e50284f11606e7660148b78f069fa474bfaae49de4ac9649e524da1902b61a28ea50223d53582fe76485a8c2b26ca8b698005b2dd47cadcf99828
 DIST acl2-8.5.tar.gz 222696244 BLAKE2B e5aa8360d9f94ed398d11c4e0873818f8f49ed0e072192c7d62dde99b4a7f98b4240b352818e7691ebc98f85ab3c10981c36bb1e35317e50a111c9c7f3f57b33 SHA512 5a2e004713350ae41ced830aa8620c27963eb108baa499f7e52a1c60961b220ef7a026efdfef6cea1063f731b50f3cccbe1583a9957c9cf269b0a958ec83fe48
-EBUILD acl2-8.5-r1.ebuild 2147 BLAKE2B d07b5a3afd9c9074cf488f994258d2f13f3fe31db58583d68c4d3a00357da5bfe59366f26231b604902f0d60f41628321aefe3377b51ce93918b0e8a12e66152 SHA512 7b6638e057de2cf30c4bf7f4f17a87d03b16066cec6b4a5d411168efa481b8baaba6d9bba79396d90841ba7ab93d5165b1e82edd80a42b5dfa1ab4401cde1d03
+DIST acl2-8.5_p20240307.tar.gz 228577404 BLAKE2B af7b4f9995b568ba733a1071fa8069798091ea66b91acc9fb839a6f9ba7843762d7130f4d6b653054de4adea91569904ee4c3dcd035350616418c13fa762bc10 SHA512 b5484a49702fa6c657ebf9551dcec2b6a9c0632e137db1480f93ef9aec83fc9bdb9ca95c46ed324b4ff6ab1a428c8ca50bd1750e1bfd6c024d46a4d27728a24e
+EBUILD acl2-8.5-r2.ebuild 2155 BLAKE2B 7d485d49327b5f2d4e02e5caad6475f528623dcb5124ac84bc3cf732a1a44e91d6b041f1f0a4f930e4d8b0ba256c2368328233ee330c6ec7709599c476e5adf5 SHA512 b85c1d4a5799e8ec27378bd7e0c1a2f57cf131f88e35b424b1ed325b9264ddad4cc061281c3d1cf7164c962d0220c6faf159161a2478816fbbaed196febd7324
+EBUILD acl2-8.5_p20240307.ebuild 2672 BLAKE2B 2282f82d0f1cebfdfd56613781527751dbc51f924da55367d4c2a186f96aabcb1558443da99ffe778d26c11b990b040ba5683ee418269e3407108b8169fa5e5c SHA512 5cc49472d29845317680be49c98800301f5dd7f90c954564b636b4da03641ee97d1c3e4cc448f85bf3563036be23c66f248e7daf18589d2841e7cd53b4937673
 MISC metadata.xml 816 BLAKE2B 791aff8f16b043469eb568aa6d50c2dabb2ffc3686ee846e98fd8f6e48533f5e4f86d500d8065a3a91cfce767c4990aabaf437eb97e57f8deabe19a6b9248116 SHA512 42a005fb8d3831cc422fed00a18419b959d40c3ee25a437efbfb836d9cb008fe22390a1986b090261c735fc0ff18688331ef884ee892703b166807616b947e64
diff --git a/sci-mathematics/acl2/acl2-8.5-r1.ebuild b/sci-mathematics/acl2/acl2-8.5-r2.ebuild
index 19e1ea1d83f7..64fd6d8d1ad9 100644
--- a/sci-mathematics/acl2/acl2-8.5-r1.ebuild
+++ b/sci-mathematics/acl2/acl2-8.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTICE: Only SBCL (dev-lisp/sbcl) is tested for now, but probably
@@ -15,14 +15,14 @@ HOMEPAGE="https://www.cs.utexas.edu/users/moore/acl2/
 	https://github.com/acl2/acl2/"
 SRC_URI="https://github.com/acl2/acl2/archive/${PV}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs"
 REQUIRED_USE="emacs? ( doc )"
 
 RDEPEND="
-	dev-lisp/sbcl:=
+	<=dev-lisp/sbcl-2.4.1:=
 	emacs? ( >=app-editors/emacs-25:* )
 "
 BDEPEND="
diff --git a/sci-mathematics/acl2/acl2-8.5_p20240307.ebuild b/sci-mathematics/acl2/acl2-8.5_p20240307.ebuild
new file mode 100644
index 000000000000..3d2c045b3a81
--- /dev/null
+++ b/sci-mathematics/acl2/acl2-8.5_p20240307.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTICE: Only SBCL (dev-lisp/sbcl) is tested for now, but probably
+#   more CL implementations can be added as alternative dependencies.
+#   With ClozureCL (dev-lisp/clozurecl) ACL2 fails to build,
+#   this might need in-depth investigation...
+
+EAPI=8
+
+inherit elisp-common
+
+DESCRIPTION="Industrial strength theorem prover, logic and programming language"
+HOMEPAGE="https://www.cs.utexas.edu/users/moore/acl2/
+	https://github.com/acl2/acl2/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	COMMIT=6ba68b5c8d645ca45185abc4a24ce46e5ae029c5
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc emacs"
+REQUIRED_USE="emacs? ( doc )"
+
+# SBCL <= 2.4.1 is required, see: https://github.com/acl2/acl2/issues/1580
+RDEPEND="
+	<=dev-lisp/sbcl-2.4.1:=
+	emacs? ( >=app-editors/emacs-25:* )
+"
+BDEPEND="
+	${RDEPEND}
+	doc? ( dev-lang/perl )
+"
+
+DOCS=( books/README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	find . -type f -name "*.bak" -delete || die
+	find . -type f -name "*.orig" -delete || die
+	rm books/workshops/2003/schmaltz-al-sammane-et-al/support/acl2link || die
+
+	sed -e "s|\"git\" '(\"rev-parse\" \"HEAD\")|\"echo\" '(\"${COMMIT}\")|" \
+		-i acl2-init.lisp || die
+
+	default
+}
+
+src_compile() {
+	emake LISP="sbcl --no-sysinit --no-userinit --disable-debugger"
+
+	if use emacs ; then
+		local elisp_dir
+		for elisp_dir in books/emacs books/interface/emacs ; do
+			BYTECOMPFLAGS="-L ${S}/${elisp_dir}"        \
+				elisp-compile "${S}/${elisp_dir}"/*.el
+		done
+	fi
+
+	if use doc ; then
+		emake ACL2="${S}/saved_acl2" basic DOC
+	fi
+}
+
+src_install() {
+	local saved_name=saved_acl2
+
+	sed "s|${S}|/usr/share/acl2|g" -i "${saved_name}" || die
+	sed "5iexport ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/"    \
+		-i "${saved_name}" || die
+
+	exeinto /usr/share/acl2
+	doexe "${saved_name}"
+	insinto /usr/share/acl2
+	doins "${saved_name}.core"
+	dosym -r "/usr/share/acl2/${saved_name}" /usr/bin/acl2
+
+	if use emacs ; then
+		doins TAGS
+		elisp-install "${PN}" books/emacs/*.el{,c} books/interface/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use doc ; then
+		doins -r books
+
+		HTML_DOCS=( doc/HTML/. )
+		einstalldocs
+	fi
+
+	# Some binaries in "books". Not needed since the sources are there.
+	find "${ED}/usr/share/acl2/books" -type f -name "*.elf64" -delete || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}