Removed dejagnu dependency, thanks Francisco J. Vázquez, bug #260592, minor QA fixes

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

8 files changed, 62 insertions, 45 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 8f0fe786531a..2054c30fd2cf 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.63 2009/02/08 15:56:02 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.64 2009/03/04 21:31:52 bicatali Exp $
+
+  04 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  octave-2.1.57-r1.ebuild, octave-2.1.72.ebuild, octave-2.1.73.ebuild,
+  octave-2.1.73-r1.ebuild, octave-3.0.3.ebuild:
+  Removed dejagnu dependency, thanks Francisco J. Vázquez, bug #260592,
+  minor QA fixes
 
   08 Feb 2009; Tobias Klausmann <klausman@gentoo.org> octave-3.0.3.ebuild:
   Stable on alpha, bug #245707
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index e792d8ee0f9c..2df0fa7a08d4 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX octave-2.1.72-gcc4.1-gentoo.patch 4224 RMD160 d179b48f2e47e0e9b2312b3b21cc625ecaeb2e9a SHA1 54da4d74cb5d172310de64fc6cc9e32d56823e82 SHA256 24f0ccb8c2aa4004bd251f0095b8a83417f320326ba99a0bba46f8b178722a66
 AUX octave-2.1.73-f2c-fix.patch 419 RMD160 3f8768b9073bcd2d93a5c6064d518299ad0b86a6 SHA1 3c4ee31b5d85d1d8c5f523f39ea25a4a2e577b0d SHA256 18c29afa2402e562cf11ac5a0c7718ed5c9713846dfd0245b2930aaa1939fa41
 AUX octave-2.1.73-gcc-4.3.patch 8087 RMD160 b2d9bbb8f012b6fe9106594394627fd76f112ef9 SHA1 fb5407e628ed4ecbb1ab5c0bb43a595ca2e7bbb1 SHA256 d4a080e57562163c36ab435ba09a94fa4e748a9c91f700625706967e1c0092f6
@@ -16,13 +19,20 @@ DIST octave-2.1.72.tar.bz2 5808544 RMD160 b9a1056a98a524591b0f497f3c11ccc436a18e
 DIST octave-2.1.73.tar.bz2 5790133 RMD160 d34c6ecd8f84c728ad7687d9568b9d69ade6f5db SHA1 58221aa15fcefd66b03531ac0ae9b1d2356e7555 SHA256 8ccaee227c6cad3b5633a904414f17ce73de8eab2abd4d2e6a3972dd878ffbc3
 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.57-r1.ebuild 3464 RMD160 81bfaf7a717b40fa7b02d575c681653963382b1b SHA1 a1841a2e107ef48098a3965789bf52efe2cb6713 SHA256 c40553c1cf38d2b76cfd6d23efbbdaf6381a2b0fd2bff1b9b25ede047bd7bfb2
+EBUILD octave-2.1.69.ebuild 3435 RMD160 768d08cbb1abcd51363b0ba38f09e524ad8fde5d SHA1 669c835a9bed0f414a6bd3ca9b94906c23984ceb SHA256 0559b708b68fa862dc0153bf34fcab2beaa46e242af0cd812469884a029b4766
+EBUILD octave-2.1.72.ebuild 3913 RMD160 cc05494ceaef2953307ffa8223a0a7f3c158d745 SHA1 6f4564db8285c5d533ab4e46761409feac134087 SHA256 70ec1fc6ddd562ed8842cf0635e4727ca90d9bf53e7c45c19d4a97b9600693bb
+EBUILD octave-2.1.73-r1.ebuild 4428 RMD160 a170d06be9ff3c8f22a04dc0225a93abe8213850 SHA1 528d68dc0ab5f75a6d868e129d87567874a0225e SHA256 cb4b94abd3353f503c3d39110dbf418e74abec4f094c3b7f04d46adb04b2749b
 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-2.1.73.ebuild 4269 RMD160 c379a9ffed629d2c3e5f3ec03aaf98963821a50a SHA1 9ac495978a4ce3a5a8101e864f1d7866ea9e8fb9 SHA256 7774794b4c30f44340ee602682d95bfa2eea103ebdabe5144557a674f01e1f73
 EBUILD octave-3.0.2.ebuild 2856 RMD160 4d3c835397eb288895ecb42d88fad45059df60cb SHA1 43669c207421797e9b2a0011bc025e6aefdf6c72 SHA256 248709e1030b16dbefba11bbc3e4b448f72c072a24b19ceda52a81af38740740
