aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-06-16 15:32:23 +0200
committerJustin Lecher <jlec@gentoo.org>2015-06-16 15:32:23 +0200
commita32f235103241efb9e1f7fe5aa409499c65360a7 (patch)
tree99c404706cd540f62093e2197031e59b89b201fa
parentsci-libs/gsl: Fix problems during installation with multilib and alternatives... (diff)
parentMerge pull request #437 from ustcscgy/acl2-7.1 (diff)
downloadsci-a32f235103241efb9e1f7fe5aa409499c65360a7.tar.gz
sci-a32f235103241efb9e1f7fe5aa409499c65360a7.tar.bz2
sci-a32f235103241efb9e1f7fe5aa409499c65360a7.zip
Merge remote-tracking branch 'github/master'
* github/master: sci-mathematics/acl2: Version bump; Upstream url changes.
-rw-r--r--sci-mathematics/acl2/ChangeLog7
-rw-r--r--sci-mathematics/acl2/Manifest2
-rw-r--r--sci-mathematics/acl2/acl2-7.1.ebuild (renamed from sci-mathematics/acl2/acl2-7.0.ebuild)9
-rw-r--r--sci-mathematics/acl2/metadata.xml2
4 files changed, 14 insertions, 6 deletions
diff --git a/sci-mathematics/acl2/ChangeLog b/sci-mathematics/acl2/ChangeLog
index 76c3446f5..108ca3f59 100644
--- a/sci-mathematics/acl2/ChangeLog
+++ b/sci-mathematics/acl2/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*acl2-7.1 (16 Jun 2015)
+
+ 16 Jun 2015; zcj <ustcscgy@163.com> +acl2-7.1.ebuild, -acl2-7.0.ebuild,
+ metadata.xml:
+ sci-mathematics/acl2: sci-mathematics/acl2: Version bump; Upstream url
+ changes.
+
06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
sci-mathematics/acl2: Add github to remote-id in metadata.xml
diff --git a/sci-mathematics/acl2/Manifest b/sci-mathematics/acl2/Manifest
index abf3d42ae..1444f00a9 100644
--- a/sci-mathematics/acl2/Manifest
+++ b/sci-mathematics/acl2/Manifest
@@ -1 +1 @@
-DIST acl2-7.0.tar.gz 58301172 SHA256 dbbe63ddbe342072fa0504e05f9e02fb01bb654b6befcc1e34ba7ceab2b1e0eb SHA512 25746df91de3b418d0be8f5b6aa906b5456eb95e46745362f4c8697cd5dc57ad44fa25151ebffa6ad3efc28efd9ecdb830dedc136c79082d3fbc71e9393fa2cc WHIRLPOOL 1b7232d0c7c9c68bd3ee8bfc9d2a6547e533dfac5681313e513f7f72bc4aff6a727f36b1704020c21f2d44a8bf36baac91ac411633ff67cf7a3f46071e671fa8
+DIST acl2-7.1.tar.gz 63345284 SHA256 1a8503095a4e1deb6a6b0f3bc51823ba65cad38466def8d6845f193d73338f9d SHA512 5875b88615930fc841cd1d7ed30ada7c04b241a391eeee22184b4e3630e57cc6304a51e445e33ca1284576c2b4110c269f9eb59c47bd2eb47659134450151e27 WHIRLPOOL 632012e3d8998c67f70cd19b8fa7c7ff8000dbdba2d87dfdd56d5b4b39ebb390503d243e051c308c8a5aea0097bb48fa4e5c510b24478886a4a8bfca2c8d0645
diff --git a/sci-mathematics/acl2/acl2-7.0.ebuild b/sci-mathematics/acl2/acl2-7.1.ebuild
index c1bfb9036..8378eafb5 100644
--- a/sci-mathematics/acl2/acl2-7.0.ebuild
+++ b/sci-mathematics/acl2/acl2-7.1.ebuild
@@ -8,7 +8,8 @@ inherit eutils
DESCRIPTION="Industrial strength theorem prover"
HOMEPAGE="http://www.cs.utexas.edu/users/moore/acl2/"
-SRC_URI="https://github.com/acl2/acl2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+MY_PN=${PN}-devel
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
@@ -19,6 +20,7 @@ DEPEND="
dev-lisp/sbcl:=
books? ( dev-lang/perl )"
RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_PN}-${PV}"
src_compile() {
emake LISP="sbcl --noinform --noprint \
@@ -28,19 +30,18 @@ src_compile() {
echo
einfo "Building certificates ..."
einfo "(this may take hours to finish)"
- emake regression
+ emake certify-books
fi
}
src_install() {
- SAVED_NAME=saved_acl2h
+ SAVED_NAME=saved_acl2
sed -e "s:${S}:/usr/share/acl2:g" -i ${SAVED_NAME} || die
if use books; then
sed -e "/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/" \
-i ${SAVED_NAME} || die
fi
dobin ${SAVED_NAME}
- dosym ${SAVED_NAME} /usr/bin/saved_acl2
insinto /usr/share/acl2
doins TAGS ${SAVED_NAME}.core
diff --git a/sci-mathematics/acl2/metadata.xml b/sci-mathematics/acl2/metadata.xml
index 672cea888..0782df404 100644
--- a/sci-mathematics/acl2/metadata.xml
+++ b/sci-mathematics/acl2/metadata.xml
@@ -19,6 +19,6 @@ Software System Award.
</flag>
</use>
<upstream>
- <remote-id type="github">acl2/acl2</remote-id>
+ <remote-id type="github">acl2-devel/acl2-devel</remote-id>
</upstream>
</pkgmetadata>