Version bump (fixes bug #246782).

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-SENTINEL-2 i686

4 files changed, 68 insertions, 9 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 49f8b2a85848..283357c466d1 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.61 2008/08/22 22:05:44 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.62 2008/11/18 02:27:01 markusle Exp $
+
+*octave-3.0.3 (18 Nov 2008)
+
+  18 Nov 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/octave-3.0.3-test-fix.patch, -octave-3.0.1.ebuild,
+  +octave-3.0.3.ebuild:
+  Version bump (fixes bug #246782).
 
 *octave-3.0.2 (22 Aug 2008)
 
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 2cf00ac77f50..52e9784b7f12 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -8,20 +8,21 @@ AUX octave-3.0.1-chi2rnd.patch 748 RMD160 af57c8e2fd1c326a92d7078e9d076d3b952dd8
 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
+AUX octave-3.0.3-test-fix.patch 2177 RMD160 a0fb9ba636b3225bed404da2214e80d6d76c626a SHA1 2f1b29a1fe3b660f11fd6e846c84886ead3142b4 SHA256 0519dd6f18ed0ec696852a08123cc3ddb30a9622cb53950acf6a8d3509c439cb
 AUX octave-example-fix.patch 566 RMD160 9761e1a45e0d54795aff5cd50120b963492ac175 SHA1 9f84d6831a1d7773c9504a1d93308de97af85d88 SHA256 e387b14de2e5ef4e4246a84721d6b4a378670b3bffbffdc65db56e7dadcde76a
 DIST octave-2.1.57.tar.bz2 4202080 RMD160 53118458a03e7c10da3f1cc5eb65952c07744719 SHA1 126f79fd169a31883d7f7193caa459be19924acd SHA256 fbc3e2c8f603d87181d5ccd88e42dd7f3226a18151b5e068308561969e2edbd6
 DIST octave-2.1.69.tar.bz2 5818959 RMD160 88a59f0dfe4c343f011f78b07dbf069b03e29b5c SHA1 f9a43c612ac1d9a8bf25757801c46674dfe38f97 SHA256 ea27262f5ab00020f1017ccf4839cae5e6775f71d60903e5b515d472278944a9
 DIST octave-2.1.72.tar.bz2 5808544 RMD160 b9a1056a98a524591b0f497f3c11ccc436a18eec SHA1 a696c65667a4a99d55279103065d1d0af5a5fb09 SHA256 d8b2dec9eb979c35be435896105c1c31dd61aa2c0f27be8b8b2645fa5d60bb90
 DIST octave-2.1.73.tar.bz2 5790133 RMD160 d34c6ecd8f84c728ad7687d9568b9d69ade6f5db SHA1 58221aa15fcefd66b03531ac0ae9b1d2356e7555 SHA256 8ccaee227c6cad3b5633a904414f17ce73de8eab2abd4d2e6a3972dd878ffbc3
-DIST octave-3.0.1.tar.bz2 9854711 RMD160 3141454b1e9a8efcac0772aed63c27aaad082861 SHA1 e4cebe74a1182df610d91e45974653227dd4b342 SHA256 310bfc622d74fd5c3727c2304ad594888f3016a89f183af7afdfef3fd5c15e6d
 DIST octave-3.0.2.tar.bz2 10127298 RMD160 8b95e0bfb7bed5ee836e4a93f5810bf65d805811 SHA1 fa300afed620b241ff0e25892f70b713a00e5ae8 SHA256 f3b0a1a3d890eefa6e736774c88a3caf696c131584dea292f5175960d183833e
+DIST octave-3.0.3.tar.bz2 10159024 RMD160 1a162862a457675e2d94de306c1ec8f1643c9e07 SHA1 5c619254521a5fe14b3ec8a6eecbf104f9fa41dc SHA256 f90108bf6a2f9930907aa740d1c4d39551985cf3b5c5eb5dfdb436e0d3b5d79d
 EBUILD octave-2.1.57-r1.ebuild 3444 RMD160 ac7d57c312e5c849ae0fd88c33333cc7138abb1a SHA1 fbfd690dd1d977c70bee8e1692e4ad2076462776 SHA256 fc1c1399a29309a99b9d880626df3c8850c4cfb81f5f1657855605e9945b7cee
 EBUILD octave-2.1.69.ebuild 3415 RMD160 06019164d467a1cfc3607e8c8002439ee7fbb71f SHA1 3dc821b03b02599e5d27dbb1573118ca0a5b9194 SHA256 202a628e36d5578c981e5832cfaad31cf90687ad1621c8ddee4186a6b0ddf848
 EBUILD octave-2.1.72.ebuild 3893 RMD160 571014ce76eac12e6ae21ff21f087fb7258535da SHA1 f3fd6fa783473c9912105ae0256a12448843f9c5 SHA256 a91ee175a3a4a161171d5525e549f184d8b362e6e8d94923335a1f20d334fe90
 EBUILD octave-2.1.73-r1.ebuild 4441 RMD160 f25103dde6a4a9dacac56ce15e0e59ce8f0c8330 SHA1 9ee52584713d62c218956854249f757ebd70ac16 SHA256 c6dd06da30f001d494fbf3730a6ffbd8aeb50e3bf1fac4dd9c33a54dbcc46d71
 EBUILD octave-2.1.73-r2.ebuild 4603 RMD160 bf3870799101ef51bcd6370b20e26b8fbfd83401 SHA1 e5755d8a8e24af2190a78c489658b64a63a938d9 SHA256 5b0e4c2f2ef2e438177f4c689fd8babdc2e36842f687dc1d61f0a65c148b6a4f
 EBUILD octave-2.1.73.ebuild 4283 RMD160 d3b65b88c6472b892ea2286c2200ccb1e383a08a SHA1 ef7f1ac3c41f433453ae5e492fe9cadd21ce2d27 SHA256 2b4f4660cd30f3acaeff313dbc5cc7e225a8eab87998edcedf85f5c2cacffcf0
-EBUILD octave-3.0.1.ebuild 2821 RMD160 81eea99f7dd6d97379473d422fa8e88f73a62ee5 SHA1 68e2c64c30f420a05193720250e42e2536d1639d SHA256 febdf9ce66117b7c0b7c63e3a9328a5ddce7dc52a76f03b2ae5c0e19001f30ec
 EBUILD octave-3.0.2.ebuild 2856 RMD160 4d3c835397eb288895ecb42d88fad45059df60cb SHA1 43669c207421797e9b2a0011bc025e6aefdf6c72 SHA256 248709e1030b16dbefba11bbc3e4b448f72c072a24b19ceda52a81af38740740
-MISC ChangeLog 17456 RMD160 01df2d6b10934f2c0426289e6b3de9a1660021c4 SHA1 cf3faefdb2c803de774d4ae780b620cf8f895bd6 SHA256 7cd1ace2be9e56b101e803cb795e6ca0fb7394380dcae995656cfd3e7b17efda
+EBUILD octave-3.0.3.ebuild 2749 RMD160 1e2785e51ded2e93fd427d5c996a591a0a07782e SHA1 d3ae90a6f2f26d12f635e4773d4df258f07143ac SHA256 829cd00741dcb5586eadef341e7fd5ed035ee0f9d86080122d52ac0d97fecc2b
+MISC ChangeLog 17659 RMD160 c3fc61c492a2e4bd905b18e367f96aed3453e47b SHA1 aeea27d5f6359cab6718ff269d4736975ce266d7 SHA256 74a717070fe07f3587f19da6ad9a017621b3d0a90f5686830dbe1f32e029cfb4
 MISC metadata.xml 260 RMD160 27a4292b758e1199d0092b731cba79033f1b4167 SHA1 9997a99a4d6115f3b901208ba711d735ce9be36e SHA256 5fda55fd44bfec5755e1c3ac828887c37f0eebed6b3b972454e123ac2472d3ff
diff --git a/sci-mathematics/octave/files/octave-3.0.3-test-fix.patch b/sci-mathematics/octave/files/octave-3.0.3-test-fix.patch
new file mode 100644
index 000000000000..fc976928c3b0
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.0.3-test-fix.patch
@@ -0,0 +1,53 @@
+diff -Naur octave-3.0.3/scripts/general/interpft.m octave-3.0.3.new/scripts/general/interpft.m
+--- octave-3.0.3/scripts/general/interpft.m	2008-09-29 01:36:19.000000000 -0400
++++ octave-3.0.3.new/scripts/general/interpft.m	2008-11-17 06:41:18.000000000 -0500
+@@ -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, 2*eps);
+-%!assert (interpft(y', n), y', 2*eps);
+-%!assert (interpft([y,y],n), [y,y], 2*eps);
+ 
+ %!error (interpft(y,n,0))
+ %!error (interpft(y,[n,n]))
+diff -Naur octave-3.0.3/test/build_sparse_tests.sh octave-3.0.3.new/test/build_sparse_tests.sh
+--- octave-3.0.3/test/build_sparse_tests.sh	2008-09-24 03:13:50.000000000 -0400
++++ octave-3.0.3.new/test/build_sparse_tests.sh	2008-11-17 06:38:19.000000000 -0500
+@@ -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.3/test/test_system.m octave-3.0.3.new/test/test_system.m
+--- octave-3.0.3/test/test_system.m	2008-09-24 03:13:50.000000000 -0400
++++ octave-3.0.3.new/test/test_system.m	2008-11-17 06:38:19.000000000 -0500
+@@ -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-3.0.1.ebuild b/sci-mathematics/octave/octave-3.0.3.ebuild
index 4e98a4ee97a2..cdb8b43fa510 100644
--- a/sci-mathematics/octave/octave-3.0.1.ebuild
+++ b/sci-mathematics/octave/octave-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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-3.0.1.ebuild,v 1.1 2008/07/24 21:59:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.0.3.ebuild,v 1.1 2008/11/18 02:27:01 markusle Exp $
 
 inherit flag-o-matic fortran xemacs-elisp-common
 
@@ -49,10 +49,8 @@ src_unpack() {
 	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
+	epatch "${FILESDIR}"/${PN}-3.0.1-fix_handle_for_plotyy.patch
+	epatch "${FILESDIR}"/${PN}-3.0.1-no_helvetica.patch
 }
 
 src_compile() {