1 |
commit: 4e5e8a1eb261f84f53cf25d1c41df734089b31db |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 4 13:31:58 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 4 13:32:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5e8a1e |
7 |
|
8 |
sci-mathematics/octave: Drop 4* and 5.1.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
sci-mathematics/octave/Manifest | 4 - |
14 |
.../octave/files/octave-4.2.0-imagemagick.patch | 139 --------------- |
15 |
.../octave/files/octave-4.2.0-pkgbuilddir.patch | 41 ----- |
16 |
.../octave/files/octave-4.2.0-texi.patch | 11 -- |
17 |
.../files/octave-4.2.0-zlib-underlinking.patch | 10 -- |
18 |
.../octave-4.2.2-fix-qscintilla-detection.patch | 14 -- |
19 |
.../files/octave-4.2.2-imagemagick-configure.patch | 16 -- |
20 |
.../files/octave-4.4.0-imagemagick-configure.patch | 16 -- |
21 |
.../octave/files/octave-4.4.0-imagemagick.patch | 22 --- |
22 |
.../octave/files/octave-4.4.0-qt-5.11.patch | 10 -- |
23 |
sci-mathematics/octave/metadata.xml | 1 - |
24 |
sci-mathematics/octave/octave-4.2.2.ebuild | 191 -------------------- |
25 |
sci-mathematics/octave/octave-4.4.0.ebuild | 195 -------------------- |
26 |
sci-mathematics/octave/octave-4.4.1.ebuild | 196 --------------------- |
27 |
sci-mathematics/octave/octave-5.1.0.ebuild | 192 -------------------- |
28 |
15 files changed, 1058 deletions(-) |
29 |
|
30 |
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest |
31 |
index 23044156fe0..62029d3b7e2 100644 |
32 |
--- a/sci-mathematics/octave/Manifest |
33 |
+++ b/sci-mathematics/octave/Manifest |
34 |
@@ -1,5 +1 @@ |
35 |
-DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2 |
36 |
-DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2 |
37 |
-DIST octave-4.4.1.tar.gz 28626462 BLAKE2B 0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6 SHA512 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8 |
38 |
-DIST octave-5.1.0.tar.gz 32034788 BLAKE2B d387f41f6ae826b35735fc4208d71be84076a81544f5cd0e3d5410f41a70eebb5b0b3bbf19e4344b88901869d54f2759259dc374c44a430f681d3b0c32cb02cb SHA512 a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb |
39 |
DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498 |
40 |
|
41 |
diff --git a/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch |
42 |
deleted file mode 100644 |
43 |
index 8fb786964c2..00000000000 |
44 |
--- a/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch |
45 |
+++ /dev/null |
46 |
@@ -1,139 +0,0 @@ |
47 |
---- a/libinterp/corefcn/__magick_read__.cc |
48 |
-+++ b/libinterp/corefcn/__magick_read__.cc |
49 |
-@@ -39,7 +39,15 @@ |
50 |
- |
51 |
- #if defined (HAVE_MAGICK) |
52 |
- |
53 |
-+#define MAGICKCORE_EXCLUDE_DEPRECATED 1 |
54 |
- #include <Magick++.h> |
55 |
-+#if !defined(QuantumRange) && defined(MaxRGB) |
56 |
-+#define QuantumRange MaxRGB |
57 |
-+#endif |
58 |
-+#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth) |
59 |
-+#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth |
60 |
-+#endif |
61 |
-+ |
62 |
- #include <clocale> |
63 |
- |
64 |
- // In theory, it should be enough to check the class: |
65 |
-@@ -121,6 +129,9 @@ |
66 |
- get_depth (Magick::Image& img) |
67 |
- { |
68 |
- octave_idx_type depth = img.depth (); |
69 |
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686) |
70 |
-+#define Magick MagickCore |
71 |
-+#endif |
72 |
- if (depth == 8 |
73 |
- && img.channelDepth (Magick::RedChannel) == 1 |
74 |
- && img.channelDepth (Magick::GreenChannel) == 1 |
75 |
-@@ -132,6 +143,9 @@ |
76 |
- && img.channelDepth (Magick::OpacityChannel) == 1 |
77 |
- && img.channelDepth (Magick::GrayChannel) == 1) |
78 |
- depth = 1; |
79 |
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686) |
80 |
-+#undef Magick |
81 |
-+#endif |
82 |
- |
83 |
- return depth; |
84 |
- } |
85 |
-@@ -355,7 +369,10 @@ |
86 |
- if (imvec[def_elem].depth () == 32) |
87 |
- divisor = std::numeric_limits<uint32_t>::max (); |
88 |
- else |
89 |
-- divisor = MaxRGB / ((uint64_t (1) << imvec[def_elem].depth ()) - 1); |
90 |
-+ { |
91 |
-+ using namespace Magick; |
92 |
-+ divisor = QuantumRange / ((uint64_t (1) << imvec[def_elem].depth ()) - 1); |
93 |
-+ } |
94 |
- |
95 |
- // FIXME: this workaround should probably be fixed in GM by creating a |
96 |
- // new ImageType BilevelMatteType |
97 |
-@@ -489,7 +506,8 @@ |
98 |
- for (octave_idx_type row = 0; row < nRows; row++) |
99 |
- { |
100 |
- img_fvec[idx] = pix->red / divisor; |
101 |
-- a_fvec[idx] = (MaxRGB - pix->opacity) / divisor; |
102 |
-+ using namespace Magick; |
103 |
-+ a_fvec[idx] = (QuantumRange - pix->opacity) / divisor; |
104 |
- pix += row_shift; |
105 |
- idx++; |
106 |
- } |
107 |
-@@ -568,7 +586,8 @@ |
108 |
- rbuf[idx] = pix->red / divisor; |
109 |
- gbuf[idx] = pix->green / divisor; |
110 |
- bbuf[idx] = pix->blue / divisor; |
111 |
-- a_fvec[a_idx++] = (MaxRGB - pix->opacity) / divisor; |
112 |
-+ using namespace Magick; |
113 |
-+ a_fvec[a_idx++] = (QuantumRange - pix->opacity) / divisor; |
114 |
- pix += row_shift; |
115 |
- idx++; |
116 |
- } |
117 |
-@@ -655,7 +674,8 @@ |
118 |
- mbuf[idx] = pix->green / divisor; |
119 |
- ybuf[idx] = pix->blue / divisor; |
120 |
- kbuf[idx] = pix->opacity / divisor; |
121 |
-- a_fvec[a_idx++] = (MaxRGB - *apix) / divisor; |
122 |
-+ using namespace Magick; |
123 |
-+ a_fvec[a_idx++] = (QuantumRange - *apix) / divisor; |
124 |
- pix += row_shift; |
125 |
- idx++; |
126 |
- } |
127 |
-@@ -732,10 +752,11 @@ |
128 |
- // depth is 8, there's a good chance that we will be limited. It |
129 |
- // is also the GraphicsMagick recommended setting and the default |
130 |
- // for ImageMagick. |
131 |
-- if (QuantumDepth < 16) |
132 |
-+ using namespace Magick; |
133 |
-+ if (MAGICKCORE_QUANTUM_DEPTH < 16) |
134 |
- warning_with_id ("Octave:GraphicsMagic-Quantum-Depth", |
135 |
- "your version of %s limits images to %d bits per pixel\n", |
136 |
-- MagickPackageName, QuantumDepth); |
137 |
-+ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH); |
138 |
- |
139 |
- initialized = true; |
140 |
- } |
141 |
-@@ -1094,8 +1115,9 @@ |
142 |
- // From GM documentation: |
143 |
- // Color arguments are must be scaled to fit the Quantum size according to |
144 |
- // the range of MaxRGB |
145 |
-+ using namespace Magick; |
146 |
- const double divisor = static_cast<double>((uint64_t (1) << bitdepth) - 1) |
147 |
-- / MaxRGB; |
148 |
-+ / QuantumRange; |
149 |
- |
150 |
- const P *img_fvec = img.fortran_vec (); |
151 |
- const P *a_fvec = alpha.fortran_vec (); |
152 |
-@@ -1147,8 +1169,9 @@ |
153 |
- for (octave_idx_type row = 0; row < nRows; row++) |
154 |
- { |
155 |
- double grey = octave::math::round (double (*img_fvec) / divisor); |
156 |
-+ using namespace Magick; |
157 |
- Magick::Color c (grey, grey, grey, |
158 |
-- MaxRGB - octave::math::round (double (*a_fvec) / divisor)); |
159 |
-+ QuantumRange - octave::math::round (double (*a_fvec) / divisor)); |
160 |
- pix[GM_idx] = c; |
161 |
- img_fvec++; |
162 |
- a_fvec++; |
163 |
-@@ -1216,10 +1239,11 @@ |
164 |
- { |
165 |
- for (octave_idx_type row = 0; row < nRows; row++) |
166 |
- { |
167 |
-+ using namespace Magick; |
168 |
- Magick::Color c (octave::math::round (double (*img_fvec) / divisor), |
169 |
- octave::math::round (double (img_fvec[G_offset]) / divisor), |
170 |
- octave::math::round (double (img_fvec[B_offset]) / divisor), |
171 |
-- MaxRGB - octave::math::round (double (*a_fvec) / divisor)); |
172 |
-+ QuantumRange - octave::math::round (double (*a_fvec) / divisor)); |
173 |
- pix[GM_idx] = c; |
174 |
- img_fvec++; |
175 |
- a_fvec++; |
176 |
-@@ -1297,7 +1321,8 @@ |
177 |
- octave::math::round (double (img_fvec[Y_offset]) / divisor), |
178 |
- octave::math::round (double (img_fvec[K_offset]) / divisor)); |
179 |
- pix[GM_idx] = c; |
180 |
-- ind[GM_idx] = MaxRGB - octave::math::round (double (*a_fvec) / divisor); |
181 |
-+ using namespace Magick; |
182 |
-+ ind[GM_idx] = QuantumRange - octave::math::round (double (*a_fvec) / divisor); |
183 |
- img_fvec++; |
184 |
- a_fvec++; |
185 |
- GM_idx += nCols; |
186 |
|
187 |
diff --git a/sci-mathematics/octave/files/octave-4.2.0-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-4.2.0-pkgbuilddir.patch |
188 |
deleted file mode 100644 |
189 |
index a72ac97c0a1..00000000000 |
190 |
--- a/sci-mathematics/octave/files/octave-4.2.0-pkgbuilddir.patch |
191 |
+++ /dev/null |
192 |
@@ -1,41 +0,0 @@ |
193 |
---- a/scripts/pkg/private/install.m |
194 |
-+++ b/scripts/pkg/private/install.m |
195 |
-@@ -62,7 +62,14 @@ |
196 |
- for i = 1:length (files) |
197 |
- tgz = files{i}; |
198 |
- |
199 |
-- if (exist (tgz, "file")) |
200 |
-+ ## The filename pointed to an uncompressed package to begin with. |
201 |
-+ if (exist (tgz, "dir")) |
202 |
-+ if (tgz(1) == '/') |
203 |
-+ packdir = tgz; |
204 |
-+ else |
205 |
-+ packdir = fullfile (pwd(), tgz); |
206 |
-+ endif |
207 |
-+ elseif (exist (tgz, "file")) |
208 |
- ## Create a temporary directory. |
209 |
- tmpdir = tempname (); |
210 |
- tmpdirs{end+1} = tmpdir; |
211 |
-@@ -89,20 +96,12 @@ |
212 |
- if (length (dirlist) > 3) |
213 |
- error ("bundles of packages are not allowed"); |
214 |
- endif |
215 |
-- endif |
216 |
- |
217 |
-- ## The filename pointed to an uncompressed package to begin with. |
218 |
-- if (exist (tgz, "dir")) |
219 |
-- dirlist = {".", "..", tgz}; |
220 |
-+ ## The two first entries of dirlist are "." and "..". |
221 |
-+ packdir = fullfile (tmpdir, dirlist{3}); |
222 |
- endif |
223 |
- |
224 |
- if (exist (tgz, "file") || exist (tgz, "dir")) |
225 |
-- ## The two first entries of dirlist are "." and "..". |
226 |
-- if (exist (tgz, "file")) |
227 |
-- packdir = fullfile (tmpdir, dirlist{3}); |
228 |
-- else |
229 |
-- packdir = fullfile (pwd (), dirlist{3}); |
230 |
-- endif |
231 |
- packdirs{end+1} = packdir; |
232 |
- |
233 |
- ## Make sure the package contains necessary files. |
234 |
|
235 |
diff --git a/sci-mathematics/octave/files/octave-4.2.0-texi.patch b/sci-mathematics/octave/files/octave-4.2.0-texi.patch |
236 |
deleted file mode 100644 |
237 |
index 1352ff5a1f7..00000000000 |
238 |
--- a/sci-mathematics/octave/files/octave-4.2.0-texi.patch |
239 |
+++ /dev/null |
240 |
@@ -1,11 +0,0 @@ |
241 |
---- a/doc/interpreter/module.mk |
242 |
-+++ b/doc/interpreter/module.mk |
243 |
-@@ -298,6 +298,8 @@ |
244 |
- $(AWK) -f $(srcdir)/doc/interpreter/mkcontrib.awk $(srcdir)/doc/interpreter/contributors.in > $@-t && \ |
245 |
- mv $@-t $@ |
246 |
- |
247 |
-+doc/interpreter/preface.texi: doc/interpreter/contributors.texi |
248 |
-+ |
249 |
- AUTHORS: doc/interpreter/preface.texi doc/interpreter/contributors.texi | doc/interpreter/$(octave_dirstamp) |
250 |
- $(AM_V_MAKEINFO)rm -f $@-t $@ && \ |
251 |
- if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/doc/interpreter/contributors.texi ] && [ ! -f doc/interpreter/contributors.texi ]; then \ |
252 |
|
253 |
diff --git a/sci-mathematics/octave/files/octave-4.2.0-zlib-underlinking.patch b/sci-mathematics/octave/files/octave-4.2.0-zlib-underlinking.patch |
254 |
deleted file mode 100644 |
255 |
index 0c8736069d8..00000000000 |
256 |
--- a/sci-mathematics/octave/files/octave-4.2.0-zlib-underlinking.patch |
257 |
+++ /dev/null |
258 |
@@ -1,10 +0,0 @@ |
259 |
---- a/libinterp/corefcn/module.mk |
260 |
-+++ b/libinterp/corefcn/module.mk |
261 |
-@@ -318,6 +318,7 @@ |
262 |
- $(HDF5_CPPFLAGS) \ |
263 |
- $(LLVM_CPPFLAGS) \ |
264 |
- $(Z_CPPFLAGS) |
265 |
-+libinterp_corefcn_libcorefcn_la_LIBADD = $(Z_LIBS) |
266 |
- |
267 |
- libinterp_corefcn_libcorefcn_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) |
268 |
- |
269 |
|
270 |
diff --git a/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch |
271 |
deleted file mode 100644 |
272 |
index 80fc2801323..00000000000 |
273 |
--- a/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch |
274 |
+++ /dev/null |
275 |
@@ -1,14 +0,0 @@ |
276 |
-In Gentoo, QScintilla for Qt5 has the same library name |
277 |
-as its Qt4 variant. |
278 |
- |
279 |
---- a/m4/acinclude.m4 |
280 |
-+++ b/m4/acinclude.m4 |
281 |
-@@ -1460,7 +1460,7 @@ |
282 |
- ;; |
283 |
- 5) |
284 |
- QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" |
285 |
-- octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2" |
286 |
-+ octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2" |
287 |
- ;; |
288 |
- *) |
289 |
- AC_MSG_ERROR([Unrecognized Qt version $qt_version]) |
290 |
|
291 |
diff --git a/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch |
292 |
deleted file mode 100644 |
293 |
index d80c23ec422..00000000000 |
294 |
--- a/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch |
295 |
+++ /dev/null |
296 |
@@ -1,16 +0,0 @@ |
297 |
---- a/configure.ac |
298 |
-+++ b/configure.ac |
299 |
-@@ -1560,11 +1560,11 @@ if test $check_magick = yes; then |
300 |
- MAGICK_LIBS= |
301 |
- |
302 |
- PKG_CHECK_EXISTS([$magick++], [ |
303 |
-- ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ |
304 |
-+ ## Make sure we only get -I, -D, -L, and -l flags. Some Graphics/ImageMagick++ |
305 |
- ## packages add extra flags that are useful when building |
306 |
- ## Graphics/ImageMagick++ extentions. These extra flags break the |
307 |
- ## Octave build. |
308 |
-- MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')" |
309 |
-+ MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//' | $SED -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g')" |
310 |
- MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')" |
311 |
- MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')" |
312 |
- |
313 |
|
314 |
diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch |
315 |
deleted file mode 100644 |
316 |
index ce81b801d99..00000000000 |
317 |
--- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch |
318 |
+++ /dev/null |
319 |
@@ -1,16 +0,0 @@ |
320 |
---- a/configure.ac 2018-04-30 19:03:56.000000000 +0200 |
321 |
-+++ a/configure.ac.new 2018-05-22 12:23:30.371174341 +0200 |
322 |
-@@ -1946,11 +1946,11 @@ |
323 |
- MAGICK_LIBS= |
324 |
- |
325 |
- PKG_CHECK_EXISTS([$magick++], [ |
326 |
-- dnl Make sure we only get -I, -L, and -l flags. |
327 |
-+ dnl Make sure we only get -I, -D, -L, and -l flags. |
328 |
- dnl Some Graphics/ImageMagick++ dnl packages add extra flags that are |
329 |
- dnl useful when building Graphics/ImageMagick++ extentions. These extra |
330 |
- dnl flags break the Octave build. |
331 |
-- MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')" |
332 |
-+ MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'` |
333 |
- MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')" |
334 |
- MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')" |
335 |
- |
336 |
|
337 |
diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch |
338 |
deleted file mode 100644 |
339 |
index 2aa6e5b9d8c..00000000000 |
340 |
--- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch |
341 |
+++ /dev/null |
342 |
@@ -1,22 +0,0 @@ |
343 |
---- a/libinterp/corefcn/__magick_read__.cc 2018-05-22 12:25:37.688173855 +0200 |
344 |
-+++ a/libinterp/corefcn/__magick_read__.cc.new 2018-05-22 12:32:51.475172200 +0200 |
345 |
-@@ -817,10 +817,19 @@ |
346 |
- // depth is 8, there's a good chance that we will be limited. It |
347 |
- // is also the GraphicsMagick recommended setting and the default |
348 |
- // for ImageMagick. |
349 |
-+#ifdef QuantumDepth |
350 |
- if (QuantumDepth < 16) |
351 |
-+#else |
352 |
-+ using namespace Magick; |
353 |
-+ if (MAGICKCORE_QUANTUM_DEPTH < 16) |
354 |
-+#endif |
355 |
- warning_with_id ("Octave:GraphicsMagick-Quantum-Depth", |
356 |
- "your version of %s limits images to %d bits per pixel\n", |
357 |
-+#ifdef QuantumDepth |
358 |
- MagickPackageName, QuantumDepth); |
359 |
-+#else |
360 |
-+ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH); |
361 |
-+#endif |
362 |
- |
363 |
- initialized = true; |
364 |
- } |
365 |
|
366 |
diff --git a/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch b/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch |
367 |
deleted file mode 100644 |
368 |
index 70ffbb47199..00000000000 |
369 |
--- a/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch |
370 |
+++ /dev/null |
371 |
@@ -1,10 +0,0 @@ |
372 |
---- octave-4.4.0-orig/libgui/src/settings-dialog.cc 2018-05-01 03:03:56.000000000 +1000 |
373 |
-+++ octave-4.4.0/libgui/src/settings-dialog.cc 2018-07-03 19:35:41.865149269 +1000 |
374 |
-@@ -41,6 +41,7 @@ |
375 |
- #include <QHash> |
376 |
- #include <QMessageBox> |
377 |
- #include <QTextCodec> |
378 |
-+#include <QButtonGroup> |
379 |
- |
380 |
- #if defined (HAVE_QSCINTILLA) |
381 |
- # include "octave-qscintilla.h" |
382 |
|
383 |
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml |
384 |
index 54f7c4586ad..619b5f255ad 100644 |
385 |
--- a/sci-mathematics/octave/metadata.xml |
386 |
+++ b/sci-mathematics/octave/metadata.xml |
387 |
@@ -10,7 +10,6 @@ |
388 |
</longdescription> |
389 |
<use> |
390 |
<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag> |
391 |
- <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for low level hash functions</flag> |
392 |
<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag> |
393 |
<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag> |
394 |
<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag> |
395 |
|
396 |
diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild |
397 |
deleted file mode 100644 |
398 |
index 8600b40098f..00000000000 |
399 |
--- a/sci-mathematics/octave/octave-4.2.2.ebuild |
400 |
+++ /dev/null |
401 |
@@ -1,191 +0,0 @@ |
402 |
-# Copyright 1999-2020 Gentoo Authors |
403 |
-# Distributed under the terms of the GNU General Public License v2 |
404 |
- |
405 |
-EAPI=6 |
406 |
- |
407 |
-inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils |
408 |
- |
409 |
-DESCRIPTION="High-level interactive language for numerical computations" |
410 |
-LICENSE="GPL-3" |
411 |
-HOMEPAGE="https://www.gnu.org/software/octave/" |
412 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
413 |
- |
414 |
-SLOT="0/${PV}" |
415 |
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl |
416 |
- portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib" |
417 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" |
418 |
- |
419 |
-RDEPEND=" |
420 |
- app-arch/bzip2 |
421 |
- app-text/ghostscript-gpl |
422 |
- dev-libs/libpcre:3= |
423 |
- sys-libs/ncurses:0= |
424 |
- sys-libs/zlib |
425 |
- virtual/blas |
426 |
- virtual/lapack |
427 |
- curl? ( net-misc/curl:0= ) |
428 |
- fftw? ( sci-libs/fftw:3.0= ) |
429 |
- glpk? ( sci-mathematics/glpk:0= ) |
430 |
- gnuplot? ( sci-visualization/gnuplot ) |
431 |
- gui? ( |
432 |
- dev-qt/qtcore:5 |
433 |
- dev-qt/qtgui:5 |
434 |
- dev-qt/qtnetwork:5 |
435 |
- dev-qt/qtopengl:5 |
436 |
- >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] |
437 |
- ) |
438 |
- hdf5? ( sci-libs/hdf5:0= ) |
439 |
- imagemagick? ( |
440 |
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
441 |
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
442 |
- ) |
443 |
- java? ( >=virtual/jre-1.6.0:* ) |
444 |
- opengl? ( |
445 |
- media-libs/freetype:2= |
446 |
- media-libs/fontconfig:1.0= |
447 |
- virtual/glu |
448 |
- >=x11-libs/fltk-1.3:1=[opengl,xft] |
449 |
- x11-libs/gl2ps:0= |
450 |
- ) |
451 |
- openssl? ( dev-libs/openssl:0= ) |
452 |
- portaudio? ( media-libs/portaudio ) |
453 |
- postscript? ( |
454 |
- app-text/epstool |
455 |
- media-gfx/pstoedit |
456 |
- media-gfx/transfig |
457 |
- ) |
458 |
- qhull? ( media-libs/qhull:0= ) |
459 |
- qrupdate? ( sci-libs/qrupdate:0= ) |
460 |
- readline? ( sys-libs/readline:0= ) |
461 |
- sndfile? ( media-libs/libsndfile ) |
462 |
- sparse? ( |
463 |
- sci-libs/arpack:0= |
464 |
- sci-libs/camd:0= |
465 |
- sci-libs/ccolamd:0= |
466 |
- sci-libs/cholmod:0= |
467 |
- sci-libs/colamd:0= |
468 |
- sci-libs/cxsparse:0= |
469 |
- sci-libs/umfpack:0= |
470 |
- ) |
471 |
- X? ( x11-libs/libX11:0= )" |
472 |
-DEPEND="${RDEPEND} |
473 |
- dev-util/gperf |
474 |
- sys-apps/texinfo |
475 |
- virtual/pkgconfig |
476 |
- doc? ( |
477 |
- dev-texlive/texlive-fontsrecommended |
478 |
- dev-texlive/texlive-plaingeneric |
479 |
- dev-texlive/texlive-metapost |
480 |
- virtual/latex-base |
481 |
- ) |
482 |
- gui? ( dev-qt/linguist-tools:5 ) |
483 |
- java? ( >=virtual/jdk-1.6.0 ) |
484 |
- qrupdate? ( app-misc/pax-utils ) |
485 |
- sparse? ( app-misc/pax-utils )" |
486 |
- |
487 |
-PATCHES=( |
488 |
- "${FILESDIR}"/${PN}-4.2.0-texi.patch |
489 |
- "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch |
490 |
- "${FILESDIR}"/${P}-imagemagick-configure.patch |
491 |
- "${FILESDIR}"/${PN}-4.2.0-imagemagick.patch |
492 |
- "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch |
493 |
- "${FILESDIR}"/${P}-ncurses-pkgconfig.patch |
494 |
- "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch |
495 |
- "${FILESDIR}"/${P}-fix-qscintilla-detection.patch |
496 |
- "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch |
497 |
-) |
498 |
- |
499 |
-src_prepare() { |
500 |
- # nasty prefix hacks for fltk:1 linking |
501 |
- if use prefix; then |
502 |
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" |
503 |
- fi |
504 |
- |
505 |
- # occasional fail on install, force regeneration (bug #401189) |
506 |
- rm doc/interpreter/contributors.texi || die |
507 |
- |
508 |
- default |
509 |
- eautoreconf |
510 |
-} |
511 |
- |
512 |
-src_configure() { |
513 |
- # [QA] detect underlinking #593670 |
514 |
- append-ldflags $(test-flags-CXX -Wl,-z,defs) |
515 |
- |
516 |
- # unfortunate dependency on mpi from hdf5 (bug #302621) |
517 |
- use hdf5 && has_version sci-libs/hdf5[mpi] && \ |
518 |
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77 |
519 |
- |
520 |
- econf \ |
521 |
- --localstatedir="${EPREFIX}/var/state/octave" \ |
522 |
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ |
523 |
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ |
524 |
- --disable-64 \ |
525 |
- --disable-jit \ |
526 |
- --enable-shared \ |
527 |
- --with-z \ |
528 |
- --with-bz2 \ |
529 |
- --without-OSMesa \ |
530 |
- $(use_enable static-libs static) \ |
531 |
- $(use_enable doc docs) \ |
532 |
- $(use_enable java) \ |
533 |
- $(use_enable readline) \ |
534 |
- $(use_with curl) \ |
535 |
- $(use_with fftw fftw3) \ |
536 |
- $(use_with fftw fftw3f) \ |
537 |
- $(use_enable fftw fftw-threads) \ |
538 |
- $(use_with glpk) \ |
539 |
- $(use_with hdf5) \ |
540 |
- $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \ |
541 |
- $(use_with opengl) \ |
542 |
- $(use_with opengl fltk) \ |
543 |
- $(use_with openssl) \ |
544 |
- $(use_with portaudio) \ |
545 |
- $(use_with qhull) \ |
546 |
- $(use_with qrupdate) \ |
547 |
- $(use_with gui qt 5) \ |
548 |
- $(use_with sndfile) \ |
549 |
- $(use_with sparse arpack) \ |
550 |
- $(use_with sparse umfpack) \ |
551 |
- $(use_with sparse colamd) \ |
552 |
- $(use_with sparse ccolamd) \ |
553 |
- $(use_with sparse cholmod) \ |
554 |
- $(use_with sparse cxsparse) \ |
555 |
- $(use_with X x) |
556 |
-} |
557 |
- |
558 |
-src_compile() { |
559 |
- export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox |
560 |
- default |
561 |
- if use java; then |
562 |
- pax-mark m "${S}/src/.libs/octave-cli" |
563 |
- fi |
564 |
-} |
565 |
- |
566 |
-src_install() { |
567 |
- default |
568 |
- if use doc; then |
569 |
- dodoc $(find doc -name '*.pdf') |
570 |
- else |
571 |
- # bug 566134, macros.texi is installed by make install if use doc |
572 |
- insinto /usr/share/${PN}/${PV}/etc |
573 |
- doins doc/interpreter/macros.texi |
574 |
- fi |
575 |
- [[ -e test/fntests.log ]] && dodoc test/fntests.log |
576 |
- use java && \ |
577 |
- java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" |
578 |
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die |
579 |
- doenvd 99octave |
580 |
-} |
581 |
- |
582 |
-pkg_postinst() { |
583 |
- gnome2_icon_cache_update |
584 |
- xdg_mimeinfo_database_update |
585 |
- xdg_desktop_database_update |
586 |
-} |
587 |
- |
588 |
-pkg_postrm() { |
589 |
- gnome2_icon_cache_update |
590 |
- xdg_mimeinfo_database_update |
591 |
- xdg_desktop_database_update |
592 |
-} |
593 |
|
594 |
diff --git a/sci-mathematics/octave/octave-4.4.0.ebuild b/sci-mathematics/octave/octave-4.4.0.ebuild |
595 |
deleted file mode 100644 |
596 |
index 692b5029491..00000000000 |
597 |
--- a/sci-mathematics/octave/octave-4.4.0.ebuild |
598 |
+++ /dev/null |
599 |
@@ -1,195 +0,0 @@ |
600 |
-# Copyright 1999-2018 Gentoo Foundation |
601 |
-# Distributed under the terms of the GNU General Public License v2 |
602 |
- |
603 |
-EAPI=6 |
604 |
- |
605 |
-inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils |
606 |
- |
607 |
-DESCRIPTION="High-level interactive language for numerical computations" |
608 |
-LICENSE="GPL-3" |
609 |
-HOMEPAGE="https://www.gnu.org/software/octave/" |
610 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
611 |
- |
612 |
-SLOT="0/${PV}" |
613 |
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl |
614 |
- portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib" |
615 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
616 |
- |
617 |
-RDEPEND=" |
618 |
- app-arch/bzip2 |
619 |
- app-text/ghostscript-gpl |
620 |
- dev-libs/libpcre:3= |
621 |
- sys-libs/ncurses:0= |
622 |
- sys-libs/zlib |
623 |
- virtual/blas |
624 |
- virtual/lapack |
625 |
- curl? ( net-misc/curl:0= ) |
626 |
- fftw? ( sci-libs/fftw:3.0= ) |
627 |
- glpk? ( sci-mathematics/glpk:0= ) |
628 |
- gnuplot? ( sci-visualization/gnuplot ) |
629 |
- gui? ( |
630 |
- dev-qt/qtcore:5 |
631 |
- dev-qt/qtgui:5 |
632 |
- dev-qt/qthelp:5 |
633 |
- dev-qt/qtnetwork:5 |
634 |
- dev-qt/qtopengl:5 |
635 |
- dev-qt/qtprintsupport:5 |
636 |
- dev-qt/qtwidgets:5 |
637 |
- x11-libs/qscintilla:= |
638 |
- ) |
639 |
- hdf5? ( sci-libs/hdf5:0= ) |
640 |
- imagemagick? ( |
641 |
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
642 |
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
643 |
- ) |
644 |
- java? ( >=virtual/jre-1.6.0:* ) |
645 |
- opengl? ( |
646 |
- media-libs/freetype:2= |
647 |
- media-libs/fontconfig:1.0= |
648 |
- virtual/glu |
649 |
- >=x11-libs/fltk-1.3:1=[opengl,xft] |
650 |
- x11-libs/gl2ps:0= |
651 |
- ) |
652 |
- ssl? ( |
653 |
- !libressl? ( dev-libs/openssl:0= ) |
654 |
- libressl? ( dev-libs/libressl:0= ) |
655 |
- ) |
656 |
- portaudio? ( media-libs/portaudio ) |
657 |
- postscript? ( |
658 |
- app-text/epstool |
659 |
- media-gfx/pstoedit |
660 |
- media-gfx/transfig |
661 |
- ) |
662 |
- qhull? ( media-libs/qhull:0= ) |
663 |
- qrupdate? ( sci-libs/qrupdate:0= ) |
664 |
- readline? ( sys-libs/readline:0= ) |
665 |
- sndfile? ( media-libs/libsndfile ) |
666 |
- sparse? ( |
667 |
- sci-libs/arpack:0= |
668 |
- sci-libs/camd:0= |
669 |
- sci-libs/ccolamd:0= |
670 |
- sci-libs/cholmod:0= |
671 |
- sci-libs/colamd:0= |
672 |
- sci-libs/cxsparse:0= |
673 |
- sci-libs/umfpack:0= |
674 |
- ) |
675 |
- X? ( x11-libs/libX11:0= )" |
676 |
-DEPEND="${RDEPEND} |
677 |
- dev-util/gperf |
678 |
- sys-apps/texinfo |
679 |
- virtual/pkgconfig |
680 |
- doc? ( |
681 |
- dev-texlive/texlive-fontsrecommended |
682 |
- dev-texlive/texlive-plaingeneric |
683 |
- dev-texlive/texlive-metapost |
684 |
- virtual/latex-base |
685 |
- ) |
686 |
- gui? ( dev-qt/linguist-tools:5 ) |
687 |
- java? ( >=virtual/jdk-1.6.0 ) |
688 |
- qrupdate? ( app-misc/pax-utils ) |
689 |
- sparse? ( app-misc/pax-utils )" |
690 |
- |
691 |
-PATCHES=( |
692 |
- "${FILESDIR}"/${PN}-4.4.0-texi.patch |
693 |
- "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch |
694 |
- "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch |
695 |
- "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch |
696 |
- "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch |
697 |
- "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch |
698 |
- "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch |
699 |
- "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch |
700 |
-) |
701 |
- |
702 |
-src_prepare() { |
703 |
- # nasty prefix hacks for fltk:1 linking |
704 |
- if use prefix; then |
705 |
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" |
706 |
- fi |
707 |
- |
708 |
- # occasional fail on install, force regeneration (bug #401189) |
709 |
- rm doc/interpreter/contributors.texi || die |
710 |
- |
711 |
- default |
712 |
- eautoreconf |
713 |
-} |
714 |
- |
715 |
-src_configure() { |
716 |
- # [QA] detect underlinking #593670 |
717 |
- append-ldflags $(test-flags-CXX -Wl,-z,defs) |
718 |
- |
719 |
- # unfortunate dependency on mpi from hdf5 (bug #302621) |
720 |
- use hdf5 && has_version sci-libs/hdf5[mpi] && \ |
721 |
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77 |
722 |
- |
723 |
- econf \ |
724 |
- --localstatedir="${EPREFIX}/var/state/octave" \ |
725 |
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ |
726 |
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ |
727 |
- --disable-64 \ |
728 |
- --disable-jit \ |
729 |
- --enable-shared \ |
730 |
- --with-z \ |
731 |
- --with-bz2 \ |
732 |
- --without-OSMesa \ |
733 |
- $(use_enable static-libs static) \ |
734 |
- $(use_enable doc docs) \ |
735 |
- $(use_enable java) \ |
736 |
- $(use_enable readline) \ |
737 |
- $(use_with curl) \ |
738 |
- $(use_with fftw fftw3) \ |
739 |
- $(use_with fftw fftw3f) \ |
740 |
- $(use_enable fftw fftw-threads) \ |
741 |
- $(use_with glpk) \ |
742 |
- $(use_with hdf5) \ |
743 |
- $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \ |
744 |
- $(use_with opengl) \ |
745 |
- $(use_with opengl fltk) \ |
746 |
- $(use_with ssl openssl) \ |
747 |
- $(use_with portaudio) \ |
748 |
- $(use_with qhull) \ |
749 |
- $(use_with qrupdate) \ |
750 |
- $(use_with gui qt 5) \ |
751 |
- $(use_with sndfile) \ |
752 |
- $(use_with sparse arpack) \ |
753 |
- $(use_with sparse umfpack) \ |
754 |
- $(use_with sparse colamd) \ |
755 |
- $(use_with sparse ccolamd) \ |
756 |
- $(use_with sparse cholmod) \ |
757 |
- $(use_with sparse cxsparse) \ |
758 |
- $(use_with X x) |
759 |
-} |
760 |
- |
761 |
-src_compile() { |
762 |
- default |
763 |
- if use java; then |
764 |
- pax-mark m "${S}/src/.libs/octave-cli" |
765 |
- fi |
766 |
-} |
767 |
- |
768 |
-src_install() { |
769 |
- default |
770 |
- if use doc; then |
771 |
- dodoc $(find doc -name '*.pdf') |
772 |
- else |
773 |
- # bug 566134, macros.texi is installed by make install if use doc |
774 |
- insinto /usr/share/${PN}/${PV}/etc |
775 |
- doins doc/interpreter/macros.texi |
776 |
- fi |
777 |
- [[ -e test/fntests.log ]] && dodoc test/fntests.log |
778 |
- use java && \ |
779 |
- java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" |
780 |
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die |
781 |
- doenvd 99octave |
782 |
-} |
783 |
- |
784 |
-pkg_postinst() { |
785 |
- gnome2_icon_cache_update |
786 |
- xdg_mimeinfo_database_update |
787 |
- xdg_desktop_database_update |
788 |
-} |
789 |
- |
790 |
-pkg_postrm() { |
791 |
- gnome2_icon_cache_update |
792 |
- xdg_mimeinfo_database_update |
793 |
- xdg_desktop_database_update |
794 |
-} |
795 |
|
796 |
diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild b/sci-mathematics/octave/octave-4.4.1.ebuild |
797 |
deleted file mode 100644 |
798 |
index 192d67e3fde..00000000000 |
799 |
--- a/sci-mathematics/octave/octave-4.4.1.ebuild |
800 |
+++ /dev/null |
801 |
@@ -1,196 +0,0 @@ |
802 |
-# Copyright 1999-2019 Gentoo Authors |
803 |
-# Distributed under the terms of the GNU General Public License v2 |
804 |
- |
805 |
-EAPI=6 |
806 |
- |
807 |
-inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils |
808 |
- |
809 |
-DESCRIPTION="High-level interactive language for numerical computations" |
810 |
-LICENSE="GPL-3" |
811 |
-HOMEPAGE="https://www.gnu.org/software/octave/" |
812 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
813 |
- |
814 |
-SLOT="0/${PV}" |
815 |
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl |
816 |
- portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib" |
817 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
818 |
- |
819 |
-RDEPEND=" |
820 |
- app-arch/bzip2 |
821 |
- app-text/ghostscript-gpl |
822 |
- dev-libs/libpcre:3= |
823 |
- sys-libs/ncurses:0= |
824 |
- sys-libs/zlib |
825 |
- virtual/blas |
826 |
- virtual/lapack |
827 |
- curl? ( net-misc/curl:0= ) |
828 |
- fftw? ( sci-libs/fftw:3.0= ) |
829 |
- glpk? ( sci-mathematics/glpk:0= ) |
830 |
- gnuplot? ( sci-visualization/gnuplot ) |
831 |
- gui? ( |
832 |
- dev-qt/qtcore:5 |
833 |
- dev-qt/qtgui:5 |
834 |
- dev-qt/qthelp:5 |
835 |
- dev-qt/qtnetwork:5 |
836 |
- dev-qt/qtopengl:5 |
837 |
- dev-qt/qtprintsupport:5 |
838 |
- dev-qt/qtwidgets:5 |
839 |
- x11-libs/qscintilla:= |
840 |
- ) |
841 |
- hdf5? ( sci-libs/hdf5:0= ) |
842 |
- imagemagick? ( |
843 |
- !graphicsmagick? ( >=media-gfx/imagemagick-7:=[cxx] ) |
844 |
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
845 |
- ) |
846 |
- java? ( >=virtual/jre-1.6.0:* ) |
847 |
- opengl? ( |
848 |
- media-libs/freetype:2= |
849 |
- media-libs/fontconfig:1.0= |
850 |
- virtual/glu |
851 |
- >=x11-libs/fltk-1.3:1=[opengl,xft] |
852 |
- x11-libs/gl2ps:0= |
853 |
- ) |
854 |
- ssl? ( |
855 |
- !libressl? ( dev-libs/openssl:0= ) |
856 |
- libressl? ( dev-libs/libressl:0= ) |
857 |
- ) |
858 |
- portaudio? ( media-libs/portaudio ) |
859 |
- postscript? ( |
860 |
- app-text/epstool |
861 |
- media-gfx/pstoedit |
862 |
- media-gfx/transfig |
863 |
- ) |
864 |
- qhull? ( media-libs/qhull:0= ) |
865 |
- qrupdate? ( sci-libs/qrupdate:0= ) |
866 |
- readline? ( sys-libs/readline:0= ) |
867 |
- sndfile? ( media-libs/libsndfile ) |
868 |
- sparse? ( |
869 |
- sci-libs/arpack:0= |
870 |
- sci-libs/camd:0= |
871 |
- sci-libs/ccolamd:0= |
872 |
- sci-libs/cholmod:0= |
873 |
- sci-libs/colamd:0= |
874 |
- sci-libs/cxsparse:0= |
875 |
- sci-libs/umfpack:0= |
876 |
- ) |
877 |
- X? ( x11-libs/libX11:0= )" |
878 |
-DEPEND="${RDEPEND} |
879 |
- dev-util/gperf |
880 |
- sys-apps/texinfo |
881 |
- virtual/pkgconfig |
882 |
- doc? ( |
883 |
- dev-texlive/texlive-fontsrecommended |
884 |
- dev-texlive/texlive-plaingeneric |
885 |
- dev-texlive/texlive-metapost |
886 |
- virtual/latex-base |
887 |
- ) |
888 |
- gui? ( dev-qt/linguist-tools:5 ) |
889 |
- java? ( >=virtual/jdk-1.6.0 ) |
890 |
- qrupdate? ( app-misc/pax-utils ) |
891 |
- sparse? ( app-misc/pax-utils )" |
892 |
- |
893 |
-PATCHES=( |
894 |
- "${FILESDIR}"/${PN}-4.4.0-texi.patch |
895 |
- "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch |
896 |
- "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch |
897 |
- "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch |
898 |
- "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch |
899 |
- "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch |
900 |
- "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch |
901 |
- "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch |
902 |
-) |
903 |
- |
904 |
-src_prepare() { |
905 |
- # nasty prefix hacks for fltk:1 linking |
906 |
- if use prefix; then |
907 |
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" |
908 |
- fi |
909 |
- |
910 |
- # occasional fail on install, force regeneration (bug #401189) |
911 |
- rm doc/interpreter/contributors.texi || die |
912 |
- |
913 |
- default |
914 |
- eautoreconf |
915 |
-} |
916 |
- |
917 |
-src_configure() { |
918 |
- # [QA] detect underlinking #593670 |
919 |
- append-ldflags $(test-flags-CXX -Wl,-z,defs) |
920 |
- |
921 |
- # unfortunate dependency on mpi from hdf5 (bug #302621) |
922 |
- use hdf5 && has_version sci-libs/hdf5[mpi] && \ |
923 |
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77 |
924 |
- |
925 |
- econf \ |
926 |
- --localstatedir="${EPREFIX}/var/state/octave" \ |
927 |
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ |
928 |
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ |
929 |
- --disable-64 \ |
930 |
- --disable-jit \ |
931 |
- --enable-shared \ |
932 |
- --with-z \ |
933 |
- --with-bz2 \ |
934 |
- --without-OSMesa \ |
935 |
- $(use_enable static-libs static) \ |
936 |
- $(use_enable doc docs) \ |
937 |
- $(use_enable java) \ |
938 |
- $(use_enable readline) \ |
939 |
- $(use_with curl) \ |
940 |
- $(use_with fftw fftw3) \ |
941 |
- $(use_with fftw fftw3f) \ |
942 |
- $(use_enable fftw fftw-threads) \ |
943 |
- $(use_with glpk) \ |
944 |
- $(use_with hdf5) \ |
945 |
- $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \ |
946 |
- $(use_with opengl) \ |
947 |
- $(use_with opengl fltk) \ |
948 |
- $(use_with ssl openssl) \ |
949 |
- $(use_with portaudio) \ |
950 |
- $(use_with qhull) \ |
951 |
- $(use_with qrupdate) \ |
952 |
- $(use_with gui qt 5) \ |
953 |
- $(use_with sndfile) \ |
954 |
- $(use_with sparse arpack) \ |
955 |
- $(use_with sparse umfpack) \ |
956 |
- $(use_with sparse colamd) \ |
957 |
- $(use_with sparse ccolamd) \ |
958 |
- $(use_with sparse cholmod) \ |
959 |
- $(use_with sparse cxsparse) \ |
960 |
- $(use_with X x) |
961 |
-} |
962 |
- |
963 |
-src_compile() { |
964 |
- export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox |
965 |
- default |
966 |
- if use java; then |
967 |
- pax-mark m "${S}/src/.libs/octave-cli" |
968 |
- fi |
969 |
-} |
970 |
- |
971 |
-src_install() { |
972 |
- default |
973 |
- if use doc; then |
974 |
- dodoc $(find doc -name '*.pdf') |
975 |
- else |
976 |
- # bug 566134, macros.texi is installed by make install if use doc |
977 |
- insinto /usr/share/${PN}/${PV}/etc |
978 |
- doins doc/interpreter/macros.texi |
979 |
- fi |
980 |
- [[ -e test/fntests.log ]] && dodoc test/fntests.log |
981 |
- use java && \ |
982 |
- java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" |
983 |
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die |
984 |
- doenvd 99octave |
985 |
-} |
986 |
- |
987 |
-pkg_postinst() { |
988 |
- gnome2_icon_cache_update |
989 |
- xdg_mimeinfo_database_update |
990 |
- xdg_desktop_database_update |
991 |
-} |
992 |
- |
993 |
-pkg_postrm() { |
994 |
- gnome2_icon_cache_update |
995 |
- xdg_mimeinfo_database_update |
996 |
- xdg_desktop_database_update |
997 |
-} |
998 |
|
999 |
diff --git a/sci-mathematics/octave/octave-5.1.0.ebuild b/sci-mathematics/octave/octave-5.1.0.ebuild |
1000 |
deleted file mode 100644 |
1001 |
index d70fbe73ac5..00000000000 |
1002 |
--- a/sci-mathematics/octave/octave-5.1.0.ebuild |
1003 |
+++ /dev/null |
1004 |
@@ -1,192 +0,0 @@ |
1005 |
-# Copyright 1999-2019 Gentoo Authors |
1006 |
-# Distributed under the terms of the GNU General Public License v2 |
1007 |
- |
1008 |
-EAPI=6 |
1009 |
- |
1010 |
-inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils |
1011 |
- |
1012 |
-DESCRIPTION="High-level interactive language for numerical computations" |
1013 |
-LICENSE="GPL-3" |
1014 |
-HOMEPAGE="https://www.gnu.org/software/octave/" |
1015 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
1016 |
- |
1017 |
-SLOT="0/${PV}" |
1018 |
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl |
1019 |
- portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib" |
1020 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
1021 |
- |
1022 |
-RDEPEND=" |
1023 |
- app-arch/bzip2 |
1024 |
- app-text/ghostscript-gpl |
1025 |
- dev-libs/libpcre:3= |
1026 |
- sys-libs/ncurses:0= |
1027 |
- sys-libs/zlib |
1028 |
- virtual/blas |
1029 |
- virtual/lapack |
1030 |
- curl? ( net-misc/curl:0= ) |
1031 |
- fftw? ( sci-libs/fftw:3.0= ) |
1032 |
- glpk? ( sci-mathematics/glpk:0= ) |
1033 |
- gnuplot? ( sci-visualization/gnuplot ) |
1034 |
- gui? ( |
1035 |
- dev-qt/qtcore:5 |
1036 |
- dev-qt/qtgui:5 |
1037 |
- dev-qt/qthelp:5 |
1038 |
- dev-qt/qtnetwork:5 |
1039 |
- dev-qt/qtopengl:5 |
1040 |
- dev-qt/qtprintsupport:5 |
1041 |
- dev-qt/qtwidgets:5 |
1042 |
- x11-libs/qscintilla:= |
1043 |
- ) |
1044 |
- hdf5? ( sci-libs/hdf5:0= ) |
1045 |
- imagemagick? ( |
1046 |
- !graphicsmagick? ( >=media-gfx/imagemagick-7:=[cxx] ) |
1047 |
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
1048 |
- ) |
1049 |
- java? ( >=virtual/jre-1.6.0:* ) |
1050 |
- opengl? ( |
1051 |
- media-libs/freetype:2= |
1052 |
- media-libs/fontconfig:1.0= |
1053 |
- virtual/glu |
1054 |
- >=x11-libs/fltk-1.3:1=[opengl,xft] |
1055 |
- x11-libs/gl2ps:0= |
1056 |
- ) |
1057 |
- ssl? ( |
1058 |
- !libressl? ( dev-libs/openssl:0= ) |
1059 |
- libressl? ( dev-libs/libressl:0= ) |
1060 |
- ) |
1061 |
- portaudio? ( media-libs/portaudio ) |
1062 |
- postscript? ( |
1063 |
- app-text/epstool |
1064 |
- media-gfx/pstoedit |
1065 |
- media-gfx/transfig |
1066 |
- ) |
1067 |
- qhull? ( media-libs/qhull:0= ) |
1068 |
- qrupdate? ( sci-libs/qrupdate:0= ) |
1069 |
- readline? ( sys-libs/readline:0= ) |
1070 |
- sndfile? ( media-libs/libsndfile ) |
1071 |
- sparse? ( |
1072 |
- sci-libs/arpack:0= |
1073 |
- sci-libs/camd:0= |
1074 |
- sci-libs/ccolamd:0= |
1075 |
- sci-libs/cholmod:0= |
1076 |
- sci-libs/colamd:0= |
1077 |
- sci-libs/cxsparse:0= |
1078 |
- sci-libs/umfpack:0= |
1079 |
- ) |
1080 |
- X? ( x11-libs/libX11:0= )" |
1081 |
-DEPEND="${RDEPEND} |
1082 |
- dev-util/gperf |
1083 |
- sys-apps/texinfo |
1084 |
- virtual/pkgconfig |
1085 |
- doc? ( |
1086 |
- dev-texlive/texlive-fontsrecommended |
1087 |
- dev-texlive/texlive-plaingeneric |
1088 |
- dev-texlive/texlive-metapost |
1089 |
- virtual/latex-base |
1090 |
- ) |
1091 |
- gui? ( dev-qt/linguist-tools:5 ) |
1092 |
- java? ( >=virtual/jdk-1.6.0 ) |
1093 |
- qrupdate? ( app-misc/pax-utils ) |
1094 |
- sparse? ( app-misc/pax-utils )" |
1095 |
- |
1096 |
-PATCHES=( |
1097 |
- "${FILESDIR}"/${PN}-4.4.0-texi.patch |
1098 |
- "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch |
1099 |
- "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch |
1100 |
- "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch |
1101 |
- "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch |
1102 |
- "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch |
1103 |
- "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch |
1104 |
- "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch |
1105 |
-) |
1106 |
- |
1107 |
-src_prepare() { |
1108 |
- # nasty prefix hacks for fltk:1 linking |
1109 |
- if use prefix; then |
1110 |
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" |
1111 |
- fi |
1112 |
- |
1113 |
- # occasional fail on install, force regeneration (bug #401189) |
1114 |
- rm doc/interpreter/contributors.texi || die |
1115 |
- |
1116 |
- default |
1117 |
- eautoreconf |
1118 |
-} |
1119 |
- |
1120 |
-src_configure() { |
1121 |
- # unfortunate dependency on mpi from hdf5 (bug #302621) |
1122 |
- use hdf5 && has_version sci-libs/hdf5[mpi] && \ |
1123 |
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77 |
1124 |
- |
1125 |
- econf \ |
1126 |
- --localstatedir="${EPREFIX}/var/state/octave" \ |
1127 |
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ |
1128 |
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ |
1129 |
- --disable-64 \ |
1130 |
- --disable-jit \ |
1131 |
- --enable-shared \ |
1132 |
- --with-z \ |
1133 |
- --with-bz2 \ |
1134 |
- $(use_enable static-libs static) \ |
1135 |
- $(use_enable doc docs) \ |
1136 |
- $(use_enable java) \ |
1137 |
- $(use_enable readline) \ |
1138 |
- $(use_with curl) \ |
1139 |
- $(use_with fftw fftw3) \ |
1140 |
- $(use_with fftw fftw3f) \ |
1141 |
- $(use_enable fftw fftw-threads) \ |
1142 |
- $(use_with glpk) \ |
1143 |
- $(use_with hdf5) \ |
1144 |
- $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \ |
1145 |
- $(use_with opengl) \ |
1146 |
- $(use_with opengl fltk) \ |
1147 |
- $(use_with ssl openssl) \ |
1148 |
- $(use_with portaudio) \ |
1149 |
- $(use_with qhull) \ |
1150 |
- $(use_with qrupdate) \ |
1151 |
- $(use_with gui qt 5) \ |
1152 |
- $(use_with sndfile) \ |
1153 |
- $(use_with sparse arpack) \ |
1154 |
- $(use_with sparse umfpack) \ |
1155 |
- $(use_with sparse colamd) \ |
1156 |
- $(use_with sparse ccolamd) \ |
1157 |
- $(use_with sparse cholmod) \ |
1158 |
- $(use_with sparse cxsparse) \ |
1159 |
- $(use_with X x) |
1160 |
-} |
1161 |
- |
1162 |
-src_compile() { |
1163 |
- export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox |
1164 |
- default |
1165 |
- if use java; then |
1166 |
- pax-mark m "${S}/src/.libs/octave-cli" |
1167 |
- fi |
1168 |
-} |
1169 |
- |
1170 |
-src_install() { |
1171 |
- default |
1172 |
- if use doc; then |
1173 |
- dodoc $(find doc -name '*.pdf') |
1174 |
- else |
1175 |
- # bug 566134, macros.texi is installed by make install if use doc |
1176 |
- insinto /usr/share/${PN}/${PV}/etc |
1177 |
- doins doc/interpreter/macros.texi |
1178 |
- fi |
1179 |
- [[ -e test/fntests.log ]] && dodoc test/fntests.log |
1180 |
- use java && \ |
1181 |
- java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" |
1182 |
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die |
1183 |
- doenvd 99octave |
1184 |
-} |
1185 |
- |
1186 |
-pkg_postinst() { |
1187 |
- gnome2_icon_cache_update |
1188 |
- xdg_mimeinfo_database_update |
1189 |
- xdg_desktop_database_update |
1190 |
-} |
1191 |
- |
1192 |
-pkg_postrm() { |
1193 |
- gnome2_icon_cache_update |
1194 |
- xdg_mimeinfo_database_update |
1195 |
- xdg_desktop_database_update |
1196 |
-} |