Remove openmp (too experimental, do it with EXTRA_ECONF if interested), fixed a parallel build issue (bug #401189), remove obsolete configure option

(Portage version: 2.1.10.41/cvs/Linux x86_64)

4 files changed, 22 insertions, 13 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 9981899c9c7a..63063f92424f 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.114 2012/01/21 18:28:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.115 2012/01/31 18:01:08 bicatali Exp $
+
+  31 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> octave-3.4.3-r1.ebuild,
+  +files/octave-3.4.3-texi.patch, octave-3.6.0.ebuild:
+  Remove openmp (too experimental, do it with EXTRA_ECONF if interested), fixed
+  a parallel build issue (bug #401189), remove obsolete configure option
 
   21 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> octave-3.4.3-r1.ebuild:
   Applying pkg_setup to earlier version
diff --git a/sci-mathematics/octave/files/octave-3.4.3-texi.patch b/sci-mathematics/octave/files/octave-3.4.3-texi.patch
new file mode 100644
index 000000000000..661ddae4198a
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.4.3-texi.patch
@@ -0,0 +1,11 @@
+--- doc/interpreter/Makefile.am.orig	2012-01-31 17:47:52.000000000 +0000
++++ doc/interpreter/Makefile.am	2012-01-31 17:49:37.000000000 +0000
+@@ -202,6 +202,8 @@
+ 	$(AWK) -f $(srcdir)/mkcontrib.awk $(srcdir)/contributors.in > $@-t
+ 	mv $@-t $@
+ 
++preface.texi: contributors.texi
++
+ ../../AUTHORS: preface.texi contributors.texi
+ 	rm -f AUTHORS
+ 	-$(MAKEINFO) -D AUTHORSONLY \
diff --git a/sci-mathematics/octave/octave-3.4.3-r1.ebuild b/sci-mathematics/octave/octave-3.4.3-r1.ebuild
index b8a32da12d34..90045ac1d945 100644
--- a/sci-mathematics/octave/octave-3.4.3-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v 1.4 2012/01/21 18:28:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v 1.5 2012/01/31 18:01:08 bicatali Exp $
 
 EAPI=4
 inherit eutils base autotools toolchain-funcs
@@ -55,7 +55,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{pkgbuilddir,help}.patch
+	epatch "${FILESDIR}"/${P}-{pkgbuilddir,help,texi}.patch
 	eautoreconf
 }
 
diff --git a/sci-mathematics/octave/octave-3.6.0.ebuild b/sci-mathematics/octave/octave-3.6.0.ebuild
index a485a0945d53..d264045067ac 100644
--- a/sci-mathematics/octave/octave-3.6.0.ebuild
+++ b/sci-mathematics/octave/octave-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild,v 1.2 2012/01/20 23:53:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild,v 1.3 2012/01/31 18:01:08 bicatali Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0"
-IUSE="curl doc fftw +glpk +imagemagick opengl openmp +qhull +qrupdate
+IUSE="curl doc fftw +glpk +imagemagick opengl +qhull +qrupdate
 	readline +sparse static-libs X zlib"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
@@ -52,12 +52,7 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	dev-util/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help}.patch )
-
-pkg_setup() {
-	use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp && \
-		die "You have openmp enabled but your current gcc does not support it"
-}
+PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help,texi}.patch )
 
 src_configure() {
 	# hdf5 disabled because not really useful (bug #299876)
@@ -72,12 +67,10 @@ src_configure() {
 
 	myeconfargs+=(
 		--localstatedir="${EPREFIX}/var/state/octave"
-		--disable-rpath
 		--without-hdf5
 		--with-blas="$(pkg-config --libs blas)"
 		--with-lapack="$(pkg-config --libs lapack)"
 		$(use_enable doc docs)
-		$(use_enable openmp)
 		$(use_enable readline)
 		$(use_with curl)
 		$(use_with fftw fftw3)