sci-mathematics/octave: Remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4771
This commit is contained in:
David Seifert
2017-06-11 23:02:50 +02:00
parent 7351b363d1
commit 8fc2192f2c
12 changed files with 0 additions and 1107 deletions

View File

@@ -1,4 +1 @@
DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
DIST octave-3.8.2.tar.bz2 17834980 SHA256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc WHIRLPOOL c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
DIST octave-4.2.0.tar.gz 25320153 SHA256 443ba73782f3531c94bcf016f2f0362a58e186ddb8269af7dcce973562795567 SHA512 5d16665d4ef8f218320f471704f8702f3a2911cc4a083cae318c1df0f787d50dddbc511dc91e11379314d65cecac6d521abac026860feca19d11ffdb52d3e678 WHIRLPOOL b5973f4e96aa4785436afa7fcc637cce021e4b5e93c3368f61712c808191bc26e3ece9d649f0b99e3df03672cb6df16c28cad931f3317b555f4f3167e4092f34
DIST octave-4.2.1.tar.gz 25409651 SHA256 80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b SHA512 c437c57eb145ddea7b97124dc6406d130fd91c9141198b93bc756bb05cb3f7645a7c591443faeb65e69edf6abc2b8d5612e515f7703a04eed27213a2133009b7 WHIRLPOOL 4488287a9223ed99fe4ff3423f8ea5157cb538eb54918a53024082083a2f22d2af751f7dde0e489266a518d6ea5265e9c68536b5d5d9a186919d9979e9575333

View File

@@ -1,44 +0,0 @@
Description: Allow installation of already extracted packages with pkg.m
Forwarded: not-needed
Author: Thomas Weber <tweber@debian.org>
--- scripts/pkg/pkg.m.orig 2011-02-08 03:00:51.000000000 -0700
+++ scripts/pkg/pkg.m 2011-03-18 09:31:24.670165643 -0600
@@ -644,7 +644,14 @@
for i = 1:length (files)
tgz = files{i};
- if (exist (tgz, "file"))
+ ## The filename pointed to an uncompressed package to begin with.
+ if (exist (tgz, "dir"))
+ if (tgz(1) == '/')
+ packdir = tgz;
+ else
+ packdir = fullfile (pwd(), tgz);
+ endif
+ elseif (exist (tgz, "file"))
## Create a temporary directory.
tmpdir = tmpnam ();
tmpdirs{end+1} = tmpdir;
@@ -671,20 +678,12 @@
if (length (dirlist) > 3)
error ("bundles of packages are not allowed");
endif
- endif
- ## The filename pointed to an uncompressed package to begin with.
- if (exist (tgz, "dir"))
- dirlist = {".", "..", tgz};
+ ## The two first entries of dirlist are "." and "..".
+ packdir = fullfile (tmpdir, dirlist{3});
endif
if (exist (tgz, "file") || exist (tgz, "dir"))
- ## The two first entries of dirlist are "." and "..".
- if (exist (tgz, "file"))
- packdir = fullfile (tmpdir, dirlist{3});
- else
- packdir = fullfile (pwd(), dirlist{3});
- endif
packdirs{end+1} = packdir;
## Make sure the package contains necessary files.

View File

@@ -1,11 +0,0 @@
--- a/doc/interpreter/Makefile.am
+++ b/doc/interpreter/Makefile.am
@@ -202,6 +202,8 @@
$(AWK) -f $(srcdir)/mkcontrib.awk $(srcdir)/contributors.in > $@-t
mv $@-t $@
+preface.texi: contributors.texi
+
../../AUTHORS: preface.texi contributors.texi
rm -f AUTHORS
-$(MAKEINFO) -D AUTHORSONLY \

View File

@@ -1,13 +0,0 @@
should be fixed in octave-3.8 and above
--- src/gl2ps-renderer.cc.orig 2012-05-31 03:43:29.000000000 +0200
+++ src/gl2ps-renderer.cc 2012-10-10 18:41:10.526639551 +0200
@@ -223,7 +223,7 @@
// FIXME: handle margin and surrounding box
- glRasterPos3d (pos(0), pos(1), pos(2));
+ glRasterPos3d (pos(0), pos(1), pos.numel() > 2 ? pos(2) : 0.0);
octave_value string_prop = props.get_string ();

View File

