Fixed test case that failed inside the sandbox and added dejagnu as dependency which is needed for src_test. This fixes bug #140808.

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 29 insertions, 10 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 4bd44140cbe3..d50358b7c60c 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.40 2006/11/02 16:29:22 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.41 2006/11/03 15:44:39 markusle Exp $
+
+  03 Nov 2006; Markus Dittrich <markusle@gentoo.org> ChangeLog:
+  Fixed test case that failed inside the sandbox and added dejagnu
+  as dependency which is needed for src_test. This fixes bug #140808.
 
 *octave-2.1.73-r1 (02 Nov 2006)
 
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 1f408b6387b5..c8a26bc30c77 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -10,6 +10,10 @@ AUX octave-2.1.73-gcc4.1-gentoo.patch 956 RMD160 f331768b814a213029014bf16021318
 MD5 82a3d6b5e68e7a6996db0a51137de512 files/octave-2.1.73-gcc4.1-gentoo.patch 956
 RMD160 f331768b814a213029014bf16021318706b084f5 files/octave-2.1.73-gcc4.1-gentoo.patch 956
 SHA256 5526650682c4d50a10a04ebed218737246c55bceb0bb773a709a846e0adc2af5 files/octave-2.1.73-gcc4.1-gentoo.patch 956
+AUX octave-example-fix.patch 566 RMD160 9761e1a45e0d54795aff5cd50120b963492ac175 SHA1 9f84d6831a1d7773c9504a1d93308de97af85d88 SHA256 e387b14de2e5ef4e4246a84721d6b4a378670b3bffbffdc65db56e7dadcde76a
+MD5 247eaccefe555ae444859c7cbb8a829d files/octave-example-fix.patch 566
+RMD160 9761e1a45e0d54795aff5cd50120b963492ac175 files/octave-example-fix.patch 566
+SHA256 e387b14de2e5ef4e4246a84721d6b4a378670b3bffbffdc65db56e7dadcde76a files/octave-example-fix.patch 566
 DIST octave-2.1.57.tar.bz2 4202080 RMD160 53118458a03e7c10da3f1cc5eb65952c07744719 SHA256 fbc3e2c8f603d87181d5ccd88e42dd7f3226a18151b5e068308561969e2edbd6
 DIST octave-2.1.69.tar.bz2 5818959 RMD160 88a59f0dfe4c343f011f78b07dbf069b03e29b5c SHA256 ea27262f5ab00020f1017ccf4839cae5e6775f71d60903e5b515d472278944a9
 DIST octave-2.1.71.tar.bz2 5784751 RMD160 6728c64c63ac356908922ef8477e117cf944a7b2 SHA256 c3a47eada5132bef4043cc9730466c133e1f3793f2b7f8e0e6c9620553747337
@@ -31,18 +35,18 @@ EBUILD octave-2.1.72.ebuild 3888 RMD160 04c76c5c072d43a06537ca1a38842020a66c1de7
 MD5 a7a157a1671bd3ccbc182d2e7f00b40b octave-2.1.72.ebuild 3888
 RMD160 04c76c5c072d43a06537ca1a38842020a66c1de7 octave-2.1.72.ebuild 3888
 SHA256 d60bd995f7a29bf9c43c39f961d1e40e493410a77c92a0f3d4da96744b9bb510 octave-2.1.72.ebuild 3888
-EBUILD octave-2.1.73-r1.ebuild 3975 RMD160 cba37f25194477e8b247c7a511f1d66845940225 SHA1 9ee9ac79fa249251c34e9813afb482c5e9091eb1 SHA256 772b51b68c5fcf7cf7c9ab637bcb16cc2961d34123a47fdb76f61a965981b4f9
-MD5 b9fb187c12c3e8083323464024e95d39 octave-2.1.73-r1.ebuild 3975
-RMD160 cba37f25194477e8b247c7a511f1d66845940225 octave-2.1.73-r1.ebuild 3975
-SHA256 772b51b68c5fcf7cf7c9ab637bcb16cc2961d34123a47fdb76f61a965981b4f9 octave-2.1.73-r1.ebuild 3975
+EBUILD octave-2.1.73-r1.ebuild 4039 RMD160 4831cdfa292702016cb358e34cba244a0c575760 SHA1 a6ebd5950d69345d1ff94f9d965260a19380a815 SHA256 a19bee2a9c60076d8a4cd0f621a49364e4d5b0692797da042d46a2153075d182
+MD5 71c99bd97bbc8721c8f0c24fc8eae5af octave-2.1.73-r1.ebuild 4039
+RMD160 4831cdfa292702016cb358e34cba244a0c575760 octave-2.1.73-r1.ebuild 4039
+SHA256 a19bee2a9c60076d8a4cd0f621a49364e4d5b0692797da042d46a2153075d182 octave-2.1.73-r1.ebuild 4039
 EBUILD octave-2.1.73.ebuild 3880 RMD160 f66a93a2a0bcae2bb409506e866a8e68831d4149 SHA1 a57f0cb1f3bc6a5abed33419a8a5fd3439f64915 SHA256 76a6bbaf964a47cec8c923f9300288d62bdfae2ed7bfd9f31f29357b9ed4ff4d
 MD5 7aeaca8146463d32581d6f7c4f170d24 octave-2.1.73.ebuild 3880
 RMD160 f66a93a2a0bcae2bb409506e866a8e68831d4149 octave-2.1.73.ebuild 3880
 SHA256 76a6bbaf964a47cec8c923f9300288d62bdfae2ed7bfd9f31f29357b9ed4ff4d octave-2.1.73.ebuild 3880
