1 |
commit: b4f72187a5b3973e5afeb7c09a04735d46a9f932 |
2 |
Author: zcj <ustcscgy <AT> 163 <DOT> com> |
3 |
AuthorDate: Wed Mar 25 12:27:42 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 25 12:27:42 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b4f72187 |
7 |
|
8 |
sci-mathematics/acl2: Version bump, drop old; USE flags change. |
9 |
|
10 |
sci-mathematics/acl2/ChangeLog | 9 +++- |
11 |
sci-mathematics/acl2/acl2-6.3.ebuild | 69 --------------------------- |
12 |
sci-mathematics/acl2/acl2-7.0.ebuild | 50 +++++++++++++++++++ |
13 |
sci-mathematics/acl2/files/set-booksdir.patch | 11 ----- |
14 |
sci-mathematics/acl2/metadata.xml | 20 +++----- |
15 |
5 files changed, 63 insertions(+), 96 deletions(-) |
16 |
|
17 |
diff --git a/sci-mathematics/acl2/ChangeLog b/sci-mathematics/acl2/ChangeLog |
18 |
index 995db65..baff65a 100644 |
19 |
--- a/sci-mathematics/acl2/ChangeLog |
20 |
+++ b/sci-mathematics/acl2/ChangeLog |
21 |
@@ -1,7 +1,13 @@ |
22 |
# ChangeLog for sci-mathematics/acl2 |
23 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
24 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
25 |
# $Header: $ |
26 |
|
27 |
+*acl2-7.0 (25 Mar 2015) |
28 |
+ |
29 |
+ 25 Mar 2015; zcj <ustcscgy@×××.com> +acl2-7.0.ebuild, -acl2-6.3.ebuild, |
30 |
+ -files/set-booksdir.patch, metadata.xml: |
31 |
+ sci-mathematics/acl2: sci-mathematics/acl2 version bump, drop old |
32 |
+ |
33 |
12 Nov 2014; Justin Lecher <jlec@g.o> -acl2-4.2.ebuild, |
34 |
-acl2-4.3.ebuild: |
35 |
Drop old |
36 |
@@ -28,4 +34,3 @@ |
37 |
|
38 |
12 Apr 2011; Dongxu Li <dongxuli2011@×××××.com> +acl2-4.2.ebuild +ChangeLog +metadata.xml : |
39 |
Initial import. #49316 |
40 |
- |
41 |
|
42 |
diff --git a/sci-mathematics/acl2/acl2-6.3.ebuild b/sci-mathematics/acl2/acl2-6.3.ebuild |
43 |
deleted file mode 100644 |
44 |
index 5302b3c..0000000 |
45 |
--- a/sci-mathematics/acl2/acl2-6.3.ebuild |
46 |
+++ /dev/null |
47 |
@@ -1,69 +0,0 @@ |
48 |
-# Copyright 1999-2014 Gentoo Foundation |
49 |
-# Distributed under the terms of the GNU General Public License v2 |
50 |
-# $Header: $ |
51 |
- |
52 |
-EAPI=5 |
53 |
- |
54 |
-inherit eutils |
55 |
- |
56 |
-DESCRIPTION="ACL2 industrial strength theorem prover" |
57 |
-HOMEPAGE="http://www.cs.utexas.edu/users/moore/acl2/" |
58 |
-SRC_URI=" |
59 |
- http://www.cs.utexas.edu/users/moore/${PN}/v${PV/\./-}/distrib/${PN}.tar.gz -> ${P}.tar.gz |
60 |
- books? ( https://acl2-books.googlecode.com/files/books-${PV}.tar.gz |
61 |
- workshops? ( http://acl2-books.googlecode.com/files/workshops-${PV}.tar.gz ) )" |
62 |
- |
63 |
-SLOT="0" |
64 |
-LICENSE="BSD" |
65 |
-KEYWORDS="~amd64 ~x86" |
66 |
-IUSE="+books workshops html" |
67 |
- |
68 |
-REQUIRED_USE="workshops? ( books )" |
69 |
- |
70 |
-DEPEND=" |
71 |
- dev-lisp/sbcl |
72 |
- books? ( dev-lang/perl )" |
73 |
-RDEPEND="${DEPEND}" |
74 |
- |
75 |
-S="${WORKDIR}/${PN}-sources" |
76 |
- |
77 |
-src_unpack() { |
78 |
- default |
79 |
- if use books; then |
80 |
- mv "${WORKDIR}/books" "${S}"/ || die |
81 |
- if use workshops; then |
82 |
- mv "${WORKDIR}/workshops" "${S}/books/" || die |
83 |
- fi |
84 |
- fi |
85 |
-} |
86 |
- |
87 |
-src_compile() { |
88 |
- emake LISP="sbcl --noinform --noprint" |
89 |
- |
90 |
- if use books; then |
91 |
- echo |
92 |
- einfo "Building certificates ..." |
93 |
- einfo "(this may take hours to finish)" |
94 |
- emake regression |
95 |
- fi |
96 |
-} |
97 |
- |
98 |
-src_install() { |
99 |
- sed -e "s:${S}:/usr/share/acl2:g" -i saved_acl2 || die |
100 |
- if use books; then |
101 |
- sed -e "/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/" \ |
102 |
- -i saved_acl2 || die |
103 |
- fi |
104 |
- dobin saved_acl2 |
105 |
- |
106 |
- insinto /usr/share/acl2 |
107 |
- doins TAGS saved_acl2.core |
108 |
- if use books; then |
109 |
- doins -r books |
110 |
- fi |
111 |
- |
112 |
- if use html; then |
113 |
- dohtml -r doc/HTML |
114 |
- fi |
115 |
- doinfo doc/EMACS/* |
116 |
-} |
117 |
|
118 |
diff --git a/sci-mathematics/acl2/acl2-7.0.ebuild b/sci-mathematics/acl2/acl2-7.0.ebuild |
119 |
new file mode 100644 |
120 |
index 0000000..c1bfb90 |
121 |
--- /dev/null |
122 |
+++ b/sci-mathematics/acl2/acl2-7.0.ebuild |
123 |
@@ -0,0 +1,50 @@ |
124 |
+# Copyright 1999-2015 Gentoo Foundation |
125 |
+# Distributed under the terms of the GNU General Public License v2 |
126 |
+# $Header: $ |
127 |
+ |
128 |
+EAPI=5 |
129 |
+ |
130 |
+inherit eutils |
131 |
+ |
132 |
+DESCRIPTION="Industrial strength theorem prover" |
133 |
+HOMEPAGE="http://www.cs.utexas.edu/users/moore/acl2/" |
134 |
+SRC_URI="https://github.com/acl2/acl2/archive/${PV}.tar.gz -> ${P}.tar.gz" |
135 |
+ |
136 |
+SLOT="0" |
137 |
+LICENSE="BSD" |
138 |
+KEYWORDS="~amd64 ~x86" |
139 |
+IUSE="books" |
140 |
+ |
141 |
+DEPEND=" |
142 |
+ dev-lisp/sbcl:= |
143 |
+ books? ( dev-lang/perl )" |
144 |
+RDEPEND="${DEPEND}" |
145 |
+ |
146 |
+src_compile() { |
147 |
+ emake LISP="sbcl --noinform --noprint \ |
148 |
+ --no-sysinit --no-userinit --disable-debugger" |
149 |
+ |
150 |
+ if use books; then |
151 |
+ echo |
152 |
+ einfo "Building certificates ..." |
153 |
+ einfo "(this may take hours to finish)" |
154 |
+ emake regression |
155 |
+ fi |
156 |
+} |
157 |
+ |
158 |
+src_install() { |
159 |
+ SAVED_NAME=saved_acl2h |
160 |
+ sed -e "s:${S}:/usr/share/acl2:g" -i ${SAVED_NAME} || die |
161 |
+ if use books; then |
162 |
+ sed -e "/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/" \ |
163 |
+ -i ${SAVED_NAME} || die |
164 |
+ fi |
165 |
+ dobin ${SAVED_NAME} |
166 |
+ dosym ${SAVED_NAME} /usr/bin/saved_acl2 |
167 |
+ |
168 |
+ insinto /usr/share/acl2 |
169 |
+ doins TAGS ${SAVED_NAME}.core |
170 |
+ if use books; then |
171 |
+ doins -r books |
172 |
+ fi |
173 |
+} |
174 |
|
175 |
diff --git a/sci-mathematics/acl2/files/set-booksdir.patch b/sci-mathematics/acl2/files/set-booksdir.patch |
176 |
deleted file mode 100644 |
177 |
index 4f4d433..0000000 |
178 |
--- a/sci-mathematics/acl2/files/set-booksdir.patch |
179 |
+++ /dev/null |
180 |
@@ -1,11 +0,0 @@ |
181 |
---- a/books/Makefile-generic 2011-04-12 14:42:17.790165650 -0400 |
182 |
-+++ b/books/Makefile-generic 2011-04-12 14:55:54.436829607 -0400 |
183 |
-@@ -55,7 +55,7 @@ |
184 |
- # Determine the location of this Makefile-generic. NOTE: We have |
185 |
- # tried $(realpath $(dir ...)) and similarly for abspath, but they |
186 |
- # have returned the empty string, presumably an error. |
187 |
--BOOKS_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) |
188 |
-+BOOKS_DIR := /usr/share/acl2/books/ |
189 |
- |
190 |
- # and use that to determine the default location of ACL2. To override, |
191 |
- # set the ACL2 variable on the command line or in the environment. |
192 |
|
193 |
diff --git a/sci-mathematics/acl2/metadata.xml b/sci-mathematics/acl2/metadata.xml |
194 |
index d0675a2..47ab9ca 100644 |
195 |
--- a/sci-mathematics/acl2/metadata.xml |
196 |
+++ b/sci-mathematics/acl2/metadata.xml |
197 |
@@ -5,25 +5,17 @@ |
198 |
<maintainer> |
199 |
<email>dongxuli2011@×××××.com</email> |
200 |
<name>Dongxu Li</name> |
201 |
- <description>ACL2 industrial strength theorem prover</description> |
202 |
+ <description>Industrial strength theorem prover</description> |
203 |
</maintainer> |
204 |
<longdescription> |
205 |
-ACL2 is both a programming language in which you can model computer systems and |
206 |
-a tool to help you prove properties of those models. ACL2 is part of the |
207 |
-Boyer-Moore family of provers, for which its authors have received the 2005 ACM |
208 |
+ACL2 is both a programming language in which you can model computer systems and |
209 |
+a tool to help you prove properties of those models. ACL2 is part of the |
210 |
+Boyer-Moore family of provers, for which its authors have received the 2005 ACM |
211 |
Software System Award. |
212 |
-</longdescription> |
213 |
+ </longdescription> |
214 |
<use> |
215 |
<flag name="books"> |
216 |
build community books, the canonical collection of open-source libraries |
217 |
-</flag> |
218 |
- </use> |
219 |
- <use> |
220 |
- <flag name="html"> Install HTML documentation</flag> |
221 |
- </use> |
222 |
- <use> |
223 |
- <flag name="workshops"> |
224 |
- build community books from ACL2 community workshops |
225 |
-</flag> |
226 |
+ </flag> |
227 |
</use> |
228 |
</pkgmetadata> |