Re-add hdf5, some octave packages might need it. Do in source configuring for preventing more bugs. Drop hppa (needs hdf5)

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

3 files changed, 125 insertions, 5 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index dc41b7b73e60..2bcb2053138e 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.126 2012/06/06 21:31:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.127 2012/06/11 22:33:31 bicatali Exp $
+
+*octave-3.6.2-r1 (11 Jun 2012)
+
+  11 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> +octave-3.6.2-r1.ebuild:
+  Re-add hdf5, some octave packages might need it. Do in source configuring for
+  preventing more bugs. Drop hppa (needs hdf5)
 
 *octave-3.6.2 (06 Jun 2012)
 
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 89e7a822b0af..87092f690c28 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -9,13 +9,14 @@ DIST octave-3.6.1.tar.bz2 15387369 RMD160 e57ff05ee14cce60de781233c1b4e6febef894
 DIST octave-3.6.2.tar.bz2 15418829 RMD160 1bf26b238d2bba461c5902d091088533c733439b SHA1 145fef0122268086727a60e1c33e29d56fd546d7 SHA256 0bb69b93d0bee872308a7944f1ebbe948f55cd4ae55beab38f05950e1b45c4ae
 EBUILD octave-3.4.3-r1.ebuild 2750 RMD160 ab149d097fa1b1195d3eca1bbdb883f72d51bb35 SHA1 bd65a966d3483172c6503521f05bdca8e79e55a2 SHA256 36ba35598396f0048d38fdf96d7f432b7f0a4ae23d65d820b3d962bc65cbef15
 EBUILD octave-3.6.1.ebuild 2798 RMD160 f3e66715b469779887e6bcdceb7d604e8d6e63ed SHA1 5d370de17da221305df6e44f090cfd193194c9a2 SHA256 500b20b0975a4df55d23cdde601acf61bce6f6112b9ba30298f54a5a98bbc589
+EBUILD octave-3.6.2-r1.ebuild 2994 RMD160 82425924ace0ba3d54dd4ad9b03d1fc3e01183f2 SHA1 ffa0648352b873eaba3e8ea08946009287034548 SHA256 859f3b3fcf2af00be67a83dd4d902c5397bcbfaf7d8a4ae633758512f46768c6
 EBUILD octave-3.6.2.ebuild 2806 RMD160 62acf75aab9f02c3951663e1eadc26e2538a1065 SHA1 e705de574000736a01d5437f8ed343ac0e22eaad SHA256 6f1be74bb44af1a02b0031b1549a75bdd89c62ceff71fae6dcef889d835f4604
-MISC ChangeLog 30780 RMD160 582e6ac300ef7069e1190e8f549bdf73fccb771a SHA1 bbb0cf4f1af14fa6a338c8f27c07cf7e4c07a34a SHA256 566941bf8798adddc3f94feb0e32ffe36de4d1e4033d05b43584db42cd520bb3
+MISC ChangeLog 31020 RMD160 8811f0b5fcfb1a67c8c73b0b3507824c7af1afcb SHA1 489f3889fd3f84b8d6f37b1698e291f243160dde SHA256 0e84ffbbd9974a6e4d3893a28da6c543a44837c4e1753cf745a56b1546291236
 MISC metadata.xml 928 RMD160 28d79a8597076528a69c31aae3b7d208a3296e6e SHA1 bd294c06bdf3bb9753f0028d596008fb1b1126df SHA256 6314fe7f4dfc713b292c7ff071c186873989e3d8b08d0637e20f7c52bb4dc4ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk/PzDgACgkQ1ycZbhPLE2Ap0ACgmeRd46FkE8360SfAH5J2lMEm
-o2QAn3cJ24JvvqCr79lZ+z5rKuo3rfKR
-=0tLr
+iEYEARECAAYFAk/WckQACgkQ1ycZbhPLE2DfjgCbB9j1t6im8FKKjkgRx4B8WUID
+FK4AoLH5XE3OE6GOc36I1+VYEsj+YIQ2
+=4D7x
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-3.6.2-r1.ebuild b/sci-mathematics/octave/octave-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..f5dc2287f1d7
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.6.2-r1.ebuild
@@ -0,0 +1,113 @@
+# 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.2-r1.ebuild,v 1.1 2012/06/11 22:33:31 bicatali Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils toolchain-funcs fortran-2
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick opengl +qhull +qrupdate
+	readline +sparse static-libs X zlib"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~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 )
+	hdf5? ( sci-libs/hdf5 )
+	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
+	virtual/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
+
+	# gentoo bug #302621
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	local myeconfargs+=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--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 hdf5)
+		$(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
+}