Bump octave to 3.8.2, fixes bump request Bug 520368, thanks to mrueg for reporting. Add deps to USE java, fixes Bug 519756, thanks to M. B. for reporting and the fix.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 183 insertions, 8 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 1b54bfa66e87..a483d4e16686 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.166 2014/04/18 14:18:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.167 2014/09/07 12:59:59 gienah Exp $
+
+*octave-3.8.2 (07 Sep 2014)
+
+  07 Sep 2014; Mark Wright <gienah@gentoo.org> +octave-3.8.2.ebuild,
+  octave-3.8.1-r1.ebuild:
+  Bump octave to 3.8.2, fixes bump request Bug 520368, thanks to mrueg for
+  reporting. Add deps to USE java, fixes Bug 519756, thanks to M. B. for
+  reporting and the fix.
 
   17 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> octave-3.8.1-r1.ebuild:
   Removed checking of symbols in linear algebra libraries bug #507782
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 7f77af678ff2..dc4f9bb04889 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -16,16 +16,18 @@ AUX octave-3.8.1-imagemagick.patch 5627 SHA256 ca2ca6df409d36e0f64b6c9b5c3be6ed1
 AUX octave-3.8.1-pkgbuilddir.patch 1417 SHA256 7b2e74e3e9b713a2c52d19aa4fb4c3dd637ee4887c358027289f394342560c07 SHA512 5f1aa2e1533223832045ea418e06b6fb1276f9d16aca6cd8f0e8708bcdd0fcc67421462b40b0bd8a4fe7d98abdc2cccc2a2383fb17c12fd73c812b148b06fd30 WHIRLPOOL fe5df789a0d0bdd387423685b6ab3ae636b87a64bd6e579ac7fac80797297dee25177c86c0d1bb8e045160b153622c6bd331331d17d270128f52be00eeaec620
 DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
 DIST octave-3.8.1.tar.bz2 17664241 SHA256 d6762ed2ad4a042243a095fb44c7a1d3a91c635b6dca37fcef15a5efdffa9bbd SHA512 673ff37692d2ef1116a10afb36448494e69cb01de609017af1a72c3258a1fe71012e9986aafc29127509f7e6664127b4e9b7f269322820b3464eb30ab4b4ef7f WHIRLPOOL 85729283a65051159245f31ab53951c756ea55d1cc93518dbb55b740329a89cffbdf3679ae8d2b957e1a4b47dbf5f2dd9d60f51acf32e159d821979661a5fa54
+DIST octave-3.8.2.tar.bz2 17834980 SHA256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc WHIRLPOOL c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
 EBUILD octave-3.6.4-r1.ebuild 3546 SHA256 1e303b6d0b5dae850e83a12cfdf2c48f856d9eedf619a8eef4538ae811b8c591 SHA512 c5740862f898795f7f69af11da70ee479e610002385bfe2d46b6ded46e7e7e8eef772bd3e21db00da148065672d6cd58cf6484d80a2b759324f1d1f7805c9d36 WHIRLPOOL 46b56b068c35bad96c458e86c87feb14b7998a7ebf05a17fb9dba31631f0dd1e7b570852c393010f925a356091e312a765e5d50fbb4fb8de7cec1f35ef8e26f9
 EBUILD octave-3.6.4.ebuild 3481 SHA256 33e2e2bc509d636036b854b1db531daaf8cbd245740696c9fbed5d7bdd632e0e SHA512 c03a63c4cec131a9384d5eacc67f8724b102e48a4356318a89b8eec2c34b2da9c19e903e2e0a2f1b408803044c7689078aaadf527b90bcd3a6c0b6b8f619ae13 WHIRLPOOL c14ff910f1bab7362fc95d4730a3a752abfc011b5d7ce655afd9bafbdac7c1dfc989a7b0286a4dbd54836cb15522149561ebaffe77c99c58762c824dfc1dc873
