Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/coq/, sci-mathematics/coq/files/
Date: Mon, 23 Jan 2017 09:19:19
Message-Id: 1485162270.50e4df3eca96ce158fd0e386259d47645a7a57e6.aballier@gentoo
1 commit: 50e4df3eca96ce158fd0e386259d47645a7a57e6
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 23 09:04:30 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 23 09:04:30 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50e4df3e
7
8 sci-mathematics/coq: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 sci-mathematics/coq/Manifest | 2 -
13 sci-mathematics/coq/coq-8.5_p1.ebuild | 97 -----------------------------------
14 sci-mathematics/coq/coq-8.5_p2.ebuild | 96 ----------------------------------
15 sci-mathematics/coq/files/oc43.patch | 13 -----
16 4 files changed, 208 deletions(-)
17
18 diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
19 index 9cf421c..b9eb71d 100644
20 --- a/sci-mathematics/coq/Manifest
21 +++ b/sci-mathematics/coq/Manifest
22 @@ -1,5 +1,3 @@
23 DIST coq-8.5.tar.gz 5346653 SHA256 89a92fb8b91e7cb0797d41c87cd13e4b63bee76c32a6dcc3d7c8055ca6a9ae3d SHA512 28835a9dc4c926f97b14d23fe746e45e17942003e29807ec59f301eb0b697d704f05afc4cccd31b83bc27e9877d079d00e94a2101ba16ae32f4134e90ad011fb WHIRLPOOL 30925b92f71ba606e43f1b46368822e8d6f6e6c1ae500c8fe1fc912c4ef0608c6db3c070d37ffabbd0e054eac0ff7d1b1e46eae33b73149bf238101b20a0f6d2
24 -DIST coq-8.5pl1.tar.gz 5364928 SHA256 97047fc5e628f22e308efd3e86f625ae0504507decb96f2541e8e67eeaac20e8 SHA512 d907398e293cfc708c9314b3bbd57abf0806883cc1891d2b428f24e338953147586c0754e880fe679dfa893278335376287f6667db6c83dc7cb44a9e8afaddd1 WHIRLPOOL 7c65fd6a6804691492968d8b38cbbd34ac3fb9773cdea368679c206f735400d378e6d3786ce1955b22ac5ec4811beefaf83a6b656fb46a855e75c00c00608f21
25 -DIST coq-8.5pl2.tar.gz 5321862 SHA256 83239d1251bf6c54a9ca5045d738e469019b93ca601756bf982aab0654e4de73 SHA512 0a0c7678eb92bbf3328a9667c66ff3bf59bc7fa6dea790ac1e1b2f4a7ab3121fb1ff01d18c2fc1bed53455286d0c507fe73cfccc1680ed3a219e773ab299f3af WHIRLPOOL 89b632538fd10afd2257aaf2b0acb26f4d2d49a7492583c039f88df6876ac27fc804b5854ee353d98cda64c2da3bf5571d7b9fde1cb9ceb50a90769633de18c7
26 DIST coq-8.5pl3.tar.gz 5335502 SHA256 305b92e05d406d4d0c64f43d4fadb6b89419120a1d4ae4115ed1c5eb8812d33b SHA512 3093c71769135479526a6ffea05929fe640046fd376e4369a0f8308915d0eeac3330a62d3309bd062a9dd46739bd2497d43e4885ed188a8e4d9b7ca016e89402 WHIRLPOOL 95798242e7b808776f97c3c7896c100f89bacba4978c7179b6275a02c1db9ab8f3c01a823ba5d9d276ca5defabea24db296e70dc2ac9525ec64aa88dead94281
27 DIST coq-8.6.tar.gz 5538848 SHA256 6e3c3cf5c8e2b0b760dc52738e2e849f3a8c630869659ecc0cf41413fcee81df SHA512 9f5f4913fda8cf83683fec9398b42d4567207c3d4b52b4638d5e09a24ed25a43905fb57a9fac1bb9f9d681bd47f3560e1da74e79348b3a3fd93e2e8c686cebae WHIRLPOOL 714226c0f9138ea7dc9828db6dbc59e9b6e0c18ae305fc1a67c5c1c7a950ec1deabd37f462e20d1d1ddbd148a8bc3845a72f88f5ef6cbd4f93abfd02539dbcbc
28
29 diff --git a/sci-mathematics/coq/coq-8.5_p1.ebuild b/sci-mathematics/coq/coq-8.5_p1.ebuild
30 deleted file mode 100644
31 index b1cc467..00000000
32 --- a/sci-mathematics/coq/coq-8.5_p1.ebuild
33 +++ /dev/null
34 @@ -1,97 +0,0 @@
35 -# Copyright 1999-2015 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI="5"
40 -
41 -inherit eutils multilib
42 -
43 -MY_PV=${PV/_p/pl}
44 -MY_P=${PN}-${MY_PV}
45 -
46 -DESCRIPTION="Proof assistant written in O'Caml"
47 -HOMEPAGE="http://coq.inria.fr/"
48 -SRC_URI="http://${PN}.inria.fr/distrib/V${MY_PV}/files/${MY_P}.tar.gz"
49 -
50 -LICENSE="LGPL-2.1"
51 -SLOT="0"
52 -KEYWORDS="~amd64 ~ppc ~x86"
53 -IUSE="gtk debug +ocamlopt doc camlp5"
54 -
55 -RDEPEND="
56 - >=dev-lang/ocaml-3.11.2:=[ocamlopt?]
57 - camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
58 - !camlp5? ( dev-ml/camlp4:= )
59 - gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] )"
60 -DEPEND="${RDEPEND}
61 - doc? (
62 - media-libs/netpbm[png,zlib]
63 - virtual/latex-base
64 - dev-tex/hevea
65 - dev-tex/xcolor
66 - dev-texlive/texlive-pictures
67 - dev-texlive/texlive-mathextra
68 - dev-texlive/texlive-latexextra
69 - )"
70 -
71 -S=${WORKDIR}/${MY_P}
72 -
73 -src_prepare() {
74 - epatch "${FILESDIR}/${PN}-8.5-do-not-install-revision.patch"
75 - epatch "${FILESDIR}/${PN}-8.4_p5-no-clean-before-test.patch"
76 - has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
77 -}
78 -
79 -src_configure() {
80 - ocaml_lib=$(ocamlc -where)
81 - local myconf=(
82 - -prefix /usr
83 - -bindir /usr/bin
84 - -libdir /usr/$(get_libdir)/coq
85 - -mandir /usr/share/man
86 - -emacslib /usr/share/emacs/site-lisp
87 - -coqdocdir /usr/$(get_libdir)/coq/coqdoc
88 - -docdir /usr/share/doc/${PF}
89 - -configdir /etc/xdg/${PN}
90 - -lablgtkdir ${ocaml_lib}/lablgtk2
91 - )
92 -
93 - use debug && myconf+=( -debug )
94 - use doc || myconf+=( -with-doc no )
95 -
96 - if use gtk; then
97 - if use ocamlopt; then
98 - myconf+=( -coqide opt )
99 - else
100 - myconf+=( -coqide byte )
101 - fi
102 - else
103 - myconf+=( -coqide no )
104 - fi
105 -
106 - use ocamlopt || myconf+=( -byte-only )
107 -
108 - if use camlp5; then
109 - myconf+=( -usecamlp5 -camlp5dir ${ocaml_lib}/camlp5 )
110 - else
111 - myconf+=( -usecamlp4 )
112 - fi
113 -
114 - export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
115 - ./configure ${myconf[@]} || die "configure failed"
116 -}
117 -
118 -src_compile() {
119 - emake STRIP="true" -j1 world VERBOSE=1
120 -}
121 -
122 -src_test() {
123 - emake STRIP="true" check VERBOSE=1
124 -}
125 -
126 -src_install() {
127 - emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
128 - dodoc README CREDITS CHANGES
129 -
130 - use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
131 -}
132
133 diff --git a/sci-mathematics/coq/coq-8.5_p2.ebuild b/sci-mathematics/coq/coq-8.5_p2.ebuild
134 deleted file mode 100644
135 index 5e04286..00000000
136 --- a/sci-mathematics/coq/coq-8.5_p2.ebuild
137 +++ /dev/null
138 @@ -1,96 +0,0 @@
139 -# Copyright 1999-2016 Gentoo Foundation
140 -# Distributed under the terms of the GNU General Public License v2
141 -# $Id$
142 -
143 -EAPI="5"
144 -
145 -inherit eutils multilib
146 -
147 -MY_PV=${PV/_p/pl}
148 -MY_P=${PN}-${MY_PV}
149 -
150 -DESCRIPTION="Proof assistant written in O'Caml"
151 -HOMEPAGE="http://coq.inria.fr/"
152 -SRC_URI="http://${PN}.inria.fr/distrib/V${MY_PV}/files/${MY_P}.tar.gz"
153 -
154 -LICENSE="LGPL-2.1"
155 -SLOT="0"
156 -KEYWORDS="~amd64 ~ppc ~x86"
157 -IUSE="gtk debug +ocamlopt doc camlp5"
158 -
159 -RDEPEND="
160 - >=dev-lang/ocaml-3.11.2:=[ocamlopt?]
161 - camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
162 - !camlp5? ( dev-ml/camlp4:= )
163 - gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] )"
164 -DEPEND="${RDEPEND}
165 - doc? (
166 - media-libs/netpbm[png,zlib]
167 - virtual/latex-base
168 - dev-tex/hevea
169 - dev-tex/xcolor
170 - dev-texlive/texlive-pictures
171 - dev-texlive/texlive-mathextra
172 - dev-texlive/texlive-latexextra
173 - )"
174 -
175 -S=${WORKDIR}/${MY_P}
176 -
177 -src_prepare() {
178 - epatch "${FILESDIR}/${PN}-8.5-do-not-install-revision.patch"
179 - epatch "${FILESDIR}/${PN}-8.4_p5-no-clean-before-test.patch"
180 -}
181 -
182 -src_configure() {
183 - ocaml_lib=$(ocamlc -where)
184 - local myconf=(
185 - -prefix /usr
186 - -bindir /usr/bin
187 - -libdir /usr/$(get_libdir)/coq
188 - -mandir /usr/share/man
189 - -emacslib /usr/share/emacs/site-lisp
190 - -coqdocdir /usr/$(get_libdir)/coq/coqdoc
191 - -docdir /usr/share/doc/${PF}
192 - -configdir /etc/xdg/${PN}
193 - -lablgtkdir ${ocaml_lib}/lablgtk2
194 - )
195 -
196 - use debug && myconf+=( -debug )
197 - use doc || myconf+=( -with-doc no )
198 -
199 - if use gtk; then
200 - if use ocamlopt; then
201 - myconf+=( -coqide opt )
202 - else
203 - myconf+=( -coqide byte )
204 - fi
205 - else
206 - myconf+=( -coqide no )
207 - fi
208 -
209 - use ocamlopt || myconf+=( -byte-only )
210 -
211 - if use camlp5; then
212 - myconf+=( -usecamlp5 -camlp5dir ${ocaml_lib}/camlp5 )
213 - else
214 - myconf+=( -usecamlp4 )
215 - fi
216 -
217 - export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
218 - ./configure ${myconf[@]} || die "configure failed"
219 -}
220 -
221 -src_compile() {
222 - emake STRIP="true" -j1 world VERBOSE=1
223 -}
224 -
225 -src_test() {
226 - emake STRIP="true" check VERBOSE=1
227 -}
228 -
229 -src_install() {
230 - emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
231 - dodoc README CREDITS CHANGES
232 -
233 - use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
234 -}
235
236 diff --git a/sci-mathematics/coq/files/oc43.patch b/sci-mathematics/coq/files/oc43.patch
237 deleted file mode 100644
238 index 47fa10a..00000000
239 --- a/sci-mathematics/coq/files/oc43.patch
240 +++ /dev/null
241 @@ -1,13 +0,0 @@
242 -Index: coq-8.5pl1/Makefile.common
243 -===================================================================
244 ---- coq-8.5pl1.orig/Makefile.common
245 -+++ coq-8.5pl1/Makefile.common
246 -@@ -231,7 +231,7 @@ endif
247 - LINKCMO:=$(CORECMA) $(STATICPLUGINS)
248 - LINKCMX:=$(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa)
249 -
250 --IDEDEPS:=lib/clib.cma lib/xml_lexer.cmo lib/xml_parser.cmo lib/xml_printer.cmo lib/errors.cmo lib/spawn.cmo
251 -+IDEDEPS:=lib/clib.cma lib/errors.cmo lib/spawn.cmo
252 - IDECMA:=ide/ide.cma
253 - IDETOPLOOPCMA=ide/coqidetop.cma
254 -