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

(Portage version: 2.2_rc23/cvs/Linux x86_64)

7 files changed, 45 insertions, 38 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/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"