-EBUILD octave-3.8.1-r1.ebuild 4460 SHA256 ccce98dd5de14585f23ca9f53c709987c101664fedaf44453444a18aedd7628f SHA512 024313b0e060b468d45688a354ceccb685e1e4c2ec0fc1ab4d59c8b5caf71958c39a44b2aa810eae7dcb5a122d743106865e234e4ca49a52988bf6c5837425ef WHIRLPOOL ac2a5df4d5fad08e6a429872a1a77c0cb6181c74ebbb6e3f56496f9a1b5479af1d4d75907a252cf325dd22091cbd7c969c8ced770ccaca99654cbadbeb672cd0
+EBUILD octave-3.8.1-r1.ebuild 4520 SHA256 01c6207de413f5d82bc70260d233bfa682bb0f4f83af03ba9d25c33977eda9f2 SHA512 ac27971c4476718aeb9ad4d6cd7d403f7afa0afc642693d612b86890e4f415e60c06019e149630dd2532b319b514a7f35955d68a9cb9dc800aad064113c79e00 WHIRLPOOL 4f190e0c0869b07eaa2ed312e1440047a7b2eba2bc8bceb116d436e28bb3701ed13b81d49e5fa506c79f95c0d0df8048009c146ad09d57e3786da0e6b7ff1d4d
 EBUILD octave-3.8.1.ebuild 6044 SHA256 f63dfe96e4049cc9c06ee2b5b64585fd46073b967b727444270a1f8a0b43d886 SHA512 46063c87a6d938b6d458fb163e66531323c8d9d140d8bc76507cad9e7cf661e91f6ff4526cc42b63b17230141b233065d7b197bbfe83c051b2145d057ac956db WHIRLPOOL c62f4aabec268a0e06c7e03eb78b6a368738d530cecfa7a4b773c989a6942db5df2b6f79ee1c66d31b7d03e14f12429baf75c455ad020112cff9738322e9599a
-MISC ChangeLog 38952 SHA256 c8e8cd3f7ae16574c07ecb0677dcb24aa8b22b415263329f91808e72e53d3d22 SHA512 ac4fd560599919f25b7b4e15bb1cc666654677031cf2baecaf3d1e947f80c4eb5c1f6cadd627b2c015a7e63a2311c27accc06624d884ff8c7ca5f4672c9ef366 WHIRLPOOL 91603c20151c536c908d73df1499bbf62baf0702c9aa803b02c997087f4481203e06ab79b8e88a31a7fcc1287a915f4e749ddddfe87da69b6760e648f50ad0c2
+EBUILD octave-3.8.2.ebuild 4517 SHA256 ee467e30fa0643ac25270b99db00b6c2d211601a8187a1af750a34a1f0ff71ea SHA512 9b2fddd68c7c1349b9b683171ceb916a00acf89c83a84454a296755069738a594a5c06a249ca1829e49a917d39ec8ea5ff0b4e739ec480b78f6581e741ebb37f WHIRLPOOL 255586de131503bcb37334860e82f57bb6ab4ddcf95f1282797a4de4050d7533dab69ab682f03b68e92fa77ee7ea0b967689155dde5162654624a7656ac8c738
+MISC ChangeLog 39253 SHA256 1876fcf6900e84057f1a0f9dc7577a231950c18841097a59f06948ec99ca37a8 SHA512 ebc80ef32dde6f59f6a3684f07b9bc3664fb7762e00bed568127256758308caedadd3e74544033ec40012fe8e0a6a76efa9236d51fcdb5724fca01d6f490e097 WHIRLPOOL 01e6c7ea5ecd71a1ef05eb33ffc18907738cd852d3f06b634fc60a83c886bab42ec7b9950a04b8a83ebd6f15a12656b4e4fa65c606ba1436b6bf5582eb5f8224
 MISC metadata.xml 1066 SHA256 e334e61be56a49bc98ef4c043256f1dacd978bff38870acbcefa7188eda0d4ff SHA512 a807577947d366ddcdd0d828e5fac276e8a1060752350f7dd680f415f56b9c50d1e2a69191ef0c55400944552181a97370f7c64c91ba1697fc4a9bd60e97b1d1 WHIRLPOOL d4d7d934483435c88c474b547d39e9153da6f1a2c31f8a6702fa2398b2104bb3ec1492ba38093f340cd3be48da42758e853db9e8e246a304b4f582ed0b2194bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNRNFEACgkQVWmRsqeSphPYVgCeNsdg4woRelpe2jOe2HC3qbgw