-EBUILD octave-3.0.3.ebuild 2748 RMD160 1de150263f904f48d5cbeb9a561ab72a8e3c2dd4 SHA1 3afb6a2f2cc2cfb22145beeb13b2397b5dde3adc SHA256 af1bf9e4b90f4c9d6869f9624f93c0092ec87cbbebb67af5fa305ee44357320c
-MISC ChangeLog 17766 RMD160 22b3d7d87fb2742275b78e1eec1abc6f982d07f2 SHA1 e553a157ca7005bb12e3ed7bf17e319c02e956b3 SHA256 dd6d53dfc7d82d6f30b93f8cdaa05fb5898671f328475edc36bcdc127a34f721
+EBUILD octave-3.0.3.ebuild 2703 RMD160 c532335d4a4a710feee4c6fb93d3ad2c6c6c22ff SHA1 4d193cedd928b73c655e76a97cef100f70184c1e SHA256 5e9028afc805296dafde124ee759c88e5e0c9740cbdaf14bfee929486f6a3444
+MISC ChangeLog 18031 RMD160 9907f7cbcb097e07a696d7515e044ec95cabfca2 SHA1 0a60ab04b825b01df21a1b4a6d37d6b0df28f61e SHA256 8055b183a349b3d0e86365648ebcb64dae09a92f1dfb6c5a60918876668494d9
 MISC metadata.xml 260 RMD160 27a4292b758e1199d0092b731cba79033f1b4167 SHA1 9997a99a4d6115f3b901208ba711d735ce9be36e SHA256 5fda55fd44bfec5755e1c3ac828887c37f0eebed6b3b972454e123ac2472d3ff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmu81kACgkQ1ycZbhPLE2AYdgCeJHS7KOc8W1FUYcBDnMUNeWoE
+4yEAn3ueUn4LwSLMTzzwLWHGrZb0rDtN
+=jgOd
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-2.1.57-r1.ebuild b/sci-mathematics/octave/octave-2.1.57-r1.ebuild
index 8d5eabb10de0..7d20f3656377 100644
--- a/sci-mathematics/octave/octave-2.1.57-r1.ebuild
+++ b/sci-mathematics/octave/octave-2.1.57-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.57-r1.ebuild,v 1.11 2008/04/07 13:57:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.57-r1.ebuild,v 1.12 2009/03/04 21:31:52 bicatali Exp $
 
 inherit flag-o-matic fortran
 
@@ -23,6 +23,7 @@ DEPEND="virtual/libc
 	hdf5? ( sci-libs/hdf5 )
 	latex? ( virtual/latex-base )
 	blas? ( virtual/blas )"
+RDEPEND="${DEPEND}"
 
 # NOTE: octave supports blas/lapack from intel but this is not open
 # source nor is it free (as in beer OR speech) Check out...
diff --git a/sci-mathematics/octave/octave-2.1.69.ebuild b/sci-mathematics/octave/octave-2.1.69.ebuild
index a538f8f731cc..a8d67ed999eb 100644
--- a/sci-mathematics/octave/octave-2.1.69.ebuild
+++ b/sci-mathematics/octave/octave-2.1.69.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-2.1.69.ebuild,v 1.12 2008/04/07 13:57:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.69.ebuild,v 1.13 2009/03/04 21:31:52 bicatali Exp $
 
 inherit flag-o-matic fortran
 
@@ -25,6 +25,7 @@ DEPEND="virtual/libc
 	blas? ( virtual/blas )
 	mpi? ( sys-cluster/lam-mpi )
 	!=app-text/texi2html-1.70"
+RDEPEND="${DEPEND}"
 
 # NOTE: octave supports blas/lapack from intel but this is not open
 # source nor is it free (as in beer OR speech) Check out...
diff --git a/sci-mathematics/octave/octave-2.1.72.ebuild b/sci-mathematics/octave/octave-2.1.72.ebuild
index 7d45db868158..5f5c5bdb40ce 100644
--- a/sci-mathematics/octave/octave-2.1.72.ebuild
+++ b/sci-mathematics/octave/octave-2.1.72.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.72.ebuild,v 1.12 2007/11/20 14:46:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.72.ebuild,v 1.13 2009/03/04 21:31:52 bicatali Exp $
 
 inherit flag-o-matic fortran
 
@@ -25,6 +25,7 @@ DEPEND="virtual/libc
 	blas? ( virtual/blas )
 	mpi? ( virtual/mpi )
 	!=app-text/texi2html-1.70"
+RDEPEND="${DEPEND}"
 
 # NOTE: octave supports blas/lapack from intel but this is not open
 # source nor is it free (as in beer OR speech) Check out...
diff --git a/sci-mathematics/octave/octave-2.1.73-r1.ebuild b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
index 592f57005c0f..3fe09a67136a 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.8 2008/03/02 13:46:24 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.9 2009/03/04 21:31:52 bicatali Exp $
 
 inherit flag-o-matic fortran autotools
 
@@ -26,6 +26,7 @@ DEPEND="virtual/libc
 	blas? ( virtual/blas )
 	mpi? ( virtual/mpi )
 	!=app-text/texi2html-1.70"
+RDEPEND="${DEPEND}"
 
 # NOTE: octave supports blas/lapack from intel but this is not open
 # source nor is it free (as in beer OR speech) Check out...