-MISC ChangeLog 12990 RMD160 990e0e5b920c56f1661501cb6332b2e5992da243 SHA1 0efd111ca8f0aa8a1c4981d00d19c423d925970a SHA256 b7eafa0f7bfd09b20cfa7d9689d9dfc90b83e6830b1c99d5d8aebf3505d697fd
-MD5 b5801c4d0294c0a48bdf13c918dfe51c ChangeLog 12990
-RMD160 990e0e5b920c56f1661501cb6332b2e5992da243 ChangeLog 12990
-SHA256 b7eafa0f7bfd09b20cfa7d9689d9dfc90b83e6830b1c99d5d8aebf3505d697fd ChangeLog 12990
+MISC ChangeLog 13192 RMD160 772694f0d8f809a498a7e02be902f4cc165e24f2 SHA1 b8cd631e22258c2d9257741d1f8d87ec52934e87 SHA256 e9dc3a60b2422f42589b703cf0f36db0e7d0fb22f27a2ae1ca30d4cd580b4cb6
+MD5 e07ce18e06e6318f8e17bd7a116d27f0 ChangeLog 13192
+RMD160 772694f0d8f809a498a7e02be902f4cc165e24f2 ChangeLog 13192
+SHA256 e9dc3a60b2422f42589b703cf0f36db0e7d0fb22f27a2ae1ca30d4cd580b4cb6 ChangeLog 13192
 MISC metadata.xml 304 RMD160 9bf8d3764f2f605704497eb920cf7d496ac77fa1 SHA1 f6b8d455b85f4b18b68d152c3e8179b7d6defe60 SHA256 7de312597cc9f943d78b63b27600b43a55cedc90557552f88dc0d73462c2921a
 MD5 235d4f760824f15143cfe730fc1710a8 metadata.xml 304
 RMD160 9bf8d3764f2f605704497eb920cf7d496ac77fa1 metadata.xml 304
diff --git a/sci-mathematics/octave/files/octave-example-fix.patch b/sci-mathematics/octave/files/octave-example-fix.patch
new file mode 100644
index 000000000000..bfd664ce109d
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-example-fix.patch
@@ -0,0 +1,9 @@
+diff -Naur octave-2.1.73/test/octave.test/system/tilde_expand-1.m octave-2.1.73-new/test/octave.test/system/tilde_expand-1.m
+--- octave-2.1.73/test/octave.test/system/tilde_expand-1.m	1997-02-25 23:29:27.000000000 -0500
++++ octave-2.1.73-new/test/octave.test/system/tilde_expand-1.m	2006-11-03 10:09:37.000000000 -0500
+@@ -1,4 +1,3 @@
+ x = getpwuid (getuid ());
+-(strcmp (x.dir, tilde_expand ("~"))
+- && strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name)))
++( strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name)))
+  && strcmp ("foobar", tilde_expand ("foobar")))
diff --git a/sci-mathematics/octave/octave-2.1.73-r1.ebuild b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
index fca3035313df..afcd4658d7c6 100644
--- a/sci-mathematics/octave/octave-2.1.73-r1.ebuild
+++ b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1 2006/11/02 16:29:22 markusle Exp $
+# $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
 
@@ -15,6 +15,7 @@ IUSE="emacs static readline zlib doc hdf5 mpi blas"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="virtual/libc
+	dev-util/dejagnu
 	>=sys-libs/ncurses-5.2-r3
 	>=sci-visualization/gnuplot-3.7.1-r3
 	>=sci-libs/fftw-2.1.3
@@ -37,6 +38,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-gcc4.1-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-example-fix.patch
 	epatch "${FILESDIR}"/${P}-f2c-fix.patch
 	eautoconf
 }