gienah 15/07/07 13:25:35
Modified: octave-3.8.1.ebuild octave-3.6.4-r1.ebuild
octave-3.6.4.ebuild octave-3.8.1-r1.ebuild
octave-3.8.2.ebuild ChangeLog
Added: octave-4.0.0.ebuild
Log:
Bump octave to 4.0.0, fixes Bug 550858 - sci-mathematics/octave-4.0 version
bump, thanks to Bohdan Trach for reporting. octave 4.0.0 allows llvm 3.5,
fixing Bug 531672 - sci-mathematics/octave-3.8.2 USE=jit depends on
<sys-devel/llvm-3.5, thanks to Juergen Rose for reporting and eroen for an
upstream bug reference. Fix Bug 539886 - sci-mathematics/octave-3.8.2 should
depend on x11-libs/fltk[opengl,xft], thanks to Andreas Fink for reporting and
the fix.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
618E971F)
Revision Changes Path
1.3 sci-mathematics/octave/octave-3.8.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild?r1=1.2&r2=1.3
Index: octave-3.8.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- octave-3.8.1.ebuild 9 Sep 2014 13:18:53 -0000 1.2
+++ octave-3.8.1.ebuild 7 Jul 2015 13:25:35 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.ebuild,v 1.2
2014/09/09 13:18:53 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1.ebuild,v 1.3
2015/07/07 13:25:35 gienah Exp $
EAPI=5
@@ -46,7 +46,7 @@
media-gfx/transfig )
qhull? ( media-libs/qhull )
qrupdate? ( sci-libs/qrupdate )
- readline? ( sys-libs/readline )
+ readline? ( sys-libs/readline:0 )
sparse? (
sci-libs/arpack
sci-libs/camd
1.4 sci-mathematics/octave/octave-3.6.4-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild?r1=1.3&r2=1.4
Index: octave-3.6.4-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- octave-3.6.4-r1.ebuild 24 Feb 2014 11:16:44 -0000 1.3
+++ octave-3.6.4-r1.ebuild 7 Jul 2015 13:25:35 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild,v 1.3
2014/02/24 11:16:44 gienah Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4-r1.ebuild,v 1.4
2015/07/07 13:25:35 gienah Exp $
EAPI=5
@@ -43,7 +43,7 @@
media-gfx/transfig )
qhull? ( media-libs/qhull )
qrupdate? ( sci-libs/qrupdate )
- readline? ( sys-libs/readline )
+ readline? ( sys-libs/readline:0 )
sparse? (
sci-libs/arpack
sci-libs/camd
1.11 sci-mathematics/octave/octave-3.6.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild?rev=1.11&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild?rev=1.11&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild?r1=1.10&r2=1.11
Index: octave-3.6.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- octave-3.6.4.ebuild 24 Feb 2014 11:16:44 -0000 1.10
+++ octave-3.6.4.ebuild 7 Jul 2015 13:25:35 -0000 1.11
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v 1.10
2014/02/24 11:16:44 gienah Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v 1.11
2015/07/07 13:25:35 gienah Exp $
EAPI=5
@@ -43,7 +43,7 @@
media-gfx/transfig )
qhull? ( media-libs/qhull )
qrupdate? ( sci-libs/qrupdate )
- readline? ( sys-libs/readline )
+ readline? ( sys-libs/readline:0 )
sparse? (
sci-libs/arpack
sci-libs/camd
1.8 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.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild?r1=1.7&r2=1.8
Index: octave-3.8.1-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- octave-3.8.1-r1.ebuild 5 Jul 2015 14:47:44 -0000 1.7
+++ octave-3.8.1-r1.ebuild 7 Jul 2015 13:25:35 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.7
2015/07/05 14:47:44 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.8
2015/07/07 13:25:35 gienah Exp $
EAPI=5
@@ -33,7 +33,7 @@
imagemagick? ( || (
media-gfx/graphicsmagick[cxx]
media-gfx/imagemagick[cxx] ) )
- java? ( >=virtual/jre-1.6.0 )
+ java? ( >=virtual/jre-1.6.0:* )
jit? ( <sys-devel/llvm-3.5 )
opengl? (
media-libs/freetype:2=
1.10 sci-mathematics/octave/octave-3.8.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild?r1=1.9&r2=1.10
Index: octave-3.8.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- octave-3.8.2.ebuild 5 Jul 2015 14:47:44 -0000 1.9
+++ octave-3.8.2.ebuild 7 Jul 2015 13:25:35 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.9
2015/07/05 14:47:44 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v 1.10
2015/07/07 13:25:35 gienah Exp $
EAPI=5
@@ -33,12 +33,12 @@
imagemagick? ( || (
media-gfx/graphicsmagick[cxx]
media-gfx/imagemagick[cxx] ) )
- java? ( >=virtual/jre-1.6.0 )
+ java? ( >=virtual/jre-1.6.0:* )
jit? ( <sys-devel/llvm-3.5:0= )
opengl? (
media-libs/freetype:2=
media-libs/fontconfig:1.0=
- >=x11-libs/fltk-1.3:1=[opengl]
+ >=x11-libs/fltk-1.3:1=[opengl,xft]
x11-libs/gl2ps:0=
virtual/glu )
postscript? (
1.176 sci-mathematics/octave/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.176&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.176&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?r1=1.175&r2=1.176
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- ChangeLog 5 Jul 2015 14:47:44 -0000 1.175
+++ ChangeLog 7 Jul 2015 13:25:35 -0000 1.176
@@ -1,6 +1,21 @@
# ChangeLog for sci-mathematics/octave
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.175
2015/07/05 14:47:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.176
2015/07/07 13:25:35 gienah Exp $
+
+*octave-4.0.0 (07 Jul 2015)
+
+ 07 Jul 2015; Mark Wright <[email protected]>
+ +files/octave-4.0.0-imagemagick-configure.patch,
+ +files/octave-4.0.0-imagemagick.patch, +files/octave-4.0.0-llvm-3.5.patch,
+ +octave-4.0.0.ebuild, metadata.xml, octave-3.6.4-r1.ebuild,
+ octave-3.6.4.ebuild, octave-3.8.1-r1.ebuild, octave-3.8.1.ebuild,
+ octave-3.8.2.ebuild:
+ Bump octave to 4.0.0, fixes Bug 550858 - sci-mathematics/octave-4.0 version
+ bump, thanks to Bohdan Trach for reporting. octave 4.0.0 allows llvm 3.5,
+ fixing Bug 531672 - sci-mathematics/octave-3.8.2 USE=jit depends on <sys-
+ devel/llvm-3.5, thanks to Juergen Rose for reporting and eroen for an
upstream
+ bug reference. Fix Bug 539886 - sci-mathematics/octave-3.8.2 should depend on
+ x11-libs/fltk[opengl,xft], thanks to Andreas Fink for reporting and the fix.
05 Jul 2015; Michał Górny <[email protected]> octave-3.8.1-r1.ebuild,
octave-3.8.2.ebuild:
1.1 sci-mathematics/octave/octave-4.0.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild?rev=1.1&content-type=text/plain
Index: octave-4.0.0.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild,v
1.1 2015/07/07 13:25:35 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.xz"
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/blas
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[cxx]
media-gfx/imagemagick[cxx] ) )
java? ( >=virtual/jre-1.6.0:* )
jit? ( >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
opengl? (
media-libs/freetype:2=
media-libs/fontconfig:1.0=
>=x11-libs/fltk-1.3:1=[opengl,xft]
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}-4.0.0-imagemagick-configure.patch
"${FILESDIR}"/${PN}-4.0.0-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.5" && \
epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.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)"
--without-64
$(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
}