@@ -59,25 +60,25 @@ src_compile() {
 	# octave links agains -lmpi by default
 	# mpich needs -lmpich instead
 	if use mpi ; then
-	    if built_with_use sys-cluster/mpich2 cxx ; then
+		if built_with_use sys-cluster/mpich2 cxx ; then
 		elog "mpich2 must be built without C++ support!"
 		die "please rebuild mpich2 with USE=-cxx..."
-	    else
+		else
 		CC="mpicc"
 		if has_version 'sys-cluster/mpich' ; then
-		    CXX="mpiCC"
-		    myconf="${myconf} --with-mpi=mpich"
+			CXX="mpiCC"
+			myconf="${myconf} --with-mpi=mpich"
 		elif has_version 'sys-cluster/mpich2' ; then
-		    F77="mpif77"
-		    myconf="${myconf} --with-mpi=mpich"
+			F77="mpif77"
+			myconf="${myconf} --with-mpi=mpich"
 		else
-		    myconf="${myconf} --with-mpi=mpi"
+			myconf="${myconf} --with-mpi=mpi"
+		fi
 		fi
-	    fi
 	else
-	    CC="$(tc-getCC)"
-	    CXX="$(tc-getCXX)"
-	    myconf="${myconf} --without-mpi"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		myconf="${myconf} --without-mpi"
 	fi
 
 	CC="${CC}" CXX="${CXX}" F77="${F77}" \
diff --git a/sci-mathematics/octave/octave-2.1.73.ebuild b/sci-mathematics/octave/octave-2.1.73.ebuild
index 605c7af333d1..7c5ffe976e76 100644
--- a/sci-mathematics/octave/octave-2.1.73.ebuild
+++ b/sci-mathematics/octave/octave-2.1.73.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.ebuild,v 1.10 2008/03/02 13:46:24 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild,v 1.11 2009/03/04 21:31:52 bicatali Exp $
 
 inherit flag-o-matic fortran
 
@@ -25,7 +25,7 @@ DEPEND="virtual/libc
 	blas? ( virtual/blas )
 	mpi? ( virtual/mpi )
 	!=app-text/texi2html-1.70"
-
+RDEPEND="${DEPEND}"
 # NOTE: octave supports blas/lapack from intel but this is not open
 # source nor is it free (as in beer OR speech) Check out...
 # http://developer.intel.com/software/products/mkl/mkl52/index.htm for
@@ -54,25 +54,25 @@ src_compile() {
 	# octave links agains -lmpi by default
 	# mpich needs -lmpich instead
 	if use mpi ; then
-	    if built_with_use sys-cluster/mpich2 cxx ; then
+		if built_with_use sys-cluster/mpich2 cxx ; then
 		elog "mpich2 must be built without C++ support!"
 		die "please rebuild mpich2 with USE=-cxx..."
-	    else
+		else
 		CC="mpicc"
 		if has_version 'sys-cluster/mpich' ; then
-		    CXX="mpiCC"
-		    myconf="${myconf} --with-mpi=mpich"
+			CXX="mpiCC"
+			myconf="${myconf} --with-mpi=mpich"
 		elif has_version 'sys-cluster/mpich2' ; then
-		    F77="mpif77"
-		    myconf="${myconf} --with-mpi=mpich"
+			F77="mpif77"
+			myconf="${myconf} --with-mpi=mpich"
 		else
-		    myconf="${myconf} --with-mpi=mpi"
+			myconf="${myconf} --with-mpi=mpi"
+		fi
 		fi
-	    fi
 	else
-	    CC="$(tc-getCC)"
-	    CXX="$(tc-getCXX)"
-	    myconf="${myconf} --without-mpi"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		myconf="${myconf} --without-mpi"
 	fi
 
 	CC="${CC}" CXX="${CXX}" F77="${F77}" \
diff --git a/sci-mathematics/octave/octave-3.0.3.ebuild b/sci-mathematics/octave/octave-3.0.3.ebuild
index e29eb9c99b06..ce3e22ab8715 100644
--- a/sci-mathematics/octave/octave-3.0.3.ebuild
+++ b/sci-mathematics/octave/octave-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.0.3.ebuild,v 1.2 2009/02/08 15:56:02 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.0.3.ebuild,v 1.3 2009/03/04 21:31:52 bicatali Exp $
 
 inherit flag-o-matic fortran xemacs-elisp-common
 
@@ -38,7 +38,6 @@ DEPEND="${RDEPEND}
 	|| ( dev-texlive/texlive-genericrecommended
 		app-text/tetex
 		app-text/ptex )
-	dev-util/dejagnu
 	dev-util/gperf
 	dev-util/pkgconfig"
 
@@ -54,7 +53,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	econf \
 		--localstatedir=/var/state/octave \
 		--enable-shared \
@@ -69,8 +67,7 @@ src_compile() {
 		$(use_with sparse ccolamd) \
 		$(use_with sparse cholmod) \
 		$(use_with sparse cxsparse) \
-		$(use_enable readline) \
-		|| die "econf failed"
+		$(use_enable readline)
 
 	emake || die "emake failed"