@@ -1,378 +0,0 @@
diff -Nur octave-3.6.4.orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpreter/audio.texi
--- octave-3.6.4.orig/doc/interpreter/audio.texi 2013-02-21 12:37:50.000000000 -0800
+++ octave-3.6.4/doc/interpreter/audio.texi 2013-06-19 08:52:43.259790240 -0700
@@ -146,18 +146,18 @@
Load the RIFF/WAVE sound file @var{filename}, and return the samples
in vector @var{y}. If the file contains multichannel data, then
@var{y} is a matrix with the channels represented as columns.
-
-@deftypefnx {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
+@end deftypefn
+@deftypefn {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
Additionally return the sample rate (@var{fs}) in Hz and the number of bits
per sample (@var{bps}).
-
-@deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
+@end deftypefn
+@deftypefn {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
Read only the first @var{n} samples from each channel.
-
-@deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
+@end deftypefn
+@deftypefn {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
Read only samples @var{n1} through @var{n2} from each channel.
-
-@deftypefnx {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
+@end deftypefn
+@deftypefn {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
Return the number of samples (@var{n}) and channels (@var{ch})
instead of the audio data.
@seealso{@ref{doc-wavwrite,,wavwrite}}
diff -Nur octave-3.6.4.orig/doc/interpreter/io.texi octave-3.6.4/doc/interpreter/io.texi
--- octave-3.6.4.orig/doc/interpreter/io.texi 2013-02-21 12:37:51.000000000 -0800
+++ octave-3.6.4/doc/interpreter/io.texi 2013-06-19 08:52:43.259790240 -0700
@@ -1391,22 +1391,22 @@
for the file. Valid values for @var{arch} are:
@table @asis
-@samp{native}
+@item @samp{native}
The format of the current machine (this is the default).
-@samp{ieee-be}
+@item @samp{ieee-be}
IEEE big endian format.
-@samp{ieee-le}
+@item @samp{ieee-le}
IEEE little endian format.
-@samp{vaxd}
+@item @samp{vaxd}
VAX D floating format.
-@samp{vaxg}
+@item @samp{vaxg}
VAX G floating format.
-@samp{cray}
+@item @samp{cray}
Cray floating format.
@end table
diff -Nur octave-3.6.4.orig/doc/interpreter/octave.texi octave-3.6.4/doc/interpreter/octave.texi
--- octave-3.6.4.orig/doc/interpreter/octave.texi 2013-02-21 12:19:23.000000000 -0800
+++ octave-3.6.4/doc/interpreter/octave.texi 2013-06-19 08:52:43.259790240 -0700
@@ -129,7 +129,9 @@
@sp 2
@multitable @columnfractions 0.4 0.025 0.65
@item
-@flushright @image{octave_logo,2.1in} @end flushright
+@flushright
+@image{octave_logo,2.1in}
+@end flushright
@tab
@c this is a spacer column
@tab
diff -Nur octave-3.6.4.orig/doc/interpreter/plot.texi octave-3.6.4/doc/interpreter/plot.texi
--- octave-3.6.4.orig/doc/interpreter/plot.texi 2013-02-21 12:37:52.000000000 -0800
+++ octave-3.6.4/doc/interpreter/plot.texi 2013-06-19 08:52:43.260790204 -0700
@@ -2707,21 +2707,20 @@
Set the data aspect ratio of the current axes. The aspect ratio is
a normalized 3-element vector representing the span of the x, y, and
z-axes limits.
-
-@deftypefnx {Function File} {@var{data_aspect_ratio} =} daspect ( )
+@end deftypefn
+@deftypefn {Function File} {@var{data_aspect_ratio} =} daspect ( )
Return the data aspect ratio of the current axes.
-
-@deftypefnx {Function File} {} daspect (@var{mode})
+@end deftypefn
+@deftypefn {Function File} {} daspect (@var{mode})
Set the data aspect ratio mode of the current axes.
-
-@deftypefnx {Function File} {@var{data_aspect_ratio_mode} =} daspect ("mode")
+@end deftypefn
+@deftypefn {Function File} {@var{data_aspect_ratio_mode} =} daspect ("mode")
Return the data aspect ratio mode of the current axes.
-
-@deftypefnx {Function File} {} daspect (@var{hax}, @dots{})
+@end deftypefn
+@deftypefn {Function File} {} daspect (@var{hax}, @dots{})
Use the axes, with handle @var{hax}, instead of the current axes.
-
-@seealso{@ref{doc-axis,,axis}, @ref{doc-pbaspect,,pbaspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
@end deftypefn
+@seealso{@ref{doc-axis,,axis}, @ref{doc-pbaspect,,pbaspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
@c pbaspect scripts/plot/pbaspect.m
@@ -2730,21 +2729,20 @@
Set the plot box aspect ratio of the current axes. The aspect ratio
is a normalized 3-element vector representing the rendered lengths of
the x, y, and z-axes.
-
-@deftypefnx {Function File} {@var{plot_box_aspect_ratio} =} pbaspect ( )
+@end deftypefn
+@deftypefn {Function File} {@var{plot_box_aspect_ratio} =} pbaspect ( )
Return the plot box aspect ratio of the current axes.
-
-@deftypefnx {Function File} {} pbaspect (@var{mode})
+@end deftypefn
+@deftypefn {Function File} {} pbaspect (@var{mode})
Set the plot box aspect ratio mode of the current axes.
-
-@deftypefnx {Function File} {@var{plot_box_aspect_ratio_mode} =} pbaspect ("mode")
+@end deftypefn
+@deftypefn {Function File} {@var{plot_box_aspect_ratio_mode} =} pbaspect ("mode")
Return the plot box aspect ratio mode of the current axes.
-
-@deftypefnx {Function File} {} pbaspect (@var{hax}, @dots{})
+@end deftypefn
+@deftypefn {Function File} {} pbaspect (@var{hax}, @dots{})
Use the axes, with handle @var{hax}, instead of the current axes.
-
-@seealso{@ref{doc-axis,,axis}, @ref{doc-daspect,,daspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
@end deftypefn
+@seealso{@ref{doc-axis,,axis}, @ref{doc-daspect,,daspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
@node Three-dimensional Function Plotting
@@ -3147,7 +3145,7 @@
@item "hide"
Hide legend on the plot
-@itemx "toggle"
+@item "toggle"
Toggles between "hide" and "show"
@item "boxon"
@@ -3162,7 +3160,7 @@
@item "right"
Place text to the right of the keys
-@itemx "off"
+@item "off"
Delete the legend object
@end table
@end deftypefn
@@ -4139,11 +4137,11 @@
is sent to a file the size is determined by the plot box defined by
the figure's "paperposition" property.
-@itemx -append
+@item -append
Appends the PS, or PDF output to a pre-existing file of the
same type.
-@itemx -r@var{NUM}
+@item -r@var{NUM}
Resolution of bitmaps in pixels per inch. For both metafiles and
SVG the default is the screen resolution, for other it is 150 dpi.
To specify screen resolution, use "-r0".
@@ -6296,15 +6294,15 @@
A character indicating a plot marker to be place at each data point, or
@code{"none"}, meaning no markers should be displayed.
-@itemx markeredgecolor
+@item markeredgecolor
The color of the edge around the marker, or @code{"auto"}, meaning that
the edge color is the same as the face color. @xref{Colors}.
-@itemx markerfacecolor
+@item markerfacecolor
The color of the marker, or @code{"none"} to indicate that the marker
should not be filled. @xref{Colors}.
-@itemx markersize
+@item markersize
A number specifying the size of the marker. The default is 1. A value
of 2 is twice as large as the default, etc.
@end table
@@ -6442,7 +6440,8 @@
@deftypefn {Function File} {@var{value} =} getappdata (@var{h}, @var{name})
Return the @var{value} for named application data for the object(s) with
handle(s) @var{h}.
-@deftypefnx {Function File} {@var{appdata} =} getappdata (@var{h})
+@end deftypefn
+@deftypefn {Function File} {@var{appdata} =} getappdata (@var{h})
Return a structure, @var{appdata}, whose fields correspond to the appdata
properties.
@end deftypefn
diff -Nur octave-3.6.4.orig/doc/interpreter/poly.texi octave-3.6.4/doc/interpreter/poly.texi
--- octave-3.6.4.orig/doc/interpreter/poly.texi 2013-02-21 12:37:52.000000000 -0800
+++ octave-3.6.4/doc/interpreter/poly.texi 2013-06-19 08:52:43.260790204 -0700
@@ -82,8 +82,8 @@
(@var{x}-@var{mu}(1))/@var{mu}(2).
If @var{x} is a vector or matrix, the polynomial is evaluated for each of
the elements of @var{x}.
-
-@deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
+@end deftypefn
+@deftypefn {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
@deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s}, @var{mu})
In addition to evaluating the polynomial, the second output
represents the prediction interval, @var{y} +/- @var{dy}, which
diff -Nur octave-3.6.4.orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter/set.texi
--- octave-3.6.4.orig/doc/interpreter/set.texi 2013-02-21 12:37:52.000000000 -0800
+++ octave-3.6.4/doc/interpreter/set.texi 2013-06-19 08:52:43.260790204 -0700
@@ -150,8 +150,9 @@
3 4
@end group
@end example
+@end deftypefn
-@deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
+@deftypefn {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
Return index vectors @var{ia} and @var{ib} such that @code{a(ia)} and
@code{b(ib)} are disjoint sets whose union is @var{c}.
diff -Nur octave-3.6.4.orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpreter/signal.texi
--- octave-3.6.4.orig/doc/interpreter/signal.texi 2013-02-21 12:37:52.000000000 -0800
+++ octave-3.6.4/doc/interpreter/signal.texi 2013-06-19 08:52:43.261790169 -0700
@@ -454,17 +454,17 @@
For fastest computation, @var{n} should factor into a small number of
small primes.
-
-@deftypefnx {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
+@end deftypefn
+@deftypefn {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
Evaluate the response at the specific frequencies in the vector @var{w}.
The values for @var{w} are measured in radians.
-
-@deftypefnx {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
+@end deftypefn
+@deftypefn {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
Return frequencies in Hz instead of radians assuming a sampling rate
@var{Fs}. If you are evaluating the response at specific frequencies
@var{w}, those frequencies should be requested in Hz rather than radians.
-
-@deftypefnx {Function File} {} freqz (@dots{})
+@end deftypefn
+@deftypefn {Function File} {} freqz (@dots{})
Plot the pass band, stop band and phase response of @var{h} rather
than returning them.
@end deftypefn
diff -Nur octave-3.6.4.orig/doc/interpreter/strings.texi octave-3.6.4/doc/interpreter/strings.texi
--- octave-3.6.4.orig/doc/interpreter/strings.texi 2013-02-21 12:37:52.000000000 -0800
+++ octave-3.6.4/doc/interpreter/strings.texi 2013-06-19 08:52:43.261790169 -0700
@@ -1136,7 +1136,7 @@
@item %s
The word is parsed as a string.
-@itemx %f
+@item %f
@itemx %n
The word is parsed as a number and converted to double.
diff -Nur octave-3.6.4.orig/doc/interpreter/system.texi octave-3.6.4/doc/interpreter/system.texi
--- octave-3.6.4.orig/doc/interpreter/system.texi 2013-02-21 12:37:52.000000000 -0800
+++ octave-3.6.4/doc/interpreter/system.texi 2013-06-19 08:52:43.261790169 -0700
@@ -839,7 +839,7 @@
@deftypefnx {Function File} {} datetick (@var{axis}, @var{form})
@deftypefnx {Function File} {} datetick (@dots{}, "keeplimits")
@deftypefnx {Function File} {} datetick (@dots{}, "keepticks")
-@deftypefnx {Function File} {} datetick (@dots{ax}, @dots{})
+@comment @deftypefnx {Function File} {} datetick (@dots{ax}, @dots{})
Add date formatted tick labels to an axis. The axis the apply the
ticks to is determined by @var{axis} that can take the values "x",
"y" or "z". The default value is "x". The formatting of the labels is
@@ -1261,9 +1261,10 @@
interpreted as filename globbing patterns (as they are used by Unix shells).
Within a pattern
@table @code
-@itemx *
+
+@item *
matches any string, including the null string,
-@itemx ?
+@item ?
matches any single character, and
@item [@dots{}]
@@ -2789,8 +2790,8 @@
Display a header containing the current Octave version number, license
string and operating system, followed by the installed package names,
versions, and installation directories.
-
-@deftypefnx {Function File} {v =} ver ()
+@end deftypefn
+@deftypefn {Function File} {v =} ver ()
Return a vector of structures, respecting Octave and each installed package.
The structure includes the following fields.
@@ -2807,11 +2808,11 @@
@item Date
Date respecting the version/revision.
@end table
-
-@deftypefnx {Function File} {v =} ver ("Octave")
+@end deftypefn
+@deftypefn {Function File} {v =} ver ("Octave")
Return version information for Octave only.
-
-@deftypefnx {Function File} {v =} ver (@var{package})
+@end deftypefn
+@deftypefn {Function File} {v =} ver (@var{package})
Return version information for @var{package}.
@seealso{@ref{doc-version,,version}, @ref{doc-octave_config_info,,octave_config_info}}
@@ -2878,19 +2879,19 @@
@anchor{doc-license}
@deftypefn {Function File} {} license
Display the license of Octave.
-
-@deftypefnx {Function File} {} license ("inuse")
+@end deftypefn
+@deftypefn {Function File} {} license ("inuse")
Display a list of packages currently being used.
-
-@deftypefnx {Function File} {@var{retval} =} license ("inuse")
+@end deftypefn
+@deftypefn {Function File} {@var{retval} =} license ("inuse")
Return a structure containing the fields @code{feature} and @code{user}.
-
-@deftypefnx {Function File} {@var{retval} =} license ("test", @var{feature})
+@end deftypefn
+@deftypefn {Function File} {@var{retval} =} license ("test", @var{feature})
Return 1 if a license exists for the product identified by the string
@var{feature} and 0 otherwise. The argument @var{feature} is case
insensitive and only the first 27 characters are checked.
-
-@deftypefnx {Function File} {} license ("test", @var{feature}, @var{toggle})
+@end deftypefn
+@deftypefn {Function File} {} license ("test", @var{feature}, @var{toggle})
Enable or disable license testing for @var{feature}, depending on
@var{toggle}, which may be one of:
@@ -2902,8 +2903,8 @@
@item "disable"
Future tests for the specified license of @var{feature} return 0.
@end table
-
-@deftypefnx {Function File} {@var{retval} =} license ("checkout", @var{feature})
+@end deftypefn
+@deftypefn {Function File} {@var{retval} =} license ("checkout", @var{feature})
Check out a license for @var{feature}, returning 1 on success and 0
on failure.
diff -Nur octave-3.6.4.orig/doc/liboctave/liboctave.texi octave-3.6.4/doc/liboctave/liboctave.texi
--- octave-3.6.4.orig/doc/liboctave/liboctave.texi 2013-02-21 12:19:23.000000000 -0800
+++ octave-3.6.4/doc/liboctave/liboctave.texi 2013-06-19 08:54:27.914379692 -0700
@@ -80,10 +80,10 @@
@end ifnottex
@titlepage
-@title{Octave C++ Classes}
-@subtitle{Edition 1.0 for Octave version @value{VERSION}}
-@subtitle{September 1993}
-@author{John W. Eaton}
+@title@{Octave C++ Classes@}
+@subtitle@{Edition 1.0 for Octave version @value{VERSION}@}
+@subtitle@{September 1993@}
+@author@{John W. Eaton@}
@page
@vskip 0pt plus 1filll
Copyright @copyright{} 1996, 1997 John W. Eaton.

View File

@@ -1,11 +0,0 @@
--- octave-3.8.0-orig/m4/getcwd.m4 2013-12-28 09:00:39.000000000 +1100
+++ octave-3.8.0/m4/getcwd.m4 2014-02-15 13:11:06.783512435 +1100
@@ -108,7 +108,7 @@
gl_abort_bug=no
case "$host_os" in
- mingw*)
+ *-gnu* | gnu* | mingw*)
gl_cv_func_getcwd_path_max=yes
;;
*)

View File

@@ -1,16 +0,0 @@
--- octave-3.8.0-orig/configure.ac 2013-12-28 08:58:28.000000000 +1100
+++ octave-3.8.0/configure.ac 2014-02-15 20:11:53.821172574 +1100
@@ -995,11 +995,11 @@
MAGICK_LIBS=
PKG_CHECK_EXISTS([$magick++], [
- ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++
+ ## Make sure we only get -I, -D, -L, and -l flags. Some Graphics/ImageMagick++
## packages add extra flags that are useful when building
## Graphics/ImageMagick++ extentions. These extra flags break the
## Octave build.
- MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
+ MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'`
MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`

View File

@@ -1,138 +0,0 @@
--- octave-3.8.1-orig/libinterp/dldfcn/__magick_read__.cc 2014-03-07 06:37:51.000000000 +1100
+++ octave-3.8.1/libinterp/dldfcn/__magick_read__.cc 2014-03-09 00:18:04.593088077 +1100
@@ -38,8 +38,15 @@
#include "gripes.h"
#ifdef HAVE_MAGICK
-
+#define MAGICKCORE_EXCLUDE_DEPRECATED 1
#include <Magick++.h>
+#if !defined(QuantumRange) && defined(MaxRGB)
+#define QuantumRange MaxRGB
+#endif
+#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth)
+#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth
+#endif
+
#include <clocale>
// In theory, it should be enough to check the class:
@@ -104,12 +111,18 @@
get_depth (Magick::Image& img)
{
octave_idx_type depth = img.depth ();
+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
+#define Magick MagickCore
+#endif
if (depth == 8
&& img.channelDepth (Magick::RedChannel) == 1
&& img.channelDepth (Magick::CyanChannel) == 1
&& img.channelDepth (Magick::OpacityChannel) == 1
&& img.channelDepth (Magick::GrayChannel) == 1)
depth = 1;
+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
+#undef Magick
+#endif
return depth;
}
@@ -332,7 +345,10 @@
if (imvec[def_elem].depth () == 32)
divisor = std::numeric_limits<uint32_t>::max ();
else
- divisor = MaxRGB / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
+ {
+ using namespace Magick;
+ divisor = QuantumRange / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
+ }
// FIXME: this workaround should probably be fixed in GM by creating a
// new ImageType BilevelMatteType
@@ -464,7 +480,8 @@
for (octave_idx_type row = 0; row < nRows; row++)
{
img_fvec[idx] = pix->red / divisor;
- a_fvec[idx] = (MaxRGB - pix->opacity) / divisor;
+ using namespace Magick;
+ a_fvec[idx] = (QuantumRange - pix->opacity) / divisor;
pix += row_shift;
idx++;
}
@@ -541,7 +558,8 @@
rbuf[idx] = pix->red / divisor;
gbuf[idx] = pix->green / divisor;
bbuf[idx] = pix->blue / divisor;
- a_fvec[a_idx++] = (MaxRGB - pix->opacity) / divisor;
+ using namespace Magick;
+ a_fvec[a_idx++] = (QuantumRange - pix->opacity) / divisor;
pix += row_shift;
idx++;
}
@@ -626,7 +644,8 @@
mbuf[idx] = pix->green / divisor;
ybuf[idx] = pix->blue / divisor;
kbuf[idx] = pix->opacity / divisor;
- a_fvec[a_idx++] = (MaxRGB - *apix) / divisor;
+ using namespace Magick;
+ a_fvec[a_idx++] = (QuantumRange - *apix) / divisor;
pix += row_shift;
idx++;
}
@@ -685,9 +704,10 @@
// Restore locale from before GraphicsMagick initialisation
setlocale (LC_ALL, locale.c_str ());
- if (QuantumDepth < 32)
+ using namespace Magick;
+ if (MAGICKCORE_QUANTUM_DEPTH < 32)
warning ("your version of %s limits images to %d bits per pixel",
- MagickPackageName, QuantumDepth);
+ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
initialized = true;
}
@@ -1060,8 +1080,9 @@
// From GM documentation:
// Color arguments are must be scaled to fit the Quantum size according to
// the range of MaxRGB
+ using namespace Magick;
const double divisor = static_cast<double>((uint64_t (1) << bitdepth) - 1)
- / MaxRGB;
+ / QuantumRange;
const P *img_fvec = img.fortran_vec ();
const P *a_fvec = alpha.fortran_vec ();
@@ -1111,8 +1132,9 @@
for (octave_idx_type row = 0; row < nRows; row++)
{
double grey = double (*img_fvec) / divisor;
+ using namespace Magick;
Magick::Color c (grey, grey, grey,
- MaxRGB - (double (*a_fvec) / divisor));
+ QuantumRange - (double (*a_fvec) / divisor));
pix[GM_idx] = c;
img_fvec++;
a_fvec++;
@@ -1178,10 +1200,11 @@
{
for (octave_idx_type row = 0; row < nRows; row++)
{
+ using namespace Magick;
Magick::Color c (double (*img_fvec) / divisor,
double (img_fvec[G_offset]) / divisor,
double (img_fvec[B_offset]) / divisor,
- MaxRGB - (double (*a_fvec) / divisor));
+ QuantumRange - (double (*a_fvec) / divisor));
pix[GM_idx] = c;
img_fvec++;
a_fvec++;
@@ -1257,7 +1280,8 @@
double (img_fvec[Y_offset]) / divisor,
double (img_fvec[K_offset]) / divisor);
pix[GM_idx] = c;
- ind[GM_idx] = MaxRGB - (double (*a_fvec) / divisor);
+ using namespace Magick;
+ ind[GM_idx] = QuantumRange - (double (*a_fvec) / divisor);
img_fvec++;
a_fvec++;
GM_idx += nCols;

View File

@@ -1,41 +0,0 @@
--- a/scripts/pkg/private/install.m
+++ b/scripts/pkg/private/install.m
@@ -62,7 +62,14 @@
for i = 1:length (files)
tgz = files{i};
- if (exist (tgz, "file"))
+ ## The filename pointed to an uncompressed package to begin with.
+ if (exist (tgz, "dir"))
+ if (tgz(1) == '/')
+ packdir = tgz;
+ else
+ packdir = fullfile (pwd(), tgz);
+ endif
+ elseif (exist (tgz, "file"))
## Create a temporary directory.
tmpdir = tmpnam ();
tmpdirs{end+1} = tmpdir;
@@ -89,20 +96,12 @@
if (length (dirlist) > 3)
error ("bundles of packages are not allowed");
endif
- endif
- ## The filename pointed to an uncompressed package to begin with.
- if (exist (tgz, "dir"))
- dirlist = {".", "..", tgz};
+ ## The two first entries of dirlist are "." and "..".
+ packdir = fullfile (tmpdir, dirlist{3});
endif
if (exist (tgz, "file") || exist (tgz, "dir"))
- ## The two first entries of dirlist are "." and "..".
- if (exist (tgz, "file"))
- packdir = fullfile (tmpdir, dirlist{3});
- else
- packdir = fullfile (pwd (), dirlist{3});
- endif
packdirs{end+1} = packdir;
## Make sure the package contains necessary files.

View File

@@ -1,124 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1
inherit autotools-utils multilib toolchain-funcs fortran-2
DESCRIPTION="High-level interactive language for numerical computations"
LICENSE="GPL-3"
HOMEPAGE="http://www.octave.org/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
SLOT="0/${PV}"
IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick opengl postscript
+qhull +qrupdate readline +sparse static-libs X zlib"
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
RDEPEND="
app-text/ghostscript-gpl
dev-libs/libpcre
sys-libs/ncurses:0=
virtual/lapack
curl? ( net-misc/curl )
fftw? ( sci-libs/fftw:3.0 )
glpk? ( sci-mathematics/glpk )
gnuplot? ( sci-visualization/gnuplot )
hdf5? ( sci-libs/hdf5 )
imagemagick? (
!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
)
opengl? (
media-libs/freetype:2
media-libs/fontconfig
>=x11-libs/fltk-1.3:1[opengl]
virtual/glu )
postscript? (
app-text/epstool
media-gfx/pstoedit
media-gfx/transfig )
qhull? ( media-libs/qhull )
qrupdate? ( sci-libs/qrupdate )
readline? ( sys-libs/readline:0 )
sparse? (
sci-libs/arpack
sci-libs/camd
sci-libs/ccolamd
sci-libs/cholmod
sci-libs/colamd
sci-libs/cxsparse
sci-libs/umfpack )
X? ( x11-libs/libX11 )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
doc? (
virtual/latex-base
|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
sys-apps/texinfo )
dev-util/gperf
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,texi}.patch
"${FILESDIR}"/${PN}-3.6.3-legendtext.patch
"${FILESDIR}"/${PN}-3.6.4-texinfo.patch
)
src_prepare() {
# nasty prefix hack for fltk:1 linking
if use prefix && use opengl; then
sed -i \
-e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
configure.ac
fi
autotools-utils_src_prepare
}
src_configure() {
# occasional fail on install, force regeneration (bug #401189)
rm doc/interpreter/contributors.texi || die
# unfortunate dependency on mpi from hdf5 (bug #302621)
use hdf5 && has_version sci-libs/hdf5[mpi] && \
export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
local myeconfargs=(
--localstatedir="${EPREFIX}/var/state/octave"
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
$(use_enable prefix rpath)
$(use_enable doc docs)
$(use_enable readline)
$(use_with curl)
$(use_with fftw fftw3)
$(use_with fftw fftw3f)
$(use_with glpk)
$(use_with hdf5)
$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
$(use_with opengl)
$(use_with qhull)
$(use_with qrupdate)
$(use_with sparse arpack)
$(use_with sparse umfpack)
$(use_with sparse colamd)
$(use_with sparse ccolamd)
$(use_with sparse cholmod)
$(use_with sparse cxsparse)
$(use_with X x)
$(use_with zlib z)
)
autotools-utils_src_configure
}
src_install() {
autotools-utils_src_install
use doc && dodoc $(find doc -name \*.pdf)
[[ -e test/fntests.log ]] && dodoc test/fntests.log
echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
doenvd 99octave
}

View File

@@ -1,151 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1
inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
DESCRIPTION="High-level interactive language for numerical computations"
LICENSE="GPL-3"
HOMEPAGE="http://www.octave.org/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
SLOT="0/${PV}"
IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
postscript +qhull +qrupdate readline +sparse static-libs X zlib"
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
RDEPEND="
app-text/ghostscript-gpl
dev-libs/libpcre:3=
sys-libs/ncurses:0=
virtual/lapack
curl? ( net-misc/curl:0= )
fftw? ( sci-libs/fftw:3.0= )
glpk? ( sci-mathematics/glpk:0= )
gnuplot? ( sci-visualization/gnuplot )
gui? ( x11-libs/qscintilla:=[qt4(-)] )
hdf5? ( sci-libs/hdf5:0= )
imagemagick? (
!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
)
java? ( >=virtual/jre-1.6.0:* )
opengl? (
media-libs/freetype:2=
media-libs/fontconfig:1.0=
>=x11-libs/fltk-1.3:1=[opengl,xft]
x11-libs/gl2ps:0=
virtual/glu )
postscript? (
app-text/epstool
media-gfx/pstoedit
media-gfx/transfig )
qhull? ( media-libs/qhull:0= )
qrupdate? ( sci-libs/qrupdate:0= )
readline? ( sys-libs/readline:0= )
sparse? (
sci-libs/arpack:0=
sci-libs/camd:0=
sci-libs/ccolamd:0=
sci-libs/cholmod:0=
sci-libs/colamd:0=
sci-libs/cxsparse:0=
sci-libs/umfpack:0= )
X? ( x11-libs/libX11:0= )
zlib? ( sys-libs/zlib:0= )"
DEPEND="${RDEPEND}
qrupdate? ( app-misc/pax-utils )
sparse? ( app-misc/pax-utils )
java? ( >=virtual/jdk-1.6.0 )
doc? (
virtual/latex-base
|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
dev-texlive/texlive-metapost
sys-apps/texinfo )
dev-util/gperf
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-3.4.3-texi.patch
"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
"${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
)
src_prepare() {
# nasty prefix hacks for fltk:1 and qt4 linking
if use prefix; then
use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
fi
# Fix bug 501756
sed -i \
-e 's@A-Za-z0-9@[:alnum:]@g' \
-e 's@A-Za-z@[:alpha:]@g' \
libinterp/mkbuiltins || die
autotools-utils_src_prepare
}
src_configure() {
# occasional fail on install, force regeneration (bug #401189)
rm doc/interpreter/contributors.texi || die
# unfortunate dependency on mpi from hdf5 (bug #302621)
use hdf5 && has_version sci-libs/hdf5[mpi] && \
export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
local myeconfargs=(
--localstatedir="${EPREFIX}/var/state/octave"
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
$(use_enable doc docs)
$(use_enable java)
$(use_enable gui)
# requires llvm < 3.5
--disable-jit
$(use_enable readline)
$(use_with curl)
$(use_with fftw fftw3)
$(use_with fftw fftw3f)
$(use_enable fftw fftw-threads)
$(use_with glpk)
$(use_with hdf5)
$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
$(use_with opengl)
$(use_with qhull)
$(use_with qrupdate)
$(use_with sparse arpack)
$(use_with sparse umfpack)
$(use_with sparse colamd)
$(use_with sparse ccolamd)
$(use_with sparse cholmod)
$(use_with sparse cxsparse)
$(use_with X x)
$(use_with zlib z)
)
autotools-utils_src_configure
}
src_compile() {
emake
if use java ; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
src_install() {
autotools-utils_src_install
use doc && dodoc $(find doc -name \*.pdf)
[[ -e test/fntests.log ]] && dodoc test/fntests.log
use java && \
java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
doenvd 99octave
}

View File

@@ -1,177 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs
DESCRIPTION="High-level interactive language for numerical computations"
LICENSE="GPL-3"
HOMEPAGE="http://www.octave.org/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
SLOT="0/${PV}"
IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl
portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
RDEPEND="
app-arch/bzip2
app-text/ghostscript-gpl
dev-libs/libpcre:3=
sys-libs/ncurses:0=
sys-libs/zlib
virtual/blas
virtual/lapack
curl? ( net-misc/curl:0= )
fftw? ( sci-libs/fftw:3.0= )
glpk? ( sci-mathematics/glpk:0= )
gnuplot? ( sci-visualization/gnuplot )
hdf5? ( sci-libs/hdf5:0= )
imagemagick? (
!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
)
java? ( >=virtual/jre-1.6.0:* )
opengl? (
media-libs/freetype:2=
media-libs/fontconfig:1.0=
>=x11-libs/fltk-1.3:1=[opengl,xft]
x11-libs/gl2ps:0=
virtual/glu
)
openssl? ( dev-libs/openssl:0= )
portaudio? ( media-libs/portaudio )
postscript? (
app-text/epstool
media-gfx/pstoedit
media-gfx/transfig
)
qhull? ( media-libs/qhull:0= )
qrupdate? ( sci-libs/qrupdate:0= )
gui? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
>=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
)
readline? ( sys-libs/readline:0= )
sndfile? ( media-libs/libsndfile )
sparse? (
sci-libs/arpack:0=
sci-libs/camd:0=
sci-libs/ccolamd:0=
sci-libs/cholmod:0=
sci-libs/colamd:0=
sci-libs/cxsparse:0=
sci-libs/umfpack:0=
)
X? ( x11-libs/libX11:0= )"
DEPEND="${RDEPEND}
gui? ( dev-qt/linguist-tools:5 )
qrupdate? ( app-misc/pax-utils )
sparse? ( app-misc/pax-utils )
java? ( >=virtual/jdk-1.6.0 )
doc? (
virtual/latex-base
dev-texlive/texlive-fontsrecommended
|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
dev-texlive/texlive-metapost
)
sys-apps/texinfo
dev-util/gperf
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-4.2.0-texi.patch
"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
"${FILESDIR}"/${PN}-4.2.0-imagemagick-configure.patch
"${FILESDIR}"/${PN}-4.2.0-imagemagick.patch
"${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch
"${FILESDIR}"/${PN}-4.2.0-ncurses-pkgconfig.patch
"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
"${FILESDIR}"/${PN}-4.2.0-fix-qscintilla-detection.patch
)
src_prepare() {
# nasty prefix hacks for fltk:1 and qt4 linking
if use prefix; then
use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
fi
# occasional fail on install, force regeneration (bug #401189)
rm doc/interpreter/contributors.texi || die
default
eautoreconf
}
src_configure() {
# [QA] detect underlinking #593670
append-ldflags $(test-flags-CXX -Wl,-z,defs)
# unfortunate dependency on mpi from hdf5 (bug #302621)
use hdf5 && has_version sci-libs/hdf5[mpi] && \
export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
econf \
--localstatedir="${EPREFIX}/var/state/octave" \
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
--disable-64 \
--disable-jit \
--enable-shared \
--with-z \
--with-bz2 \
--without-OSMesa \
$(use_enable static-libs static) \
$(use_enable doc docs) \
$(use_enable java) \
$(use_enable readline) \
$(use_with curl) \
$(use_with fftw fftw3) \
$(use_with fftw fftw3f) \
$(use_enable fftw fftw-threads) \
$(use_with glpk) \
$(use_with hdf5) \
$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
$(use_with opengl) \
$(use_with opengl fltk) \
$(use_with openssl) \
$(use_with portaudio) \
$(use_with qhull) \
$(use_with qrupdate) \
$(use_with gui qt 5) \
$(use_with sndfile) \
$(use_with sparse arpack) \
$(use_with sparse umfpack) \
$(use_with sparse colamd) \
$(use_with sparse ccolamd) \
$(use_with sparse cholmod) \
$(use_with sparse cxsparse) \
$(use_with X x)
}
src_compile() {
default
if use java; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
src_install() {
default
if use doc; then
dodoc $(find doc -name '*.pdf')
else
# bug 566134, macros.texi is installed by make install if use doc
insinto /usr/share/${PN}/${PV}/etc
doins doc/interpreter/macros.texi
fi
[[ -e test/fntests.log ]] && dodoc test/fntests.log
use java && \
java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
doenvd 99octave
}