diff options
author | markusle <markusle@32389bae-6d03-0410-99cf-db05cde120eb> | 2008-09-28 11:19:28 +0000 |
---|---|---|
committer | markusle <markusle@32389bae-6d03-0410-99cf-db05cde120eb> | 2008-09-28 11:19:28 +0000 |
commit | 41830a5193f0fa72d2f12e42049da2e1f7148079 (patch) | |
tree | 6de50ce695793c1bda0ea9acbdca2d26435c6e5c | |
parent | cdsclient: bump to 3.01 (diff) | |
download | sci-41830a5193f0fa72d2f12e42049da2e1f7148079.tar.gz sci-41830a5193f0fa72d2f12e42049da2e1f7148079.tar.bz2 sci-41830a5193f0fa72d2f12e42049da2e1f7148079.zip |
Removed octave since octave-3 has been merged to the main tree.
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1300 32389bae-6d03-0410-99cf-db05cde120eb
-rw-r--r-- | sci-mathematics/octave/ChangeLog | 43 | ||||
-rw-r--r-- | sci-mathematics/octave/Manifest | 14 | ||||
-rw-r--r-- | sci-mathematics/octave/files/octave-2.9.18-test-fix.patch | 28 | ||||
-rw-r--r-- | sci-mathematics/octave/files/octave-3.0.0-pkg.patch | 12 | ||||
-rw-r--r-- | sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch | 19 | ||||
-rw-r--r-- | sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch | 21 | ||||
-rw-r--r-- | sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch | 76 | ||||
-rw-r--r-- | sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch | 48 | ||||
-rw-r--r-- | sci-mathematics/octave/files/octave-3.0.1-test-fix.patch | 53 | ||||
-rw-r--r-- | sci-mathematics/octave/octave-2.9.19.ebuild | 124 | ||||
-rw-r--r-- | sci-mathematics/octave/octave-3.0.0.ebuild | 142 | ||||
-rw-r--r-- | sci-mathematics/octave/octave-3.0.1.ebuild | 111 |
12 files changed, 0 insertions, 691 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog deleted file mode 100644 index 1d94e6cd9..000000000 --- a/sci-mathematics/octave/ChangeLog +++ /dev/null @@ -1,43 +0,0 @@ -# ChangeLog for sci-mathematics/octave-forge-parallel -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 02 Jun 2008; Markus Dittrich <markusle@gentoo.org> - +files/octave-3.0.1-chi2rnd.patch, octave-3.0.1.ebuild: - Added patch to fix stdout problem in chi2rnd function. Thanks much to Sven - Mattisson <sven.mattisson@gmail.com> for making us aware of this. - - 29 May 2008; Markus Dittrich <markusle@gentoo.org> octave-3.0.1.ebuild: - More cleanups. - - 28 May 2008; Markus Dittrich <markusle@gentoo.org> - +files/octave-3.0.1-add_syspath.patch, - +files/octave-3.0.1-fix_handle_for_plotyy.patch, - +files/octave-3.0.1-no_helvetica.patch, - +files/octave-3.0.1-test-fix.patch, octave-3.0.1.ebuild: - Major ebuild cleanup. Disabled failing tests and added patched from debian - svn. - - 18 Mar 2008; Markus Dittrich <markusle@gentoo.org> - +files/octave-3.0.0-pkg.patch, octave-3.0.0.ebuild: - Added patch to have 'pkg install' exit with error code if it can't - find the source tarball. - - 30 Dec 2007; Markus Dittrich <markusle@gentoo.org> +octave-3.0.0.ebuild: - Version bump. - - 14 Dec 2007; Markus Dittrich <markusle@gentoo.org> +octave-2.9.19.ebuild: - Version bump. - - 14 Dec 2007; Markus Dittrich <markusle@gentoo.org> octave-2.9.18.ebuild: - Switched SRC_URI to main gnu mirror. - - 07 Dec 2007; Markus Dittrich <markusle@gentoo.org> - -files/octave-2.9.12-test-fix.patch, -files/octave-2.9.14-test-fix.patch, - +files/octave-2.9.18-test-fix.patch, -octave-2.9.14.ebuild, - -octave-2.9.15.ebuild, +octave-2.9.18.ebuild: - Version bump. - - 20 Oct 2007; Markus Dittrich <markusle@gentoo.org> ChangeLog: - Initial import. - diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest deleted file mode 100644 index 011080eb5..000000000 --- a/sci-mathematics/octave/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX octave-2.9.18-test-fix.patch 1241 RMD160 1cac3e4cd2cce480a184a8319ce0cb2d34503b2c SHA1 87905a77f3b9f63b56bd8c4ee8ae12e3a3c2ee4a SHA256 f72d643e3b9e143005dd450bb25a15ae87a41a0dcbbc34f3cced6da0f9980a3b -AUX octave-3.0.0-pkg.patch 471 RMD160 c8d7c9fddce78ef1344e5d8c8d3b95df432956c1 SHA1 43931da426dd988c451ff852391f33d236941efa SHA256 48974218d067c8e85d7cf0d4eea3921b5db743872f53131012e4c19696feb414 -AUX octave-3.0.1-add_syspath.patch 821 RMD160 951af410580969ef2dafbf76717043cbd1c5efce SHA1 b6516d6270a98af5427d267a8f91255e50bbd62e SHA256 8c592513223782ba6110d89fae55c287788330fc74eafa526e2c69abeae1276e -AUX octave-3.0.1-chi2rnd.patch 748 RMD160 af57c8e2fd1c326a92d7078e9d076d3b952dd82a SHA1 8d87e962dc764e4330f69ff82b1dca88c0337803 SHA256 8cb556adf356bff836ab4d079f213b1e1ad7a2f6b03892ea7371e458c4eb32f1 -AUX octave-3.0.1-fix_handle_for_plotyy.patch 2112 RMD160 91679fed7b115c7f0e48824c8471359b34692f20 SHA1 e2d4dc03ed34a010cfff2205e384a35d70431255 SHA256 ee602e772b74195be2967662f799eaceb54d715cf32e6d247ad7198a629e5bc8 -AUX octave-3.0.1-no_helvetica.patch 1816 RMD160 7bfe46409699b6bd199ab725e6e324e4eea69003 SHA1 8934236ea328a7ede2016f412909c0d93842d4a1 SHA256 432b490ff6055b12d219e268391859e549e4076073ca8029b454e7644965c8e3 -AUX octave-3.0.1-test-fix.patch 2171 RMD160 a8275924c3161a7f78bcb84426527060d6c12ddd SHA1 0af5a53b2f251f9bf06976ec800b5eb217adf0bf SHA256 229bae7b5163c9d06d5df9d96db2c2ef3e0613576ec8f1b91698f286940247a0 -DIST octave-2.9.19.tar.bz2 9807420 RMD160 c0f7d7b384f3e2f51cdb7ee0360d4ddf52e4493a SHA1 1cee64ccbcce0aca2b771175fcfbca817c9ba705 SHA256 684165a4b7f45e02761dded6ecf50d57652d55beb2295cdac3b7518ec6dc02d8 -DIST octave-3.0.0.tar.bz2 9821575 RMD160 02fc58b63210ec99cfcad9dc2cee2ad1b6d11326 SHA1 874b3d40db5d882e37614ffa6cdb9fdd71e173f8 SHA256 f2351eed4f6505993275947802a35ecbc9b7e587ebbb5ee7ba72d54280de4418 -DIST octave-3.0.1.tar.bz2 9854711 RMD160 3141454b1e9a8efcac0772aed63c27aaad082861 SHA1 e4cebe74a1182df610d91e45974653227dd4b342 SHA256 310bfc622d74fd5c3727c2304ad594888f3016a89f183af7afdfef3fd5c15e6d -EBUILD octave-2.9.19.ebuild 3730 RMD160 83bede43b38adeeb947a73eab8b1a72dfd2b423c SHA1 91e0f8ca90ce245fe008f0fe1b4c19f31c6c731b SHA256 b9ed09502561add7639a7b0494b3f101583ad4cfe49f1d818d3342c39be4d42b -EBUILD octave-3.0.0.ebuild 4143 RMD160 29397d608bf4d27ea1c230a6152d20ab69e5079b SHA1 991374e1717b25034f230cfbc6963470bef7f43c SHA256 18de83949602b28e6bb48a3d1a1df79f8b1cee3ab47fa32b6d0ffc645f2af67c -EBUILD octave-3.0.1.ebuild 2801 RMD160 c63df903a13e89348a9457a38217ab7771ce50be SHA1 64fe401aa01b8769ac9fcc339153465038cddcca SHA256 071e95d52e3d7bf487a373e7053c0af5fefb2922509f22d2c0865c8b6cd393a5 -MISC ChangeLog 1661 RMD160 a552e29657914f73de547a4b9f36099ed188026b SHA1 e0a7df17d86352242581b50a36fa1042e5f6d070 SHA256 62f481d98b8adaa7a3f6ab49fc98194d429e18b5b0bb364672fa1b77ed8ecc30 diff --git a/sci-mathematics/octave/files/octave-2.9.18-test-fix.patch b/sci-mathematics/octave/files/octave-2.9.18-test-fix.patch deleted file mode 100644 index a575de886..000000000 --- a/sci-mathematics/octave/files/octave-2.9.18-test-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur octave-2.9.18/scripts/general/interpft.m octave-2.9.18.new/scripts/general/interpft.m ---- octave-2.9.18/scripts/general/interpft.m 2007-10-12 17:27:21.000000000 -0400 -+++ octave-2.9.18.new/scripts/general/interpft.m 2007-12-07 17:19:57.000000000 -0500 -@@ -108,7 +108,6 @@ - %! x = [0:10]'; y = sin(x); n = length (x); - %!assert (interpft(y, n), y, eps); - %!assert (interpft(y', n), y', eps); --%!assert (interpft([y,y],n), [y,y], eps); - - %!error (interpft(y,n,0)) - %!error (interpft(y,[n,n])) -diff -Naur octave-2.9.18/test/test_system.m octave-2.9.18.new/test/test_system.m ---- octave-2.9.18/test/test_system.m 2007-10-12 17:27:37.000000000 -0400 -+++ octave-2.9.18.new/test/test_system.m 2007-12-07 17:25:15.000000000 -0500 -@@ -376,13 +376,6 @@ - %% test/octave.test/system/file_in_path-4.m - %!error <Invalid call to file_in_path.*> file_in_path ("foo", "bar", "baz", "ooka"); - --%% test/octave.test/system/tilde_expand-1.m --%!test --%! x = getpwuid (getuid ()); --%! assert((strcmp (x.dir, tilde_expand ("~")) --%! && strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name))) --%! && strcmp ("foobar", tilde_expand ("foobar")))); -- - %% test/octave.test/system/tilde_expand-2.m - %!error <Invalid call to tilde_expand.*> tilde_expand (); - diff --git a/sci-mathematics/octave/files/octave-3.0.0-pkg.patch b/sci-mathematics/octave/files/octave-3.0.0-pkg.patch deleted file mode 100644 index 77fe1fb64..000000000 --- a/sci-mathematics/octave/files/octave-3.0.0-pkg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur octave-3.0.0/scripts/pkg/pkg.m octave-3.0.0.new/scripts/pkg/pkg.m ---- octave-3.0.0/scripts/pkg/pkg.m 2007-12-20 11:55:26.000000000 -0500 -+++ octave-3.0.0.new/scripts/pkg/pkg.m 2008-03-16 06:32:07.000000000 -0400 -@@ -514,7 +514,7 @@ - ## Warn about non existent files - for i = 1:length (files) - if (isempty (glob(files{i}))) -- warning ("file %s does not exist", files{i}); -+ error ("file %s does not exist", files{i}); - endif - endfor - diff --git a/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch b/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch deleted file mode 100644 index 7abd25bfe..000000000 --- a/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch +++ /dev/null @@ -1,19 +0,0 @@ -# patch from debian svn -## 50_add_syspath.dpatch by Thomas Weber <thomas.weber.mail@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Put library path in loadpath (bug fix for #477556) -## DP: http://www.cae.wisc.edu/pipermail/octave-maintainers/2008-May/007330.html -diff -urNad octave3.0-3.0.1~/src/load-path.cc octave3.0-3.0.1/src/load-path.cc ---- octave3.0-3.0.1~/src/load-path.cc 2008-04-21 18:00:20.000000000 +0200 -+++ octave3.0-3.0.1/src/load-path.cc 2008-05-21 10:20:38.000000000 +0200 -@@ -382,7 +382,7 @@ - xpath += dir_path::path_sep_str + tpath; - - if (! sys_path.empty ()) -- xpath += sys_path; -+ xpath += dir_path::path_sep_str + sys_path; - - do_set (xpath, false); - } -diff -urNad octave3.0-3.0.1~/src/load-path.cc.orig octave3.0-3.0.1/src/load-path.cc.orig diff --git a/sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch b/sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch deleted file mode 100644 index 5a9f6abf5..000000000 --- a/sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur octave-3.0.1/scripts/statistics/distributions/chi2rnd.m octave-3.0.1.new/scripts/statistics/distributions/chi2rnd.m ---- octave-3.0.1/scripts/statistics/distributions/chi2rnd.m 2008-04-21 11:58:40.000000000 -0400 -+++ octave-3.0.1.new/scripts/statistics/distributions/chi2rnd.m 2008-06-02 06:42:34.000000000 -0400 -@@ -68,7 +68,7 @@ - if (find (!(n > 0) | !(n < Inf))) - rnd = NaN * ones (sz); - else -- rnd = 2 * randg(n/2, sz) -+ rnd = 2 * randg(n/2, sz); - endif - else - [retval, n, dummy] = common_size (n, ones (sz)); -@@ -84,7 +84,7 @@ - - k = find ((n > 0) & (n < Inf)); - if (any (k)) -- rnd(k) = 2 * randg(n(k)/2, size(k)) -+ rnd(k) = 2 * randg(n(k)/2, size(k)); - endif - endif - diff --git a/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch b/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch deleted file mode 100644 index 38fafc142..000000000 --- a/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch +++ /dev/null @@ -1,76 +0,0 @@ -## patch from debian svn -## 50_fix_handle_for_plotyy.dpatch by Thomas Weber <thomas.weber.mail@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Bug fix for 472069 -diff -urNad octave3.0-3.0.0~/scripts/plot/plotyy.m octave3.0-3.0.0/scripts/plot/plotyy.m ---- octave3.0-3.0.0~/scripts/plot/plotyy.m 2007-12-13 18:48:59.000000000 +0100 -+++ octave3.0-3.0.0/scripts/plot/plotyy.m 2008-03-28 12:20:12.000000000 +0100 -@@ -55,7 +55,37 @@ - - function [Ax, H1, H2] = plotyy (varargin) - -- [ax, varargin] = __plt_get_axis_arg__ ("plotyy", varargin{:}); -+ ## Don't use __plt_get_axis_arg__ here as ax is a two vector for plotyy -+ if (nargin > 1 && length (varargin{1}) == 2 && ishandle(varargin{1}(1)) -+ && ishandle(varargin{1}(2)) && -+ all (floor (varargin{1}) != varargin{1})) -+ obj1 = get (varargin{1}(1)); -+ obj2 = get (varargin{1}(2)); -+ if (strcmp (obj1.type, "axes") || strcmp (obj2.type, "axes")) -+ ax = [obj1, obj2]; -+ varargin(1) = []; -+ if (isempty (varargin)) -+ varargin = {}; -+ endif -+ else -+ error ("plotyy: expecting first argument to be axes handle"); -+ endif -+ else -+ f = get (0, "currentfigure"); -+ if (isempty (f)) -+ ax(1) = axes (); -+ ax(2) = axes (); -+ else -+ ax = get (f, "children"); -+ for i = 3 : length (ax) -+ delete (ax (i)); -+ endfor -+ ax = ax(1:2); -+ endif -+ if (nargin < 2) -+ varargin = {}; -+ endif -+ endif - - if (nargin < 4) - print_usage (); -@@ -63,8 +93,6 @@ - - oldh = gca (); - unwind_protect -- axes (ax); -- newplot (); - [ax, h1, h2] = __plotyy__ (ax, varargin{:}); - unwind_protect_cleanup - axes (oldh); -@@ -92,6 +120,8 @@ - - xlim = [min([x1(:); x2(:)]), max([x1(:); x2(:)])]; - -+ axes (ax(1)); -+ newplot (); - h1 = feval (fun1, x1, y1); - - set (ax(1), "ycolor", getcolor (h1(1))); -@@ -101,7 +131,9 @@ - - cf = gcf (); - set (cf, "nextplot", "add"); -- ax(2) = axes (); -+ axes (ax(2)); -+ newplot (); -+ - colors = get (ax(1), "colororder"); - set (ax(2), "colororder", [colors(2:end,:); colors(1,:)]); - diff --git a/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch b/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch deleted file mode 100644 index 35a7c9915..000000000 --- a/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch +++ /dev/null @@ -1,48 +0,0 @@ -## patch from debian svn -## don_set_helvetica.dpatch by Thomas Weber <thomas.weber.mail@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Don't set Helvetica as default font, it's not available as TrueType font -## DP: #477688 -diff -urNad octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m ---- octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m 2008-04-21 18:00:20.000000000 +0200 -+++ octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m 2008-05-25 17:30:08.000000000 +0200 -@@ -1601,7 +1601,7 @@ - - function [f, s, fnt, it, bld] = get_fontname_and_size (t) - if (isempty (t.fontname)) -- fnt = "Helvetica"; -+ fnt = ""; - else - fnt = t.fontname; - endif -@@ -1639,7 +1639,7 @@ - if (strcmp (fld, "string")) - [f, s, fnt, it, bld] = get_fontname_and_size (obj); - else -- f = "Helvetica"; -+ f = ""; - s = 10; - fnt = f; - it = false; -diff -urNad octave3.0-3.0.1~/src/graphics.cc octave3.0-3.0.1/src/graphics.cc ---- octave3.0-3.0.1~/src/graphics.cc 2008-04-21 18:00:20.000000000 +0200 -+++ octave3.0-3.0.1/src/graphics.cc 2008-05-25 17:30:08.000000000 +0200 -@@ -2336,7 +2336,7 @@ - rotation (0), - horizontalalignment ("left"), - color (Matrix (1, 3, 0.0)), -- fontname ("Helvetica"), -+ fontname (""), - fontsize (10), - fontangle (radio_values ("{normal}|italic|oblique")), - fontweight (radio_values ("{normal}|bold|demi|light")), -@@ -2470,7 +2470,7 @@ - m["rotation"] = 0; - m["horizontalalignment"] = "left"; - m["color"] = Matrix (1, 3, 1.0); -- m["fontname"] = "Helvetica"; -+ m["fontname"] = ""; - m["fontsize"] = 10; - m["fontangle"] = radio_property (radio_values ("{normal}|italic|oblique")); - m["fontweight"] = radio_property (radio_values ("{normal}|bold|demi|light")); diff --git a/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch b/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch deleted file mode 100644 index af4d15c40..000000000 --- a/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur octave-3.0.1/scripts/general/interpft.m octave-3.0.1.new/scripts/general/interpft.m ---- octave-3.0.1/scripts/general/interpft.m 2008-04-21 11:58:40.000000000 -0400 -+++ octave-3.0.1.new/scripts/general/interpft.m 2008-05-28 11:54:37.000000000 -0400 -@@ -105,10 +105,6 @@ - %! legend ('sin(4t+0.3)cos(3t-0.1','spline','interpft','data'); - - %!shared n,y --%! x = [0:10]'; y = sin(x); n = length (x); --%!assert (interpft(y, n), y, eps); --%!assert (interpft(y', n), y', eps); --%!assert (interpft([y,y],n), [y,y], eps); - - %!error (interpft(y,n,0)) - %!error (interpft(y,[n,n])) -diff -Naur octave-3.0.1/test/build_sparse_tests.sh octave-3.0.1.new/test/build_sparse_tests.sh ---- octave-3.0.1/test/build_sparse_tests.sh 2008-04-21 12:00:21.000000000 -0400 -+++ octave-3.0.1.new/test/build_sparse_tests.sh 2008-05-28 12:15:14.000000000 -0400 -@@ -872,20 +872,6 @@ - %! load(savefile,"as_save"); - %! unlink(savefile); - %! assert(as_save,sparse(af)); --%!test # save binary --%! savefile= tmpnam(); --%! as_save=as; save("-binary",savefile,"bf","as_save","af"); --%! clear as_save; --%! load(savefile,"as_save"); --%! unlink(savefile); --%! assert(as_save,sparse(af)); --%!test # save hdf5 --%! savefile= tmpnam(); --%! as_save=as; save("-hdf5",savefile,"bf","as_save","af"); --%! clear as_save; --%! load(savefile,"as_save"); --%! unlink(savefile); --%! assert(as_save,sparse(af)); - %!test # save matlab - %! savefile= tmpnam(); - %! as_save=as; save("-mat",savefile,"bf","as_save","af"); -diff -Naur octave-3.0.1/test/test_system.m octave-3.0.1.new/test/test_system.m ---- octave-3.0.1/test/test_system.m 2008-04-21 12:00:22.000000000 -0400 -+++ octave-3.0.1.new/test/test_system.m 2008-05-28 11:53:26.000000000 -0400 -@@ -377,11 +377,6 @@ - %!error <Invalid call to file_in_path.*> file_in_path ("foo", "bar", "baz", "ooka"); - - %% test/octave.test/system/tilde_expand-1.m --%!testif HAVE_GETPWUID --%! x = getpwuid (getuid ()); --%! assert((strcmp (x.dir, tilde_expand ("~")) --%! && strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name))) --%! && strcmp ("foobar", tilde_expand ("foobar")))); - - %% test/octave.test/system/tilde_expand-2.m - %!error <Invalid call to tilde_expand.*> tilde_expand (); diff --git a/sci-mathematics/octave/octave-2.9.19.ebuild b/sci-mathematics/octave/octave-2.9.19.ebuild deleted file mode 100644 index ab3a153f5..000000000 --- a/sci-mathematics/octave/octave-2.9.19.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.2 2006/11/03 15:44:39 markusle Exp $ - -inherit flag-o-matic fortran autotools - -DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations" -LICENSE="GPL-2" -HOMEPAGE="http://www.octave.org/" -SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" - -SLOT="0" -IUSE="emacs readline zlib doc hdf5 curl fftw" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-util/dejagnu - virtual/blas - virtual/lapack - dev-libs/libpcre - >=sys-libs/ncurses-5.2-r3 - >=sci-visualization/gnuplot-3.7.1-r3 - >=sci-mathematics/glpk-4.15 - >=dev-util/gperf-2.7.2 - >=media-libs/qhull-3.1-r1 - virtual/latex-base - fftw? ( >=sci-libs/fftw-3.1.2 ) - zlib? ( sys-libs/zlib ) - hdf5? ( sci-libs/hdf5 ) - curl? ( net-misc/curl ) - !=app-text/texi2html-1.70" - -FORTRAN="gfortran g77 f2c" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-2.9.18-test-fix.patch -} - -src_compile() { - local myconf="--localstatedir=/var/state/octave --enable-rpath" - - # force use of external blas, lapack, fftw - myconf="${myconf} --with-blas=blas --with-lapack=lapack" - myconf="${myconf} --enable-static --enable-shared --enable-dl" - - # disable sparse matrix stuff for now - myconf="${myconf} --without-umfpack --without-colamd" - myconf="${myconf} --without-ccolamd --without-cholmod --without-cxsparse" - - if [[ "${FORTRANC}" == "g77" ]]; then - myconf="${myconf} --with-f77" - elif [[ "${FORTRANC}" == "f2c" ]]; then - myconf="${myconf} --with-f2c" - fi - - econf \ - $(use_with hdf5) \ - $(use_with curl) \ - $(use_with zlib) \ - $(use_with fftw) \ - $(use_enable readline) \ - ${myconf} \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - cd "${S}" - make install DESTDIR="${D}" || die "make install failed" - if use doc; then - octave-install-doc || die "Octave doc install failed" - fi - if use emacs; then - cd emacs - exeinto /usr/bin - doexe octave-tags || die "Failed to install octave-tags" - doman octave-tags.1 || die "Failed to install octave-tags.1" - for emacsdir in /usr/share/emacs/site-lisp /usr/lib/xemacs/site-lisp; do - insinto ${emacsdir} - doins *.el || die "Failed to install emacs files" - done - cd .. - fi - dodir /etc/env.d || die - echo "LDPATH=/usr/lib/octave-${PV}" > "${D}"/etc/env.d/99octave \ - || die "Failed to set up env.d files" - - # Fixes ls-R files to remove /var/tmp/portage references. - sed -i -e "s:${D}::g" "${D}"/usr/libexec/${PN}/ls-R && \ - sed -i -e "s:${D}::g" "${D}"/usr/share/${PN}/ls-R || \ - die "Failed to fix ls-R files." -} - -pkg_postinst() { - echo - einfo "Some users have reported failures at running simple tests if" - einfo "octave was built with agressive optimisations. You can check if" - einfo "your setup is affected by this bug by running the following test" - einfo "(inside the octave interpreter):" - einfo - einfo "octave:1> y = [1 3 4 2 1 5 3 5 6 7 4 5 7 10 11 3];" - einfo "octave:2> g = [1 1 1 1 1 1 1 1 2 2 2 2 2 3 3 3];" - einfo "octave:3> anova(y, g)" - einfo - einfo "If these commands complete successfully with no error message," - einfo "your installation should be ok. Otherwise, try recompiling" - einfo "octave using less agressive \"CFLAGS\" (combining \"-O3\" and" - einfo "\"-march=pentium4\" is known to cause problems)." - echo -} - -octave-install-doc() { - echo "Installing documentation..." - insinto /usr/share/doc/${PF} - doins doc/faq/Octave-FAQ.pdf || die - doins doc/interpreter/octave.pdf || die - doins doc/liboctave/liboctave.pdf || die - doins doc/refcard/refcard-a4.pdf || die - doins doc/refcard/refcard-legal.pdf || die - doins doc/refcard/refcard-letter.pdf || die -} diff --git a/sci-mathematics/octave/octave-3.0.0.ebuild b/sci-mathematics/octave/octave-3.0.0.ebuild deleted file mode 100644 index 4ad353c94..000000000 --- a/sci-mathematics/octave/octave-3.0.0.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.2 2006/11/03 15:44:39 markusle Exp $ - -inherit flag-o-matic fortran autotools xemacs-elisp-common - -DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations" -LICENSE="GPL-2" -HOMEPAGE="http://www.octave.org/" -SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" - -SLOT="0" -IUSE="emacs readline zlib doc hdf5 curl fftw xemacs sparse" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-util/dejagnu - virtual/blas - virtual/lapack - dev-libs/libpcre - >=sys-libs/ncurses-5.2-r3 - >=sci-visualization/gnuplot-3.7.1-r3 - >=sci-mathematics/glpk-4.15 - >=dev-util/gperf-2.7.2 - >=media-libs/qhull-3.1-r1 - virtual/latex-base - fftw? ( >=sci-libs/fftw-3.1.2 ) - zlib? ( sys-libs/zlib ) - hdf5? ( sci-libs/hdf5 ) - curl? ( net-misc/curl ) - xemacs? ( virtual/xemacs ) - sparse? ( sci-libs/umfpack - sci-libs/colamd - sci-libs/ccolamd - sci-libs/cholmod - sci-libs/cxsparse ) - !=app-text/texi2html-1.70" - -FORTRAN="gfortran g77 f2c" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-2.9.18-test-fix.patch - epatch "${FILESDIR}"/${P}-pkg.patch -} - -src_compile() { - local myconf="--localstatedir=/var/state/octave --enable-rpath" - - # force use of external blas, lapack, fftw - myconf="${myconf} --with-blas=blas --with-lapack=lapack" - myconf="${myconf} --enable-static --enable-shared --enable-dl" - - # disable sparse matrix stuff for now - local sparse_conf; - if use sparse; then - sparse_conf="--with-umfpack --with-colamd --with-ccolamd" - sparse_conf="${sparse_conf} --with-cholmod --with-cxsparse" - else - sparse_conf="--without-umfpack --without-colamd --without-ccolamd" - sparse_conf="${sparse_conf} --without-cholmod --without-cxsparse" - fi - myconf="${myconf} ${sparse_conf}" - - if [[ "${FORTRANC}" == "g77" ]]; then - myconf="${myconf} --with-f77" - elif [[ "${FORTRANC}" == "f2c" ]]; then - myconf="${myconf} --with-f2c" - fi - - econf \ - $(use_with hdf5) \ - $(use_with curl) \ - $(use_with zlib) \ - $(use_with fftw) \ - $(use_enable readline) \ - ${myconf} \ - || die "econf failed" - - emake || die "emake failed" - - if use xemacs; then - cd "${S}/emacs" - xemacs-elisp-comp *.el - fi -} - -src_install() { - cd "${S}" - make install DESTDIR="${D}" || die "make install failed" - if use doc; then - octave-install-doc || die "Octave doc install failed" - fi - if use emacs || use xemacs; then - cd emacs - exeinto /usr/bin - doexe octave-tags || die "Failed to install octave-tags" - doman octave-tags.1 || die "Failed to install octave-tags.1" - if use xemacs; then - xemacs-elisp-install ${PN} *.el *.elc - fi - cd .. - fi - dodir /etc/env.d || die - echo "LDPATH=/usr/lib/octave-${PV}" > "${D}"/etc/env.d/99octave \ - || die "Failed to set up env.d files" - - # Fixes ls-R files to remove /var/tmp/portage references. - sed -i -e "s:${D}::g" "${D}"/usr/libexec/${PN}/ls-R && \ - sed -i -e "s:${D}::g" "${D}"/usr/share/${PN}/ls-R || \ - die "Failed to fix ls-R files." -} - -pkg_postinst() { - echo - einfo "Some users have reported failures at running simple tests if" - einfo "octave was built with agressive optimisations. You can check if" - einfo "your setup is affected by this bug by running the following test" - einfo "(inside the octave interpreter):" - einfo - einfo "octave:1> y = [1 3 4 2 1 5 3 5 6 7 4 5 7 10 11 3];" - einfo "octave:2> g = [1 1 1 1 1 1 1 1 2 2 2 2 2 3 3 3];" - einfo "octave:3> anova(y, g)" - einfo - einfo "If these commands complete successfully with no error message," - einfo "your installation should be ok. Otherwise, try recompiling" - einfo "octave using less agressive \"CFLAGS\" (combining \"-O3\" and" - einfo "\"-march=pentium4\" is known to cause problems)." - echo -} - -octave-install-doc() { - echo "Installing documentation..." - insinto /usr/share/doc/${PF} - doins doc/faq/Octave-FAQ.pdf || die - doins doc/interpreter/octave.pdf || die - doins doc/liboctave/liboctave.pdf || die - doins doc/refcard/refcard-a4.pdf || die - doins doc/refcard/refcard-legal.pdf || die - doins doc/refcard/refcard-letter.pdf || die -} diff --git a/sci-mathematics/octave/octave-3.0.1.ebuild b/sci-mathematics/octave/octave-3.0.1.ebuild deleted file mode 100644 index ee25900e8..000000000 --- a/sci-mathematics/octave/octave-3.0.1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.2 2006/11/03 15:44:39 markusle Exp $ - -inherit flag-o-matic fortran autotools xemacs-elisp-common - -DESCRIPTION="High-level interactive language for numerical computations" -LICENSE="GPL-3" -HOMEPAGE="http://www.octave.org/" -SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" - -SLOT="0" -IUSE="emacs readline zlib doc hdf5 curl fftw xemacs sparse" -KEYWORDS="~amd64 ~x86" #~alpha ~hppa ~ppc ~ppc64 ~sparc - -RDEPEND="virtual/lapack - dev-libs/libpcre - sys-libs/ncurses - sci-visualization/gnuplot - >=sci-mathematics/glpk-4.15 - media-libs/qhull - fftw? ( >=sci-libs/fftw-3.1.2 ) - zlib? ( sys-libs/zlib ) - hdf5? ( sci-libs/hdf5 ) - curl? ( net-misc/curl ) - xemacs? ( virtual/xemacs ) - sparse? ( sci-libs/umfpack - sci-libs/colamd - sci-libs/camd - sci-libs/ccolamd - sci-libs/cholmod - sci-libs/cxsparse )" - -DEPEND="${RDEPEND} - doc? ( virtual/latex-base - || ( dev-texlive/texlive-genericrecommended - app-text/tetex - app-text/ptex ) ) - dev-util/dejagnu - dev-util/gperf - dev-util/pkgconfig" - -FORTRAN="gfortran ifc g77 f2c" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.0.0-pkg.patch - epatch "${FILESDIR}"/${P}-test-fix.patch - epatch "${FILESDIR}"/${P}-add_syspath.patch - epatch "${FILESDIR}"/${P}-fix_handle_for_plotyy.patch - epatch "${FILESDIR}"/${P}-no_helvetica.patch - epatch "${FILESDIR}"/${P}-chi2rnd.patch -} - -src_compile() { - - econf \ - --localstatedir=/var/state/octave \ - --enable-shared \ - --with-blas="$(pkg-config --libs blas)" \ - --with-lapack="$(pkg-config --libs lapack)" \ - $(use_with hdf5) \ - $(use_with curl) \ - $(use_with zlib) \ - $(use_with fftw) \ - $(use_with sparse umfpack) \ - $(use_with sparse colamd) \ - $(use_with sparse ccolamd) \ - $(use_with sparse cholmod) \ - $(use_with sparse cxsparse) \ - $(use_enable readline) \ - || die "econf failed" - - emake || die "emake failed" - - if use xemacs; then - cd "${S}/emacs" - xemacs-elisp-comp *.el - fi -} - -src_install() { - emake install DESTDIR="${D}" || die "emake install failed" - - if use doc; then - einfo "Installing documentation..." - insinto /usr/share/doc/${PF} - doins $(find doc -name \*.pdf) - fi - - if use emacs || use xemacs; then - cd emacs - exeinto /usr/bin - doexe octave-tags || die "Failed to install octave-tags" - doman octave-tags.1 || die "Failed to install octave-tags.1" - if use xemacs; then - xemacs-elisp-install ${PN} *.el *.elc - fi - cd .. - fi - - echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave - doenvd 99octave || die - - # Fixes ls-R files to remove /var/tmp/portage references. - sed -i \ - -e "s:${D}::g" \ - "${D}"/usr/*/${PN}/ls-R \ - || die "Failed to fix ls-R files." -} |