1 |
commit: 748646f321601c12ab799437b9774e158fd902b8 |
2 |
Author: Lucas Mitrak <lucas <AT> lucasmitrak <DOT> com> |
3 |
AuthorDate: Sun Sep 19 06:10:09 2021 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 20 08:52:33 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=748646f3 |
7 |
|
8 |
sci-mathematics/acl2: Update 8.3 to the original intended ebuild |
9 |
|
10 |
* Update 8.3's ebuild to the one originally intended for 8.3 |
11 |
|
12 |
Currently, sci-mathematics/acl2-8.3 will not compile to the fixed bug |
13 |
755368 [1]. This bug was fixed in PR 1109 on github [2]. However, due |
14 |
to a version bump, acl2-8.3 remains unchanged. Therefore the ebuild for |
15 |
8.3 should be updated to the original PR. acl2-8.3 was tested to |
16 |
work with the latest unstable version of sbcl-2.1.8. With this commit, |
17 |
acl2-8.3 will install successfully. Without this commit, it will not. |
18 |
|
19 |
[1] https://bugs.gentoo.org/755368 |
20 |
[2] https://github.com/gentoo/sci/pull/1109 |
21 |
|
22 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
23 |
Signed-off-by: Lucas Mitrak <lucas <AT> lucasmitrak.com> |
24 |
Closes: https://github.com/gentoo/sci/pull/1114 |
25 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
26 |
|
27 |
sci-mathematics/acl2/acl2-8.3-r1.ebuild | 86 +++++++++++++++++++++++++++++++++ |
28 |
sci-mathematics/acl2/acl2-8.3.ebuild | 51 ------------------- |
29 |
2 files changed, 86 insertions(+), 51 deletions(-) |
30 |
|
31 |
diff --git a/sci-mathematics/acl2/acl2-8.3-r1.ebuild b/sci-mathematics/acl2/acl2-8.3-r1.ebuild |
32 |
new file mode 100644 |
33 |
index 000000000..d0bb4eade |
34 |
--- /dev/null |
35 |
+++ b/sci-mathematics/acl2/acl2-8.3-r1.ebuild |
36 |
@@ -0,0 +1,86 @@ |
37 |
+# Copyright 1999-2021 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=8 |
41 |
+ |
42 |
+inherit elisp-common |
43 |
+ |
44 |
+DESCRIPTION="Industrial strength theorem prover" |
45 |
+HOMEPAGE="https://www.cs.utexas.edu/users/moore/acl2/" |
46 |
+SRC_URI="https://github.com/acl2/acl2/archive/${PV}/${P}.tar.gz" |
47 |
+ |
48 |
+SLOT="0" |
49 |
+LICENSE="BSD" |
50 |
+KEYWORDS="~amd64 ~x86" |
51 |
+IUSE="books doc emacs" |
52 |
+ |
53 |
+BDEPEND=" |
54 |
+ dev-lisp/sbcl |
55 |
+ emacs? ( >=app-editors/emacs-23.1:* ) |
56 |
+" |
57 |
+DEPEND=" |
58 |
+ dev-lisp/sbcl:= |
59 |
+ books? ( dev-lang/perl ) |
60 |
+ doc? ( dev-lang/perl ) |
61 |
+" |
62 |
+RDEPEND="${DEPEND}" |
63 |
+ |
64 |
+PATCHES=( "${FILESDIR}"/${PN}-use_make_variable.patch ) |
65 |
+ |
66 |
+src_prepare() { |
67 |
+ find . -type f -name "*.bak" -delete |
68 |
+ find . -type f -name "*.orig" -delete |
69 |
+ # Remove sparc binary inadvertently included in upstream |
70 |
+ rm books/workshops/2003/schmaltz-al-sammane-et-al/support/acl2link || die |
71 |
+ default |
72 |
+} |
73 |
+ |
74 |
+src_compile() { |
75 |
+ emake LISP="sbcl --noinform --noprint \ |
76 |
+ --no-sysinit --no-userinit --disable-debugger" |
77 |
+ |
78 |
+ if use books; then |
79 |
+ emake "ACL2=${S}/saved_acl2" basic |
80 |
+ fi |
81 |
+ |
82 |
+ if use doc; then |
83 |
+ emake "ACL2=${S}/saved_acl2" DOC |
84 |
+ fi |
85 |
+ |
86 |
+ if use emacs; then |
87 |
+ elisp-compile emacs/*.el |
88 |
+ fi |
89 |
+} |
90 |
+ |
91 |
+src_install() { |
92 |
+ local SAVED_NAME=saved_acl2 |
93 |
+ sed -e "s:${S}:/usr/share/acl2:g" -i ${SAVED_NAME} || die |
94 |
+ dobin ${SAVED_NAME} |
95 |
+ |
96 |
+ insinto /usr/share/acl2 |
97 |
+ doins ${SAVED_NAME}.core |
98 |
+ if use books; then |
99 |
+ sed -e "/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/" \ |
100 |
+ -i ${SAVED_NAME} || die |
101 |
+ doins -r books |
102 |
+ fi |
103 |
+ |
104 |
+ DOCS=( books/README.md ) |
105 |
+ if use doc; then |
106 |
+ HTML_DOCS=( doc/HTML/. ) |
107 |
+ fi |
108 |
+ einstalldocs |
109 |
+ |
110 |
+ if use emacs; then |
111 |
+ elisp-install ${PN} emacs/*{.el,elc} |
112 |
+ doins TAGS |
113 |
+ fi |
114 |
+} |
115 |
+ |
116 |
+pkg_postinst() { |
117 |
+ use emacs && elisp-site-regen |
118 |
+} |
119 |
+ |
120 |
+pkg_postrm() { |
121 |
+ use emacs && elisp-site-regen |
122 |
+} |
123 |
|
124 |
diff --git a/sci-mathematics/acl2/acl2-8.3.ebuild b/sci-mathematics/acl2/acl2-8.3.ebuild |
125 |
deleted file mode 100644 |
126 |
index 63326e257..000000000 |
127 |
--- a/sci-mathematics/acl2/acl2-8.3.ebuild |
128 |
+++ /dev/null |
129 |
@@ -1,51 +0,0 @@ |
130 |
-# Copyright 1999-2021 Gentoo Authors |
131 |
-# Distributed under the terms of the GNU General Public License v2 |
132 |
- |
133 |
-EAPI=7 |
134 |
- |
135 |
-inherit eutils |
136 |
- |
137 |
-DESCRIPTION="Industrial strength theorem prover" |
138 |
-HOMEPAGE="https://www.cs.utexas.edu/users/moore/acl2/" |
139 |
-MY_PN=${PN}-devel |
140 |
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${P}.tar.gz" |
141 |
- |
142 |
-SLOT="0" |
143 |
-LICENSE="BSD" |
144 |
-KEYWORDS="~amd64 ~x86" |
145 |
-IUSE="books" |
146 |
- |
147 |
-BDEPEND="dev-lisp/sbcl" |
148 |
-DEPEND=" |
149 |
- dev-lisp/sbcl:= |
150 |
- books? ( dev-lang/perl ) |
151 |
-" |
152 |
-RDEPEND="${DEPEND}" |
153 |
- |
154 |
-src_compile() { |
155 |
- emake LISP="sbcl --noinform --noprint \ |
156 |
- --no-sysinit --no-userinit --disable-debugger" |
157 |
- |
158 |
- if use books; then |
159 |
- echo |
160 |
- einfo "Building certificates ..." |
161 |
- einfo "(this may take hours to finish)" |
162 |
- emake certify-books |
163 |
- fi |
164 |
-} |
165 |
- |
166 |
-src_install() { |
167 |
- SAVED_NAME=saved_acl2 |
168 |
- sed -e "s:${S}:/usr/share/acl2:g" -i ${SAVED_NAME} || die |
169 |
- if use books; then |
170 |
- sed -e "/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/" \ |
171 |
- -i ${SAVED_NAME} || die |
172 |
- fi |
173 |
- dobin ${SAVED_NAME} |
174 |
- |
175 |
- insinto /usr/share/acl2 |
176 |
- doins TAGS ${SAVED_NAME}.core |
177 |
- if use books; then |
178 |
- doins -r books |
179 |
- fi |
180 |
-} |