summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2014-03-01 02:47:09 +0000
committerMark Wright <gienah@gentoo.org>2014-03-01 02:47:09 +0000
commita951352cc7b71b7feed35f00fb05968d3a2a6f38 (patch)
tree68bd0f260a4c58a49ac0c8ff06ec12a79961678e /sci-mathematics/octave
parentVersion bump (bug #499730). (diff)
downloadhistorical-a951352cc7b71b7feed35f00fb05968d3a2a6f38.tar.gz
historical-a951352cc7b71b7feed35f00fb05968d3a2a6f38.tar.bz2
historical-a951352cc7b71b7feed35f00fb05968d3a2a6f38.zip
Bump octave to 3.8.1-rc4
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F
Diffstat (limited to 'sci-mathematics/octave')
-rw-r--r--sci-mathematics/octave/ChangeLog7
-rw-r--r--sci-mathematics/octave/Manifest10
-rw-r--r--sci-mathematics/octave/octave-3.8.1_rc4.ebuild211
3 files changed, 223 insertions, 5 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 036c275bf49f..76a9dbaf8d8b 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,11 @@
# 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.157 2014/02/24 11:16:44 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.158 2014/03/01 02:46:54 gienah Exp $
+
+*octave-3.8.1_rc4 (01 Mar 2014)
+
+ 01 Mar 2014; Mark Wright <gienah@gentoo.org> +octave-3.8.1_rc4.ebuild:
+ Bump octave to 3.8.1-rc4
24 Feb 2014; Mark Wright <gienah@gentoo.org> octave-3.6.4-r1.ebuild,
octave-3.6.4.ebuild, octave-3.8.0.ebuild, octave-3.8.1_rc3.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index ff73986c5bcf..583b2b3b4f7f 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -19,16 +19,18 @@ AUX octave-3.8.0-pkgbuilddir.patch 1413 SHA256 277a2cf88d50db3125e5bffb989626f80
DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
DIST octave-3.8.0.tar.bz2 17669638 SHA256 519330c6dd34eb69ca26a811722948fceac2acebd67ba924eba9b34a2e5a94f9 SHA512 2e8b81b418e235cddd6678d7cc83b8441c64b36f98854ab704c1b34d5ff711d3f6cce7ffe33f5f70a7bc231b2219b39d16033e6b9d04174cbab68f21c5a8abec WHIRLPOOL ace3d162722b0e47d78fbf8029396c3e5690a4260d5fcef09be4a1a58f7a1144888f5829a47f77d344ca20fa6844c55b80955e7093c5cd2e98a89188b6ec3708
DIST octave-3.8.1-rc3.tar.gz 20586726 SHA256 31599a8c113d855212e13feedd74c5191541dfd18f4be1eafc786d700dd6172d SHA512 022b5a8d65af0e0038dedb6ddc6097647ef7cb6b3b675d6c2e8bf8e0c1865eb39454ce798492bd42d6119328d25874b942c58c2b5dda265810e4b9a3c93d777d WHIRLPOOL 7f8ea6a6ff985064c3f13f16b4bdfb951442005d5e32390ac635c17709194016db9deeccd7caf5de11f4ca96372ec95cbc6e5a23166cb0aec9c99ddd46d6ca63
+DIST octave-3.8.1-rc4.tar.gz 20688476 SHA256 f137c8132b77044c21e5ace97e67c3c74d36d106ba6b33f683201bfd59268e33 SHA512 295d1056a609cdeea357cab257dcbd672c8d885e67da5e20a16cc477e69deb9bcc082df6a168dfb01a3738e50ee5cb6518aa002800fa3bddbecca624e30d2e7b WHIRLPOOL 7bf1467474934fe7e69c7d1da79520c562a6c8546f541b04be99cac385439275f0353423d833ae4246c3d2a6b288dc83f73325febb2179ef81e5421472b17219
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.0.ebuild 6468 SHA256 db8511b581c33cc815a3526e15b1897c0d01e917e61e71d1e56065811bbcae99 SHA512 d88a1db4e285c6d629443edae890bef749283fd0f00a76e37f736ba9c1d46e02529cb2c981a656921650732432bfdf4b385de85f4c1dfb70a8fcc9f4c6b670a1 WHIRLPOOL b26e19e7b45a31b2830edbf8de9f3bbcf17c7d0924a181bc9c9eee9f917741695b986f68d754e83919afea078731cc6afebe229348eb15c247810c9b9201031b
EBUILD octave-3.8.1_rc3.ebuild 6378 SHA256 ad8e3bc68c060a2d7ac69e3867d00c5a1a166e0c534162209672e00bff60c5b6 SHA512 1e0d147df96014b3276b1dac28a25bbb5f6449217794ffc8d4029e19475cbbc472287a894718d2981d3c7b21d32ed7906d52cb3c30ffc3b4e50c1dc3ffb7685e WHIRLPOOL b65737bfc1d05ae6c7d22b1e6b0f5b25af0763bfcdb1a3222bb5b2d7e135779b46fc1bf3507b153983eee2f89416d2b080e88fa224b38a2443674791ed2a4110
-MISC ChangeLog 37188 SHA256 6932cbf5428a77a1784472142c21d4ebd439a3053829d8899c0e03aedeb2ae12 SHA512 bdb3cb65faaf49dda3603e975b4e2c9ae4b7966b80827007b6a0ea2b321ceb99cfc1a7f53f8be86f12870911677323961a9e0efb9f515b65659ffe427b687ecf WHIRLPOOL d06564f425ba0c69cb85a60404a72ebb1799ca764c37ba8ee4f397e82fc3b5035ffbf55442e697ca1d575fd0037dc6036a2b2d81a31da819fcb69aa04f22d802
+EBUILD octave-3.8.1_rc4.ebuild 6387 SHA256 8f5a4f56ce3eb51179b8a991c07d658084de7b36e12ad4cc720705112dec420d SHA512 d0e2d8ae2d6ca691c4838b43dae8b7f527b0ea375906446c272f142d79a717638b37f61bb47458b075fa8cbc2c12d2dc86f9a6d595f6453b23392f6f909adc02 WHIRLPOOL 932fb5e5686236bc30a3b23a675ed61af805cbf876ec85e0708231d5f3d960ec91a0359ba68228f70703b0d408331069b5c8d455ddf94cff52a23f339fd10903
+MISC ChangeLog 37322 SHA256 05a92fbc734d371852cf40c15f6df8a7f9c1dda1bcbffde0a527902d7f88fdef SHA512 135ea3a90793569d66a02344afc619f062bed9836fe2a501ccd4bf4c840f1b923bf95700c60caee8e453d2382129b305761ef5b091ebdbfaa65aa9e0aaa29cfb WHIRLPOOL feaaa21394b31255db220033c9638fd213523e555e391bf2c982329544e20fed479c7c57c8a3e9d94e5c7d1a54701c18e1fdba1792633c9eb6517e9c4cd8435e
MISC metadata.xml 1022 SHA256 1b65adbdcc076642a258fff07b7e362922ac22a8498b20bd96e2c97a2ea45a10 SHA512 bf855dac972af2db8e39396a50fbdc1199f28bf4b29cf2c78315f608584f0258a12985f021003b84553bf289c734397d8c7f92666c022b6b1f68f1ebccf89966 WHIRLPOOL b6d90f1eeec501dab72503cc677792abca0fbc1476d627868090abc2438940ec24088fc95a53df058dffc793f8101a7057a85c64aef6395da6c39864c2f45305
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iF4EAREIAAYFAlMLKjEACgkQoBEVQmGOlx+h8wEAwHV0vvXefiRrlxMiLnVeL1GJ
-+OAdvBCSQGs/hwpalaMBALluMzcKhYJVLo74I5BoNfJHppPP0NPT1Jp2hnCaF47X
-=1Ccr
+iF4EAREIAAYFAlMRSisACgkQoBEVQmGOlx9/KQEAvdMzWwZ1/WGTPyYQ6BK42Td/
++21TRXdZXG81rWCqT5YBANODXNG0oD3G2yZ74at8Oh3lwiDFf6VZa/JhofVpCNpd
+=Qd/P
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-3.8.1_rc4.ebuild b/sci-mathematics/octave/octave-3.8.1_rc4.ebuild
new file mode 100644
index 000000000000..24200ae8c469
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.8.1_rc4.ebuild
@@ -0,0 +1,211 @@
+# 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_rc4.ebuild,v 1.1 2014/03/01 02:46:54 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
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="mirror://gnu-alpha/octave/${MY_P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot 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
+ sys-libs/ncurses
+ jit? ( !hppa? ( sys-devel/llvm ) )
+ 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]
+ !hppa? ( x11-libs/gl2ps )
+ virtual/glu )
+ postscript? (
+ app-text/epstool
+ media-gfx/pstoedit
+ media-gfx/transfig )
+ 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}
+ qrupdate? ( app-misc/pax-utils )
+ sparse? ( app-misc/pax-utils )
+ doc? (
+ virtual/latex-base
+ dev-texlive/texlive-genericrecommended
+ dev-texlive/texlive-metapost
+ sys-apps/texinfo )
+ dev-util/gperf
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.8.0-pkgbuilddir.patch
+ "${FILESDIR}"/${PN}-3.4.3-texi.patch
+ "${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
+ "${FILESDIR}"/${PN}-3.8.0-imagemagick.patch
+ "${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
+ "${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ if use qrupdate || use sparse; then
+ local blaslib=$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's@-l\([^ \t]*\)@lib\1@' | cut -d' ' -f 1)
+ einfo "Checking dependencies are built with the same blas lib = ${blaslib}"
+ local usr_lib="${ROOT}usr/$(get_libdir)"
+ local libs=( )
+ use qrupdate && libs+=( "${usr_lib}"/libqrupdate.so )
+ use sparse && libs+=(
+ "${usr_lib}"/libarpack.so
+ "${usr_lib}"/libcholmod.so
+ "${usr_lib}"/libspqr.so
+ "${usr_lib}"/libumfpack.so
+ )
+ for i in ${libs[*]}
+ do
+ # Is it not linked with the current blas? This check is not enough though, as
+ # earlier versions of sci-libs/cholmod were not linked with blas, while as later
+ # versions are if built with the lapack use flag.
+ scanelf -n ${i} | grep -q "${blaslib}"
+ if [[ $? -ne 0 ]]; then
+ # Does it appear to be linked with some blas or lapack library?
+ scanelf -n ${i} | egrep -q "blas|lapack"
+ if [[ $? -eq 0 ]]; then
+ eerror "*******************************************************************************"
+ eerror "${i} must be rebuilt with ${blaslib}"
+ eerror ""
+ eerror "To check the libaries ${i} is currently built with:"
+ eerror ""
+ eerror "scanelf -n ${i}"
+ eerror ""
+ eerror "To find the package that needs to be rebuilt:"
+ eerror ""
+ eerror "equery belongs ${i}"
+ eerror "*******************************************************************************"
+ die
+ fi
+ fi
+ done
+ fi
+}
+
+src_prepare() {
+ # nasty prefix hack for fltk:1 linking
+ if use prefix && use opengl; then
+ sed -i \
+ -e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
+ configure.ac
+ fi
+ if has_version ">=sys-devel/llvm-3.4"; then
+ epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
+ fi
+ if use hppa && use opengl; then
+ ewarn "http://www.gnu.org/software/octave/NEWS-3.8.html says Printing or saving figures"
+ ewarn "with OpenGL graphics requires the gl2ps - but at the time of writing x11-libs/gl2ps"
+ ewarn "does not have the hppa keyword"
+ fi
+ # Fix bug 501756 - sci-mathematics/octave-3.8.0 LC_ALL=et_EE - octave.cc:485:56:
+ # error: 'Fallow_noninteger_range_as_index' was not declared in this scope
+ sed -e 's@A-Za-z0-9@[:alnum:]@g' \
+ -e 's@A-Za-z@[:alpha:]@g' \
+ -i "${S}/libinterp/mkbuiltins" \
+ || die "Could not patch ${S}/libinterp/mkbuiltins for some non-English locales"
+ 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 opengl 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}/${MY_PV}/m/java/octave.jar"
+ echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${MY_PV}" > 99octave
+ doenvd 99octave
+}