1 |
commit: e138bb5c3fba0f8a276b9edab767d1c628fbc53c |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 8 18:21:44 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 8 18:21:44 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e138bb5c |
7 |
|
8 |
sci-mathematics/agda: drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
sci-mathematics/agda/Manifest | 1 - |
14 |
sci-mathematics/agda/agda-2.4.2.5-r2.ebuild | 130 ------------------ |
15 |
sci-mathematics/agda/agda-2.5.2-r1.ebuild | 148 --------------------- |
16 |
.../agda/files/agda-2.4.2.5-hashtables.patch | 13 -- |
17 |
4 files changed, 292 deletions(-) |
18 |
|
19 |
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest |
20 |
index fa2726ed4da..797f3b17f0d 100644 |
21 |
--- a/sci-mathematics/agda/Manifest |
22 |
+++ b/sci-mathematics/agda/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST Agda-2.4.2.5.tar.gz 1031427 BLAKE2B bf64731e0c068c4f609e9651f0cb6ea763f1e02ddd8909269a140f8ebd036dbb5b36d9f1b038a32016447bbfbd4f9dd6a00a1cc34616efd7099a2b4ddcc7d3bc SHA512 c2e090a42f699200854c20dad868b4b67e99107f0cdbba20ed268f4618fcf80068ee31db37e4b6637f73128d9f652ef9276d8f7adea54628da759d79f5e4f4a2 |
25 |
DIST Agda-2.5.2.tar.gz 1240885 BLAKE2B bccdaa0c40b8e116f44ee436171cec0a8e1366d7b1f0b469bf459eacf4256e29a00c60a371dcf7971c499e948ce6264861016bb51fcad3251f62cb3e7370c19c SHA512 39ec73316eb7409f7f2618e86a9a3a2c420c93470bf46a1c37a4c4753c6c831d2d6da9ba007086ddee9defd481a695bf142a0a7d360dfa01bdb1fb92467af164 |
26 |
|
27 |
diff --git a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild |
28 |
deleted file mode 100644 |
29 |
index 63b99d3e1cb..00000000000 |
30 |
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,130 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=5 |
37 |
- |
38 |
-# ebuild generated by hackport 0.4.6.9999 |
39 |
- |
40 |
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour" |
41 |
-inherit haskell-cabal elisp-common |
42 |
- |
43 |
-MY_PN="Agda" |
44 |
-MY_P="${MY_PN}-${PV}" |
45 |
- |
46 |
-DESCRIPTION="A dependently typed functional programming language and proof assistant" |
47 |
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/" |
48 |
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" |
49 |
- |
50 |
-LICENSE="MIT" |
51 |
-SLOT="0/${PV}" |
52 |
-KEYWORDS="~amd64 ~x86" |
53 |
-IUSE="+cpphs +stdlib emacs" |
54 |
- |
55 |
-RDEPEND=">=dev-haskell/binary-0.7.2.1:=[profile?] <dev-haskell/binary-0.8:=[profile?] |
56 |
- >=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] |
57 |
- >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] |
58 |
- >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] |
59 |
- >=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] |
60 |
- >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] |
61 |
- >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] |
62 |
- >=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] |
63 |
- >=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] |
64 |
- >=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?] |
65 |
- >=dev-haskell/quickcheck-2.8:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] |
66 |
- >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?] |
67 |
- >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] |
68 |
- >=dev-haskell/transformers-compat-0.3.3.3:=[profile?] |
69 |
- >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] |
70 |
- >=dev-haskell/void-0.5.4:=[profile?] <dev-haskell/void-0.9:=[profile?] |
71 |
- >=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] |
72 |
- >=dev-haskell/zlib-0.4.0.1:=[profile?] |
73 |
- >=dev-lang/ghc-7.6.2:= |
74 |
- >=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] |
75 |
- >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] |
76 |
- >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] |
77 |
-" |
78 |
-RDEPEND+=" |
79 |
- emacs? ( >=app-editors/emacs-23.1:* |
80 |
- app-emacs/haskell-mode ) |
81 |
-" |
82 |
-PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${PV} )" |
83 |
-DEPEND="${RDEPEND} |
84 |
- dev-haskell/alex |
85 |
- >=dev-haskell/cabal-1.16.0 |
86 |
- dev-haskell/happy |
87 |
- cpphs? ( dev-haskell/cpphs ) |
88 |
-" |
89 |
-RDEPEND+="!sci-mathematics/agda-executable" |
90 |
- |
91 |
-SITEFILE="50${PN}2-gentoo.el" |
92 |
-S="${WORKDIR}/${MY_P}" |
93 |
- |
94 |
-src_prepare() { |
95 |
- epatch "${FILESDIR}"/${P}-hashtables.patch |
96 |
- |
97 |
- sed -e '/.*emacs-mode.*$/d' \ |
98 |
- -i "${S}/${MY_PN}.cabal" \ |
99 |
- || die "Could not remove agda-mode from ${MY_PN}.cabal" |
100 |
- sed -e '/^executable agda-mode$/a \ \ buildable: False' \ |
101 |
- -i "${S}/${MY_PN}.cabal" \ |
102 |
- || die "Could not remove agda-mode executable from ${MY_PN}.cabal" |
103 |
- |
104 |
- cabal_chdeps \ |
105 |
- 'zlib >= 0.4.0.1 && < 0.6.1' 'zlib >= 0.4.0.1' \ |
106 |
- 'transformers-compat >= 0.3.3.3 && < 0.5' 'transformers-compat >= 0.3.3.3' \ |
107 |
- 'build-tools: cpphs >= 1.19 && < 1.20' 'build-tools: cpphs >= 1.19' \ |
108 |
- 'alex >= 3.1.0 && < 3.2' 'alex >= 3.1.0' |
109 |
-} |
110 |
- |
111 |
-src_configure() { |
112 |
- haskell-cabal_src_configure \ |
113 |
- $(cabal_flag cpphs cpphs) |
114 |
-} |
115 |
- |
116 |
-src_compile() { |
117 |
- if use emacs; then |
118 |
- BYTECOMPFLAGS="-L ./src/data/emacs-mode" |
119 |
- elisp-compile src/data/emacs-mode/*.el \ |
120 |
- || die "Failed to compile emacs mode" |
121 |
- fi |
122 |
- haskell-cabal_src_compile |
123 |
-} |
124 |
- |
125 |
-src_test() { |
126 |
- export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
127 |
- |
128 |
- dist/build/agda/agda --test +RTS -M1g || die |
129 |
-} |
130 |
- |
131 |
-src_install() { |
132 |
- local add="${ED}"/usr/share/"${P}/ghc-$(ghc-version)" |
133 |
- |
134 |
- haskell-cabal_src_install |
135 |
- |
136 |
- export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
137 |
- # generate Primitive.agdai, emulate Setup.hs postinst phase |
138 |
- Agda_datadir="${add}" \ |
139 |
- "${ED}"/usr/bin/agda "${add}"/lib/prim/Agda/Primitive.agda \ |
140 |
- || die "Failed to build 'Primitive.agdai'" |
141 |
- |
142 |
- if use emacs; then |
143 |
- elisp-install ${PN} src/data/emacs-mode/*.el \ |
144 |
- || die "Failed to install emacs mode" |
145 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ |
146 |
- || die "Failed to install elisp site file" |
147 |
- fi |
148 |
-} |
149 |
- |
150 |
-pkg_postinst() { |
151 |
- haskell-cabal_pkg_postinst |
152 |
- if use emacs; then |
153 |
- elisp-site-regen |
154 |
- fi |
155 |
-} |
156 |
- |
157 |
-pkg_postrm() { |
158 |
- haskell-cabal_pkg_postrm |
159 |
- if use emacs; then |
160 |
- elisp-site-regen |
161 |
- fi |
162 |
-} |
163 |
|
164 |
diff --git a/sci-mathematics/agda/agda-2.5.2-r1.ebuild b/sci-mathematics/agda/agda-2.5.2-r1.ebuild |
165 |
deleted file mode 100644 |
166 |
index 1c7e55a7ad8..00000000000 |
167 |
--- a/sci-mathematics/agda/agda-2.5.2-r1.ebuild |
168 |
+++ /dev/null |
169 |
@@ -1,148 +0,0 @@ |
170 |
-# Copyright 1999-2020 Gentoo Authors |
171 |
-# Distributed under the terms of the GNU General Public License v2 |
172 |
- |
173 |
-EAPI=6 |
174 |
- |
175 |
-# ebuild generated by hackport 0.5.1 |
176 |
- |
177 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour" |
178 |
-inherit haskell-cabal elisp-common |
179 |
- |
180 |
-MY_PN="Agda" |
181 |
-MY_P="${MY_PN}-${PV}" |
182 |
- |
183 |
-## shared with sci-mathematics/agda-stdlib |
184 |
-# upstream does not maintain version ordering: |
185 |
-# https://github.com/agda/agda-stdlib/releases |
186 |
-# 0.11 -> 2.5.0.20160213 -> 2.5.0.20160412 -> 0.12 |
187 |
-# As Agda-stdlib is tied to Agda version we encode |
188 |
-# both versions in gentoo version. |
189 |
-## |
190 |
-MY_UPSTREAM_AGDA_STDLIB_V="0.13" |
191 |
-MY_GENTOO_AGDA_STDLIB_V="${PV}.${MY_UPSTREAM_AGDA_STDLIB_V}" |
192 |
- |
193 |
-DESCRIPTION="A dependently typed functional programming language and proof assistant" |
194 |
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/" |
195 |
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" |
196 |
- |
197 |
-LICENSE="MIT" |
198 |
-SLOT="0/${PV}" |
199 |
-KEYWORDS="~amd64 ~x86" |
200 |
-IUSE="+cpphs debug uhc +stdlib emacs" |
201 |
- |
202 |
-RESTRICT=test # Unrecognized option: --test (did you mean any of --help --js --css ?) |
203 |
- |
204 |
-RDEPEND=">=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] |
205 |
- >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] |
206 |
- >=dev-haskell/edisoncore-1.3.1.1:=[profile?] <dev-haskell/edisoncore-1.3.2:=[profile?] |
207 |
- >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] |
208 |
- >=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] |
209 |
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] |
210 |
- >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] |
211 |
- >=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] |
212 |
- >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] |
213 |
- >=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] |
214 |
- >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?] |
215 |
- >=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?] |
216 |
- >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] |
217 |
- >=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?] |
218 |
- >=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?] |
219 |
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] |
220 |
- >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?] |
221 |
- >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] |
222 |
- >=dev-haskell/transformers-compat-0.3.3.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] |
223 |
- >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] |
224 |
- >=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] |
225 |
- >=dev-haskell/zlib-0.4.0.1:=[profile?] |
226 |
- >=dev-lang/ghc-7.10.1:= |
227 |
- >=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] |
228 |
- >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] |
229 |
- uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?] |
230 |
- >=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?] |
231 |
- >=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?] |
232 |
- >=dev-haskell/uulib-0.9.20:=[profile?] ) |
233 |
-" |
234 |
-RDEPEND+=" |
235 |
- emacs? ( >=app-editors/emacs-23.1:* |
236 |
- app-emacs/haskell-mode ) |
237 |
-" |
238 |
-PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${MY_GENTOO_AGDA_STDLIB_V} )" |
239 |
-DEPEND="${RDEPEND} |
240 |
- dev-haskell/alex |
241 |
- >=dev-haskell/cabal-1.22.2.0 |
242 |
- dev-haskell/happy |
243 |
- cpphs? ( dev-haskell/cpphs ) |
244 |
-" |
245 |
-RDEPEND+="!sci-mathematics/agda-executable" |
246 |
- |
247 |
-SITEFILE="50${PN}2-gentoo.el" |
248 |
-S="${WORKDIR}/${MY_P}" |
249 |
- |
250 |
-src_prepare() { |
251 |
- default |
252 |
- if ! use emacs; then |
253 |
- sed -e '/.*emacs-mode.*$/d' \ |
254 |
- -i "${S}/${MY_PN}.cabal" \ |
255 |
- || die "Could not remove agda-mode from ${MY_PN}.cabal" |
256 |
- fi |
257 |
-} |
258 |
- |
259 |
-src_configure() { |
260 |
- haskell-cabal_src_configure \ |
261 |
- $(cabal_flag cpphs cpphs) \ |
262 |
- $(cabal_flag debug debug) \ |
263 |
- $(cabal_flag uhc uhc) |
264 |
-} |
265 |
- |
266 |
-src_compile() { |
267 |
- if use emacs; then |
268 |
- BYTECOMPFLAGS="-L ./src/data/emacs-mode" |
269 |
- elisp-compile src/data/emacs-mode/*.el \ |
270 |
- || die "Failed to compile emacs mode" |
271 |
- fi |
272 |
- haskell-cabal_src_compile |
273 |
-} |
274 |
- |
275 |
-src_test() { |
276 |
- export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
277 |
- |
278 |
- dist/build/agda/agda --test +RTS -M1g || die |
279 |
-} |
280 |
- |
281 |
-src_install() { |
282 |
- local add="${ED}"/usr/share/"${P}/ghc-$(ghc-version)" |
283 |
- |
284 |
- haskell-cabal_src_install |
285 |
- |
286 |
- export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
287 |
- # compile Agda.Primitive and Agda.Builtin modules, emulate Setup.hs postinst phase |
288 |
- Agda_datadir="${add}" \ |
289 |
- "${ED}"/usr/bin/agda "${add}"/lib/prim/Agda/Primitive.agda \ |
290 |
- || die "Failed to build 'Primitive.agdai'" |
291 |
- for file in "${add}"/lib/prim/Agda/Builtin/*.agda; do |
292 |
- Agda_datadir="${add}" \ |
293 |
- "${ED}"/usr/bin/agda "${file}" \ |
294 |
- || die "Failed to build '${file}'" |
295 |
- done |
296 |
- |
297 |
- if use emacs; then |
298 |
- elisp-install ${PN} src/data/emacs-mode/*.el \ |
299 |
- || die "Failed to install emacs mode" |
300 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ |
301 |
- || die "Failed to install elisp site file" |
302 |
- fi |
303 |
-} |
304 |
- |
305 |
-pkg_postinst() { |
306 |
- haskell-cabal_pkg_postinst |
307 |
- if use emacs; then |
308 |
- elisp-site-regen |
309 |
- fi |
310 |
-} |
311 |
- |
312 |
-pkg_postrm() { |
313 |
- haskell-cabal_pkg_postrm |
314 |
- if use emacs; then |
315 |
- elisp-site-regen |
316 |
- fi |
317 |
-} |
318 |
|
319 |
diff --git a/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch b/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch |
320 |
deleted file mode 100644 |
321 |
index 9bba347fa29..00000000000 |
322 |
--- a/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch |
323 |
+++ /dev/null |
324 |
@@ -1,13 +0,0 @@ |
325 |
-diff --git a/src/full/Agda/Utils/HashMap.hs b/src/full/Agda/Utils/HashMap.hs |
326 |
-index 5e1da8b..7c34548 100644 |
327 |
---- a/src/full/Agda/Utils/HashMap.hs |
328 |
-+++ b/src/full/Agda/Utils/HashMap.hs |
329 |
-@@ -5,7 +5,7 @@ module Agda.Utils.HashMap |
330 |
- ) where |
331 |
- |
332 |
- import Data.Hashable |
333 |
--import Data.HashMap.Strict as HashMap |
334 |
-+import Data.HashMap.Strict as HashMap (HashMap, filter, lookup, insert, delete, empty, insertWith, toList, adjust, union, unionWith, elems, fromList, (!), keys, map, unions, foldr) |
335 |
- import qualified Data.Maybe as Maybe |
336 |
- |
337 |
- -- | Like 'Data.Map.Strict.mapMaybe'. |