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

["Justin Lecher" <jlec@gentoo.org>]

commit:     b1a5a236fe0625f4493511061d7b67c58521cfe2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 17:25:56 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 17:25:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b1a5a236

Slightly streamlined ebuild

(Portage version: 2.2.0_alpha29/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-mathematics/acl2/ChangeLog       |    5 ++-
 sci-mathematics/acl2/acl2-4.2.ebuild |   52 ++++++++++++---------------------
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/sci-mathematics/acl2/ChangeLog b/sci-mathematics/acl2/ChangeLog
index 8572e54..65b0eef 100644
--- a/sci-mathematics/acl2/ChangeLog
+++ b/sci-mathematics/acl2/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-mathematics/acl2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 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 :

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