-vXcAnjd2x09l1007z1gxaNlOM+w9TxMT
-=mXz0
+iF4EAREIAAYFAlQMVtsACgkQoBEVQmGOlx/u9AEAs8zMJrEtQYjGsYUQnu/csurF
+/YJkhdLYtW7ekmtd0FwA/2zx3zuUiXiQ1MD5fLUNPLmOKgE1HsaJ0jOiCkvVSerU
+=i6V0
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-3.8.1-r1.ebuild b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
index 95a8ab33b49b..b7230cebee31 100644
--- a/sci-mathematics/octave/octave-3.8.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.3 2014/04/17 16:02:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.4 2014/09/07 12:59:59 gienah Exp $
 
 EAPI=5
 
@@ -33,6 +33,7 @@ RDEPEND="
 	imagemagick? ( || (
 			media-gfx/graphicsmagick:0=[cxx]
 			media-gfx/imagemagick:0=[cxx] ) )
+	java? ( >=virtual/jre-1.6.0 )
 	jit? ( sys-devel/llvm )
 	opengl? (
 		media-libs/freetype:2=
@@ -61,6 +62,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	qrupdate? ( app-misc/pax-utils )
 	sparse? ( app-misc/pax-utils )
+	java? ( >=virtual/jdk-1.6.0 )
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-genericrecommended
diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2.ebuild
new file mode 100644
index 000000000000..c42ab9776453
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.8.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v 1.1 2014/09/07 12:59:59 gienah Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
+
+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/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:5=
+	virtual/lapack
+	curl? ( net-misc/curl:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
+	gnuplot? ( sci-visualization/gnuplot )
+	gui? ( x11-libs/qscintilla:0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? ( || (
+			media-gfx/graphicsmagick:0=[cxx]
+			media-gfx/imagemagick:0=[cxx] ) )
+	java? ( >=virtual/jre-1.6.0 )
+	jit? ( sys-devel/llvm )
+	opengl? (
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		>=x11-libs/fltk-1.3:1=[opengl]
+		x11-libs/gl2ps:0=
+		virtual/glu )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		media-gfx/transfig )
+	qhull? ( media-libs/qhull:0= )
+	qrupdate? ( sci-libs/qrupdate:0= )
+	readline? ( sys-libs/readline:0= )
+	sparse? (
+		sci-libs/arpack:0=
+		sci-libs/camd:0=
+		sci-libs/ccolamd:0=
+		sci-libs/cholmod:0=
+		sci-libs/colamd:0=
+		sci-libs/cxsparse:0=
+		sci-libs/umfpack:0= )
+	X? ( x11-libs/libX11:0= )
+	zlib? ( sys-libs/zlib:0= )"
+
+DEPEND="${RDEPEND}
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )
+	java? ( >=virtual/jdk-1.6.0 )
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-genericrecommended
+		dev-texlive/texlive-metapost
+		sys-apps/texinfo )
+	dev-util/gperf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.3-texi.patch
+	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
+	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
+	"${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
+	"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 and qt4 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
+	fi
+
+	has_version ">=sys-devel/llvm-3.4" && \
+		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
+
+	# Fix bug 501756
+	sed -i \
+		-e 's@A-Za-z0-9@[:alnum:]@g' \
+		-e 's@A-Za-z@[:alpha:]@g' \
+		libinterp/mkbuiltins || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	# unfortunate dependency on mpi from hdf5 (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="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable gui)
+		$(use_enable jit)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(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)
+	)
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			myeconfargs+=( "--with-magick=GraphicsMagick" )
+		else
+			myeconfargs+=( "--with-magick=ImageMagick" )
+		fi
+	else
+		myeconfargs+=( "--without-magick" )
+	fi
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	emake
+	if use java || use jit ; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc $(find doc -name \*.pdf)
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && \
+		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
+	doenvd 99octave
+}