bicatali 14/04/15 22:42:35
Modified: metadata.xml ChangeLog
Added: octave-3.8.1-r1.ebuild
Removed: octave-3.8.1_rc4-r1.ebuild octave-3.8.0.ebuild
octave-3.8.1_rc4.ebuild
Log:
Fixed bug #504470, thanks jer, fixed for gui prefix, add sub-slotted
dependencies, general cleanup
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with
key 0x13CB1360)
Revision Changes Path
1.11 sci-mathematics/octave/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/metadata.xml?rev=1.11&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/metadata.xml?rev=1.11&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/metadata.xml?r1=1.10&r2=1.11
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml 1 Mar 2014 15:17:35 -0000 1.10
+++ metadata.xml 15 Apr 2014 22:42:34 -0000 1.11
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>sci-mathematics</herd>
- <longdescription lang="en">
+<herd>sci-mathematics</herd>
+<longdescription lang="en">
Octave is a high-level language, primarily intended for numerical
computations. It provides a convenient command line interface for
solving linear and nonlinear problems numerically, and for performing
other numerical experiments. It may also be used as a batch-oriented
language.
</longdescription>
- <use>
- <flag name="glpk">Add support for <pkg>sci-libs/glpk</pkg> for linear
programming</flag>
- <flag name="gui">Enable the graphical user interface</flag>
- <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
- <flag name="qhull">Add support for <pkg>sci-libs/qhull</pkg>, to allow
`delaunay', `convhull', and related functions</flag>
- <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR
and Cholesky update functions</flag>
- <flag name="sparse">Add enhanced support for sparse matrix algebra with
SuiteSparse</flag>
- </use>
+<use>
+ <flag name="glpk">Add support for <pkg>sci-libs/glpk</pkg> for linear
programming</flag>
+ <flag name="gui">Enable the graphical user interface</flag>
+ <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
+ <flag name="qhull">Add support for <pkg>sci-libs/qhull</pkg>, to allow
`delaunay', `convhull', and related functions</flag>
+ <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and
Cholesky update functions</flag>
+ <flag name="sparse">Add enhanced support for sparse matrix algebra with
SuiteSparse</flag>
+</use>
</pkgmetadata>
1.163 sci-mathematics/octave/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.163&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.163&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?r1=1.162&r2=1.163
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- ChangeLog 8 Mar 2014 14:12:30 -0000 1.162
+++ ChangeLog 15 Apr 2014 22:42:34 -0000 1.163
@@ -1,6 +1,17 @@
# 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.162
2014/03/08 14:12:30 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.163
2014/04/15 22:42:34 bicatali Exp $
+
+*octave-3.8.1-r1 (15 Apr 2014)
+
+ 15 Apr 2014; Sébastien Fabbro <bicat...@gentoo.org>
+ +files/octave-3.8.1-pkgbuilddir.patch, +octave-3.8.1-r1.ebuild,
+ -files/octave-3.4.3-help.patch,
-files/octave-3.8.0-JIT-64-bit-indexing.patch,
+ -files/octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch,
+ -files/octave-3.8.0-imagemagick.patch, -octave-3.8.0.ebuild,
+ -octave-3.8.1_rc4-r1.ebuild, -octave-3.8.1_rc4.ebuild, metadata.xml:
+ Fixed bug #504470, thanks jer, fixed for gui prefix, add sub-slotted
+ dependencies, general cleanup
*octave-3.8.1 (08 Mar 2014)
1.1 sci-mathematics/octave/octave-3.8.1-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: octave-3.8.1-r1.ebuild
===================================================================
# 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.1
2014/04/15 22:42:34 bicatali 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] ) )
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 )
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
)
pkg_pretend() {
# do we really need this test? it looks a deficiency of our framework
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 linear algebra dependencies for ${blaslib}"
local libdir="${EROOT%/}/usr/$(get_libdir)"
local lib failed_libs libs=( )
use qrupdate && libs+=( "${libdir}"/libqrupdate.so )
use sparse && libs+=(
"${libdir}"/libarpack.so
"${libdir}"/libcholmod.so
"${libdir}"/libspqr.so
"${libdir}"/libumfpack.so
)
for lib in ${libs[@]}; do
# linked with the current blas?
if ! scanelf -n ${lib} | grep -q "${blaslib}"; then
# linked with some blas or lapack library?
if ! scanelf -n ${lib} | egrep -q
"blas|lapack"; then
failed_libs="${failed_libs} ${lib}"
fi
fi
done
if [[ -n ${failed_libs} ]]; then
eerror "${failed_libs} must be rebuilt with ${blaslib}"
eerror "Try re-installing ${failed_libs}"
die "check of blas/lapack consistency failed"
fi
fi
}
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
}
