Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/octave: octave-3.8.1.ebuild octave-3.6.4-r1.ebuild octave-3.6.4.ebuild octave-4.0.0.ebuild octave-3.8.1-r1.ebuild octave-3.8.2.ebuild ChangeLog
Date: Tue, 07 Jul 2015 13:25:39
Message-Id: 20150707132535.B5900758@oystercatcher.gentoo.org
1 gienah 15/07/07 13:25:35
2
3 Modified: octave-3.8.1.ebuild octave-3.6.4-r1.ebuild
4 octave-3.6.4.ebuild octave-3.8.1-r1.ebuild
5 octave-3.8.2.ebuild ChangeLog
6 Added: octave-4.0.0.ebuild
7 Log:
8 Bump octave to 4.0.0, fixes Bug 550858 - sci-mathematics/octave-4.0 version bump, thanks to Bohdan Trach for reporting. octave 4.0.0 allows llvm 3.5, fixing Bug 531672 - sci-mathematics/octave-3.8.2 USE=jit depends on <sys-devel/llvm-3.5, thanks to Juergen Rose for reporting and eroen for an upstream bug reference. Fix Bug 539886 - sci-mathematics/octave-3.8.2 should depend on x11-libs/fltk[opengl,xft], thanks to Andreas Fink for reporting and the fix.
9
10 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
11
12 Revision Changes Path
13 1.3 sci-mathematics/octave/octave-3.8.1.ebuild
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild?rev=1.3&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild?rev=1.3&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild?r1=1.2&r2=1.3
18
19 Index: octave-3.8.1.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild,v
22 retrieving revision 1.2
23 retrieving revision 1.3
24 diff -u -r1.2 -r1.3
25 --- octave-3.8.1.ebuild 9 Sep 2014 13:18:53 -0000 1.2
26 +++ octave-3.8.1.ebuild 7 Jul 2015 13:25:35 -0000 1.3
27 @@ -1,6 +1,6 @@
28 -# Copyright 1999-2014 Gentoo Foundation
29 +# Copyright 1999-2015 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild,v 1.2 2014/09/09 13:18:53 mgorny Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild,v 1.3 2015/07/07 13:25:35 gienah Exp $
33
34 EAPI=5
35
36 @@ -46,7 +46,7 @@
37 media-gfx/transfig )
38 qhull? ( media-libs/qhull )
39 qrupdate? ( sci-libs/qrupdate )
40 - readline? ( sys-libs/readline )
41 + readline? ( sys-libs/readline:0 )
42 sparse? (
43 sci-libs/arpack
44 sci-libs/camd
45
46
47
48 1.4 sci-mathematics/octave/octave-3.6.4-r1.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild?rev=1.4&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild?rev=1.4&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild?r1=1.3&r2=1.4
53
54 Index: octave-3.6.4-r1.ebuild
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild,v
57 retrieving revision 1.3
58 retrieving revision 1.4
59 diff -u -r1.3 -r1.4
60 --- octave-3.6.4-r1.ebuild 24 Feb 2014 11:16:44 -0000 1.3
61 +++ octave-3.6.4-r1.ebuild 7 Jul 2015 13:25:35 -0000 1.4
62 @@ -1,6 +1,6 @@
63 -# Copyright 1999-2014 Gentoo Foundation
64 +# Copyright 1999-2015 Gentoo Foundation
65 # Distributed under the terms of the GNU General Public License v2
66 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild,v 1.3 2014/02/24 11:16:44 gienah Exp $
67 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild,v 1.4 2015/07/07 13:25:35 gienah Exp $
68
69 EAPI=5
70
71 @@ -43,7 +43,7 @@
72 media-gfx/transfig )
73 qhull? ( media-libs/qhull )
74 qrupdate? ( sci-libs/qrupdate )
75 - readline? ( sys-libs/readline )
76 + readline? ( sys-libs/readline:0 )
77 sparse? (
78 sci-libs/arpack
79 sci-libs/camd
80
81
82
83 1.11 sci-mathematics/octave/octave-3.6.4.ebuild
84
85 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild?rev=1.11&view=markup
86 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild?rev=1.11&content-type=text/plain
87 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild?r1=1.10&r2=1.11
88
89 Index: octave-3.6.4.ebuild
90 ===================================================================
91 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v
92 retrieving revision 1.10
93 retrieving revision 1.11
94 diff -u -r1.10 -r1.11
95 --- octave-3.6.4.ebuild 24 Feb 2014 11:16:44 -0000 1.10
96 +++ octave-3.6.4.ebuild 7 Jul 2015 13:25:35 -0000 1.11
97 @@ -1,6 +1,6 @@
98 -# Copyright 1999-2014 Gentoo Foundation
99 +# Copyright 1999-2015 Gentoo Foundation
100 # Distributed under the terms of the GNU General Public License v2
101 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v 1.10 2014/02/24 11:16:44 gienah Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v 1.11 2015/07/07 13:25:35 gienah Exp $
103
104 EAPI=5
105
106 @@ -43,7 +43,7 @@
107 media-gfx/transfig )
108 qhull? ( media-libs/qhull )
109 qrupdate? ( sci-libs/qrupdate )
110 - readline? ( sys-libs/readline )
111 + readline? ( sys-libs/readline:0 )
112 sparse? (
113 sci-libs/arpack
114 sci-libs/camd
115
116
117
118 1.8 sci-mathematics/octave/octave-3.8.1-r1.ebuild
119
120 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild?rev=1.8&view=markup
121 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild?rev=1.8&content-type=text/plain
122 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild?r1=1.7&r2=1.8
123
124 Index: octave-3.8.1-r1.ebuild
125 ===================================================================
126 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v
127 retrieving revision 1.7
128 retrieving revision 1.8
129 diff -u -r1.7 -r1.8
130 --- octave-3.8.1-r1.ebuild 5 Jul 2015 14:47:44 -0000 1.7
131 +++ octave-3.8.1-r1.ebuild 7 Jul 2015 13:25:35 -0000 1.8
132 @@ -1,6 +1,6 @@
133 # Copyright 1999-2015 Gentoo Foundation
134 # Distributed under the terms of the GNU General Public License v2
135 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.7 2015/07/05 14:47:44 mgorny Exp $
136 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.8 2015/07/07 13:25:35 gienah Exp $
137
138 EAPI=5
139
140 @@ -33,7 +33,7 @@
141 imagemagick? ( || (
142 media-gfx/graphicsmagick[cxx]
143 media-gfx/imagemagick[cxx] ) )
144 - java? ( >=virtual/jre-1.6.0 )
145 + java? ( >=virtual/jre-1.6.0:* )
146 jit? ( <sys-devel/llvm-3.5 )
147 opengl? (
148 media-libs/freetype:2=
149
150
151
152 1.10 sci-mathematics/octave/octave-3.8.2.ebuild
153
154 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild?rev=1.10&view=markup
155 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild?rev=1.10&content-type=text/plain
156 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild?r1=1.9&r2=1.10
157
158 Index: octave-3.8.2.ebuild
159 ===================================================================
160 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v
161 retrieving revision 1.9
162 retrieving revision 1.10
163 diff -u -r1.9 -r1.10
164 --- octave-3.8.2.ebuild 5 Jul 2015 14:47:44 -0000 1.9
165 +++ octave-3.8.2.ebuild 7 Jul 2015 13:25:35 -0000 1.10
166 @@ -1,6 +1,6 @@
167 # Copyright 1999-2015 Gentoo Foundation
168 # Distributed under the terms of the GNU General Public License v2
169 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v 1.9 2015/07/05 14:47:44 mgorny Exp $
170 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v 1.10 2015/07/07 13:25:35 gienah Exp $
171
172 EAPI=5
173
174 @@ -33,12 +33,12 @@
175 imagemagick? ( || (
176 media-gfx/graphicsmagick[cxx]
177 media-gfx/imagemagick[cxx] ) )
178 - java? ( >=virtual/jre-1.6.0 )
179 + java? ( >=virtual/jre-1.6.0:* )
180 jit? ( <sys-devel/llvm-3.5:0= )
181 opengl? (
182 media-libs/freetype:2=
183 media-libs/fontconfig:1.0=
184 - >=x11-libs/fltk-1.3:1=[opengl]
185 + >=x11-libs/fltk-1.3:1=[opengl,xft]
186 x11-libs/gl2ps:0=
187 virtual/glu )
188 postscript? (
189
190
191
192 1.176 sci-mathematics/octave/ChangeLog
193
194 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.176&view=markup
195 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.176&content-type=text/plain
196 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?r1=1.175&r2=1.176
197
198 Index: ChangeLog
199 ===================================================================
200 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v
201 retrieving revision 1.175
202 retrieving revision 1.176
203 diff -u -r1.175 -r1.176
204 --- ChangeLog 5 Jul 2015 14:47:44 -0000 1.175
205 +++ ChangeLog 7 Jul 2015 13:25:35 -0000 1.176
206 @@ -1,6 +1,21 @@
207 # ChangeLog for sci-mathematics/octave
208 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
209 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.175 2015/07/05 14:47:44 mgorny Exp $
210 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.176 2015/07/07 13:25:35 gienah Exp $
211 +
212 +*octave-4.0.0 (07 Jul 2015)
213 +
214 + 07 Jul 2015; Mark Wright <gienah@g.o>
215 + +files/octave-4.0.0-imagemagick-configure.patch,
216 + +files/octave-4.0.0-imagemagick.patch, +files/octave-4.0.0-llvm-3.5.patch,
217 + +octave-4.0.0.ebuild, metadata.xml, octave-3.6.4-r1.ebuild,
218 + octave-3.6.4.ebuild, octave-3.8.1-r1.ebuild, octave-3.8.1.ebuild,
219 + octave-3.8.2.ebuild:
220 + Bump octave to 4.0.0, fixes Bug 550858 - sci-mathematics/octave-4.0 version
221 + bump, thanks to Bohdan Trach for reporting. octave 4.0.0 allows llvm 3.5,
222 + fixing Bug 531672 - sci-mathematics/octave-3.8.2 USE=jit depends on <sys-
223 + devel/llvm-3.5, thanks to Juergen Rose for reporting and eroen for an upstream
224 + bug reference. Fix Bug 539886 - sci-mathematics/octave-3.8.2 should depend on
225 + x11-libs/fltk[opengl,xft], thanks to Andreas Fink for reporting and the fix.
226
227 05 Jul 2015; Michał Górny <mgorny@g.o> octave-3.8.1-r1.ebuild,
228 octave-3.8.2.ebuild:
229
230
231
232 1.1 sci-mathematics/octave/octave-4.0.0.ebuild
233
234 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild?rev=1.1&view=markup
235 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild?rev=1.1&content-type=text/plain
236
237 Index: octave-4.0.0.ebuild
238 ===================================================================
239 # Copyright 1999-2015 Gentoo Foundation
240 # Distributed under the terms of the GNU General Public License v2
241 # $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild,v 1.1 2015/07/07 13:25:35 gienah Exp $
242
243 EAPI=5
244
245 AUTOTOOLS_AUTORECONF=1
246 AUTOTOOLS_IN_SOURCE_BUILD=1
247
248 inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
249
250 DESCRIPTION="High-level interactive language for numerical computations"
251 LICENSE="GPL-3"
252 HOMEPAGE="http://www.octave.org/"
253 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
254
255 SLOT="0/${PV}"
256 IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
257 postscript +qhull +qrupdate readline +sparse static-libs X zlib"
258 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
259
260 RDEPEND="
261 app-text/ghostscript-gpl
262 dev-libs/libpcre:3=
263 sys-libs/ncurses:5=
264 virtual/blas
265 virtual/lapack
266 curl? ( net-misc/curl:0= )
267 fftw? ( sci-libs/fftw:3.0= )
268 glpk? ( sci-mathematics/glpk:0= )
269 gnuplot? ( sci-visualization/gnuplot )
270 gui? ( x11-libs/qscintilla:0= )
271 hdf5? ( sci-libs/hdf5:0= )
272 imagemagick? ( || (
273 media-gfx/graphicsmagick[cxx]
274 media-gfx/imagemagick[cxx] ) )
275 java? ( >=virtual/jre-1.6.0:* )
276 jit? ( >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
277 opengl? (
278 media-libs/freetype:2=
279 media-libs/fontconfig:1.0=
280 >=x11-libs/fltk-1.3:1=[opengl,xft]
281 x11-libs/gl2ps:0=
282 virtual/glu )
283 postscript? (
284 app-text/epstool
285 media-gfx/pstoedit
286 media-gfx/transfig )
287 qhull? ( media-libs/qhull:0= )
288 qrupdate? ( sci-libs/qrupdate:0= )
289 readline? ( sys-libs/readline:0= )
290 sparse? (
291 sci-libs/arpack:0=
292 sci-libs/camd:0=
293 sci-libs/ccolamd:0=
294 sci-libs/cholmod:0=
295 sci-libs/colamd:0=
296 sci-libs/cxsparse:0=
297 sci-libs/umfpack:0= )
298 X? ( x11-libs/libX11:0= )
299 zlib? ( sys-libs/zlib:0= )"
300
301 DEPEND="${RDEPEND}
302 qrupdate? ( app-misc/pax-utils )
303 sparse? ( app-misc/pax-utils )
304 java? ( >=virtual/jdk-1.6.0 )
305 doc? (
306 virtual/latex-base
307 dev-texlive/texlive-genericrecommended
308 dev-texlive/texlive-metapost
309 sys-apps/texinfo )
310 dev-util/gperf
311 virtual/pkgconfig"
312
313 PATCHES=(
314 "${FILESDIR}"/${PN}-3.4.3-texi.patch
315 "${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
316 "${FILESDIR}"/${PN}-4.0.0-imagemagick-configure.patch
317 "${FILESDIR}"/${PN}-4.0.0-imagemagick.patch
318 "${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
319 )
320
321 src_prepare() {
322 # nasty prefix hacks for fltk:1 and qt4 linking
323 if use prefix; then
324 use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
325 use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
326 fi
327
328 has_version ">=sys-devel/llvm-3.5" && \
329 epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch
330
331 # Fix bug 501756
332 sed -i \
333 -e 's@A-Za-z0-9@[:alnum:]@g' \
334 -e 's@A-Za-z@[:alpha:]@g' \
335 libinterp/mkbuiltins || die
336 autotools-utils_src_prepare
337 }
338
339 src_configure() {
340 # occasional fail on install, force regeneration (bug #401189)
341 rm doc/interpreter/contributors.texi || die
342
343 # unfortunate dependency on mpi from hdf5 (bug #302621)
344 use hdf5 && has_version sci-libs/hdf5[mpi] && \
345 export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
346
347 local myeconfargs=(
348 --localstatedir="${EPREFIX}/var/state/octave"
349 --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
350 --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
351 --without-64
352 $(use_enable doc docs)
353 $(use_enable java)
354 $(use_enable gui)
355 $(use_enable jit)
356 $(use_enable readline)
357 $(use_with curl)
358 $(use_with fftw fftw3)
359 $(use_with fftw fftw3f)
360 $(use_enable fftw fftw-threads)
361 $(use_with glpk)
362 $(use_with hdf5)
363 $(use_with opengl)
364 $(use_with qhull)
365 $(use_with qrupdate)
366 $(use_with sparse arpack)
367 $(use_with sparse umfpack)
368 $(use_with sparse colamd)
369 $(use_with sparse ccolamd)
370 $(use_with sparse cholmod)
371 $(use_with sparse cxsparse)
372 $(use_with X x)
373 $(use_with zlib z)
374 )
375 if use imagemagick; then
376 if has_version media-gfx/graphicsmagick[cxx]; then
377 myeconfargs+=( "--with-magick=GraphicsMagick" )
378 else
379 myeconfargs+=( "--with-magick=ImageMagick" )
380 fi
381 else
382 myeconfargs+=( "--without-magick" )
383 fi
384 autotools-utils_src_configure
385 }
386
387 src_compile() {
388 emake
389 if use java || use jit ; then
390 pax-mark m "${S}/src/.libs/octave-cli"
391 fi
392 }
393
394 src_install() {
395 autotools-utils_src_install
396 use doc && dodoc $(find doc -name \*.pdf)
397 [[ -e test/fntests.log ]] && dodoc test/fntests.log
398 use java && \
399 java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
400 echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
401 doenvd 99octave
402 }