Version bump, add a gnuplot flag (bug #402705), and fix occasional failures on install (bug #401189)

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 121 insertions, 7 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 6296e01ef6eb..28b74cac0445 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,12 @@
 # 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.119 2012/02/16 19:31:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.120 2012/02/27 18:27:27 bicatali Exp $
+
+*octave-3.6.1 (27 Feb 2012)
+
+  27 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> +octave-3.6.1.ebuild:
+  Version bump, add a gnuplot flag (bug #402705), and fix occasional failures
+  on install (bug #401189)
 
   16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> octave-3.4.3-r1.ebuild:
   x86 stable wrt bug #402199
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 3b480bab63a8..4a75d6f6ac4d 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX octave-3.2.0_as_needed.patch 485 RMD160 6476d8af9ada03c4b169e87e65d674a3b4bb810b SHA1 f0af5b1435ae2ca9eee08e37de5f3dda0e662b26 SHA256 cd4e0d0299b487959396313a42fdc94b2f069dd99c3127789496cfa40da71e9e
 AUX octave-3.2.0_parallel_make.patch 374 RMD160 0e597204583c44c6c67aa5c5360a73f0f6bae298 SHA1 85170197541aa797ff41f7c46e1e3594dbf32fe4 SHA256 d2864f9b0dbea021120be04d16f57759d881bff11bf2b90e34c7b68c770adb23
@@ -13,15 +13,17 @@ AUX octave-3.4.3-texi.patch 375 RMD160 c7938645de3339143e7989c518a9f7930bcb53a7
 DIST octave-3.2.4.tar.bz2 12080959 RMD160 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43 SHA1 7de078564027108f3436f3ba7bf5993a6b411a67 SHA256 48471d05c7ed9c0a5a4d5fa4ae8a857447ac3da1197f86cfe79b9d8f4fdfd147
 DIST octave-3.4.3.tar.bz2 15085117 RMD160 d6f43fca9097b40f163c140db853d8ac1383ab39 SHA1 fe622c28a38f8730c59e46211bc7b18e7f51a679 SHA256 94d119cc93a38465e9c00dd36b9cc063abbda7ae8cb39407cf88a2bddc9dc148
 DIST octave-3.6.0.tar.bz2 15290924 RMD160 4b19537670b7421942eb350320b4d3e6fda8fd1d SHA1 62116e090d257a601e9d605f969dd87b7de1ffce SHA256 e597737c7fe1a03d4c0ccbf27bbd821ec17aa2367d83e931abcbfdb6d62d92d7
+DIST octave-3.6.1.tar.bz2 15387369 RMD160 e57ff05ee14cce60de781233c1b4e6febef89416 SHA1 46fdc0b3d7db1b0266975a7443e26769c939a9c7 SHA256 f8073ee7570d8ff78864868027ef1e08409a78e0798d8800fac67e7e714eadf6
 EBUILD octave-3.2.4-r1.ebuild 2916 RMD160 45f8a2be227c116671e4b09184d7322392b9b71e SHA1 ca2f91e277d2fd6d8e05e0cdd24b7240b4822151 SHA256 84372c2a81e53ce66a74402becbf1a82dd6128a35473745f6a2504c45c164528
 EBUILD octave-3.4.3-r1.ebuild 2783 RMD160 5476310af3afcaf9e2c809da5254e2fcd475aab4 SHA1 22e1ae3cc4ab3964367d242741b2df0a7ad3f325 SHA256 46c727157c812f11eafb0cc073e49951149af893b7ab30394071c343255be0be
 EBUILD octave-3.6.0.ebuild 2664 RMD160 fe0a055dab836972211eace15710d4377c3dac32 SHA1 c5dd2f1942473fe5a4d620f4a285adcc1db5d52c SHA256 1471ef166eabc6d2cba172d939ed78263d46eb0fc5fd58f5d9eeb1daeeb2c71d
-MISC ChangeLog 29246 RMD160 b1130e1b4617755558a7a98e04d531d5ce2f57c9 SHA1 55e6e0b8f11b628d574ebefffbfd86b96b86e61f SHA256 995a7bf89a91b4958740459f244130b4a4a22e4c110b77c90913709530346b66
+EBUILD octave-3.6.1.ebuild 2828 RMD160 d664d2b453f02bf97b6fbf4f07566190b0e30de6 SHA1 88037d386696c853cbe8ba39323f37507b1406a2 SHA256 eafe139f83404e8ddde6e14875c86e2800bfb3f837cb01af469fc5a89f6b3904
+MISC ChangeLog 29456 RMD160 c719d895c2b5f7f5ac13f193dbb186c7d02a562f SHA1 f42b23256f95270039eb74af60bb2eade6718ca2 SHA256 261f19a94c37ae3e999fbe4a99c6c318b4764ec74a100e006031d25351ab1b67
 MISC metadata.xml 928 RMD160 28d79a8597076528a69c31aae3b7d208a3296e6e SHA1 bd294c06bdf3bb9753f0028d596008fb1b1126df SHA256 6314fe7f4dfc713b292c7ff071c186873989e3d8b08d0637e20f7c52bb4dc4ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk89WawACgkQuUQtlDBCeQIzowCcDQ43BC4838ne9xzeCRGxTPHM
-tagAn1onpFT7btLBc+4rvUb5ri5JtzwL
-=c94B
+iEYEARECAAYFAk9LyxcACgkQ1ycZbhPLE2DrfgCgozLR4QgvuWIg3QtIYYQtaaJ+
+YUIAniZmf8b2Wd7YV7OOFnauuMYCpNzN
+=LYmN
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-3.6.1.ebuild b/sci-mathematics/octave/octave-3.6.1.ebuild
new file mode 100644
index 000000000000..e5f6c86157ec
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.6.1.ebuild
@@ -0,0 +1,106 @@
+# 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.1.ebuild,v 1.1 2012/02/27 18:27:27 bicatali Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+inherit autotools-utils toolchain-funcs
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+IUSE="curl doc fftw +glpk gnuplot +imagemagick opengl +qhull +qrupdate
+	readline +sparse static-libs X zlib"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/libpcre
+	app-text/ghostscript-gpl
+	sys-libs/ncurses
+	virtual/lapack
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0 )
+	glpk? ( sci-mathematics/glpk )
+	gnuplot? ( sci-visualization/gnuplot )
+	imagemagick? ( || (
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx] ) )
+	opengl? (
+		media-libs/freetype:2
+		media-libs/fontconfig
+		>=x11-libs/fltk-1.3:1[opengl] )
+	qhull? ( media-libs/qhull )
+	qrupdate? ( sci-libs/qrupdate )
+	readline? ( sys-libs/readline )
+	sparse? (
+		sci-libs/arpack
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod
+		sci-libs/colamd
+		sci-libs/cxsparse
+		sci-libs/umfpack )
+	X? ( x11-libs/libX11 )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-genericrecommended
+		sys-apps/texinfo )
+	dev-util/gperf
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help,texi}.patch )
+
+src_configure() {
+	# occasional fail on install, force regeneration  see bug #401189
+	rm -f doc/interpreter/contributors.texi || die
+
+	# hdf5 disabled because not really useful (bug #299876)
+	local myconf="--without-magick"
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			myconf="--with-magick=GraphicsMagick"
+		else
+			myconf="--with-magick=ImageMagick"
+		fi
+	fi
+
+	myeconfargs+=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--without-hdf5
+		--with-blas="$(pkg-config --libs blas)"
+		--with-lapack="$(pkg-config --libs lapack)"
+		$(use_enable doc docs)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_with glpk)
+		$(use_with opengl)
+		$(use_with qhull)
+		$(use_with qrupdate)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with X x)
+		$(use_with zlib z)
+		${myconf}
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc $(find doc -name \*.pdf)
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${P}" > 99octave
+	doenvd 99octave
+}