[gentoo-commits] gentoo-x86 commit in sci-mathematics/octave: octave-3.6.0.ebuild ChangeLog octave-3.4.3-r1.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    12/01/31 18:01:08

  Modified:             octave-3.6.0.ebuild ChangeLog
                        octave-3.4.3-r1.ebuild
  Log:
  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)

Revision  Changes    Path
1.3                  sci-mathematics/octave/octave-3.6.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild?r1=1.2&r2=1.3

Index: octave-3.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- octave-3.6.0.ebuild	20 Jan 2012 23:53:28 -0000	1.2
+++ octave-3.6.0.ebuild	31 Jan 2012 18:01:08 -0000	1.3
@@ -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 @@
 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 @@
 	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 @@
 
 	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)



1.115                sci-mathematics/octave/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?r1=1.114&r2=1.115

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ChangeLog	21 Jan 2012 18:28:10 -0000	1.114
+++ ChangeLog	31 Jan 2012 18:01:08 -0000	1.115
@@ -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@g.o> 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@g.o> octave-3.4.3-r1.ebuild:
   Applying pkg_setup to earlier version



1.5                  sci-mathematics/octave/octave-3.4.3-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild?r1=1.4&r2=1.5

Index: octave-3.4.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- octave-3.4.3-r1.ebuild	21 Jan 2012 18:28:10 -0000	1.4
+++ octave-3.4.3-r1.ebuild	31 Jan 2012 18:01:08 -0000	1.5
@@ -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 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{pkgbuilddir,help}.patch
+	epatch "${FILESDIR}"/${P}-{pkgbuilddir,help,texi}.patch
 	eautoreconf
 }