[gentoo-commits] proj/sci:master commit in: sci-mathematics/acl2/files/, sci-mathematics/acl2/

[gentoo-commits] proj/sci:master commit in: sci-mathematics/acl2/files/, sci-mathematics/acl2/

[Dongxu Li]

commit:     c86132d593ee589eda5591a90dc48f67e55a9aad
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Tue Apr 12 19:52:43 2011 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Tue Apr 12 19:52:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c86132d5

sci-mathematics/acl2: fixed certificate dir

---
 sci-mathematics/acl2/ChangeLog                |   10 +++---
 sci-mathematics/acl2/acl2-4.2.ebuild          |   45 ++++++++++++++++--------
 sci-mathematics/acl2/files/set-booksdir.patch |   11 ++++++
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/sci-mathematics/acl2/ChangeLog b/sci-mathematics/acl2/ChangeLog
index 65b0eef..7f7beaf 100644
--- a/sci-mathematics/acl2/ChangeLog
+++ b/sci-mathematics/acl2/ChangeLog
@@ -1,12 +1,12 @@
 # ChangeLog for sci-mathematics/acl2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  12 Apr 2011; Justin Lecher <jlec@gentoo.org> acl2-4.2.ebuild:
-  Slightly streamlined ebuild
-
 *acl2-4.2 (13 Apr 2011)
 
-  13 Apr 2011; Dongxu Li <dongxuli2011@gmail.com> +acl2-4.2.ebuild +ChangeLog +metadata.xml :
+  12 Apr 2011; Dongxu Li <dongxuli2011@gmail.com> +files/set-booksdir.patch:
+  fixed books dir for certificates
+
+  12 Apr 2011; Dongxu Li <dongxuli2011@gmail.com> +acl2-4.2.ebuild +ChangeLog +metadata.xml :
   Initial import.  #49316
 

diff --git a/sci-mathematics/acl2/acl2-4.2.ebuild b/sci-mathematics/acl2/acl2-4.2.ebuild
index 9d4db97..6514a3d 100644
--- a/sci-mathematics/acl2/acl2-4.2.ebuild
+++ b/sci-mathematics/acl2/acl2-4.2.ebuild
@@ -2,48 +2,63 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=2
 
 inherit eutils
 
-DESCRIPTION="Industrial strength theorem prover"
+DESCRIPTION="ACL2 industrial strength theorem prover"
+
 HOMEPAGE="http://www.cs.utexas.edu/users/moore/acl2/"
-SRC_URI="http://www.cs.utexas.edu/users/moore/${PN}/v${PV/\./-}/distrib/${PN}.tar.gz -> ${P}.tar.gz"
+
+SRC_URI="http://www.cs.utexas.edu/users/moore/acl2/v${PV/\./-}/distrib/acl2.tar.gz"
 
 LICENSE="GPL-2"
+
 SLOT="0"
+
 KEYWORDS="~amd64 ~x86"
+
 IUSE=""
 
+#RESTRICT="strip"
+
 DEPEND="dev-lisp/sbcl"
+
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-sources"
 
+src_prepare() {
+	epatch "${FILESDIR}"/set-booksdir.patch
+}
+
 src_compile() {
 	emake LISP="sbcl --noinform --noprint" || die "emake failed"
 	cd books
 	einfo
 	einfo "Building certificates..."
 	einfo "(this may take hours to finish)"
-	emake
+	sleep 5
+	emake ACL2="${S}"/saved_acl2 || die
 }
 
 src_install() {
-	sed -ie "s:${S}:${EPREFIX}/usr/share/acl2:g" saved_acl2 || die
-	dobin saved_acl2
-
-	insinto /usr/share/acl2
-	doins TAGS
-#	insopts -m0755
+	sed -ie "s:${S}:/usr/share/acl2:g" saved_acl2
+	insinto /usr/bin
+	insopts -m0755
 	doins saved_acl2
-	doins saved_acl2.core
 
+	insinto /usr/share/acl2
+	doins TAGS || die
+	insopts -m0755
+	doins saved_acl2 || die
+	doins saved_acl2.core || die
 
-	insinto /usr/share/acl2/
-	doins -r books
+	dodir /usr/share/acl2/books
+	cp -a books "${D}"/usr/share/acl2
+	chmod --recursive a+rx "${D}"/usr/share/acl2/books
 
-	dohtml -r doc/HTML/*
+	dohtml doc/HTML/* || die
 
-	doinfo doc/EMACS/*
+	doinfo doc/EMACS/* || die
 }

diff --git a/sci-mathematics/acl2/files/set-booksdir.patch b/sci-mathematics/acl2/files/set-booksdir.patch
new file mode 100644
index 0000000..4f4d433
--- /dev/null
+++ b/sci-mathematics/acl2/files/set-booksdir.patch
@@ -0,0 +1,11 @@
+--- a/books/Makefile-generic	2011-04-12 14:42:17.790165650 -0400
++++ b/books/Makefile-generic	2011-04-12 14:55:54.436829607 -0400
+@@ -55,7 +55,7 @@
+ # Determine the location of this Makefile-generic.  NOTE: We have
+ # tried $(realpath $(dir ...)) and similarly for abspath, but they
+ # have returned the empty string, presumably an error.
+-BOOKS_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
++BOOKS_DIR := /usr/share/acl2/books/
+ 
+ # and use that to determine the default location of ACL2.  To override,
+ # set the ACL2 variable on the command line or in the environment.