summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2012-01-03 02:24:04 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2012-01-03 02:24:04 +0000
commit5f1e9dbe37dbd3168a3cfcec7c3104a3dcf87a27 (patch)
tree8712380ab4fc7fb4b0a4489c4ebb219933ecf163 /sci-mathematics
parentVersion bump. (diff)
downloadgentoo-2-5f1e9dbe37dbd3168a3cfcec7c3104a3dcf87a27.tar.gz
gentoo-2-5f1e9dbe37dbd3168a3cfcec7c3104a3dcf87a27.tar.bz2
gentoo-2-5f1e9dbe37dbd3168a3cfcec7c3104a3dcf87a27.zip
Added glpk, qhull, qrupdate use flags to allow minimal no graphics build and take care of some automagic. Removed fltk flag, the native graphics need opengl anyway. Gnuplot is not a dependencency anymore (more a suggested one).
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/octave/ChangeLog15
-rw-r--r--sci-mathematics/octave/metadata.xml12
-rw-r--r--sci-mathematics/octave/octave-3.2.4-r3.ebuild120
-rw-r--r--sci-mathematics/octave/octave-3.4.0-r2.ebuild87
-rw-r--r--sci-mathematics/octave/octave-3.4.3-r1.ebuild (renamed from sci-mathematics/octave/octave-3.4.3.ebuild)62
5 files changed, 55 insertions, 241 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 932f1aba8da1..69c6e5195f37 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sci-mathematics/octave
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.108 2011/11/25 17:39:01 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.109 2012/01/03 02:24:04 bicatali Exp $
+
+*octave-3.4.3-r1 (03 Jan 2012)
+
+ 03 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> -octave-3.2.4-r3.ebuild,
+ -octave-3.4.0-r2.ebuild, -octave-3.4.3.ebuild, +octave-3.4.3-r1.ebuild,
+ metadata.xml:
+ Added glpk, qhull, qrupdate use flags to allow minimal no graphics build and
+ take care of some automagic. Removed fltk flag, the native graphics need
+ opengl anyway. Gnuplot is not a dependencency anymore (more a suggested one).
*octave-3.4.3 (25 Nov 2011)
@@ -29,7 +38,7 @@
*octave-3.4.0-r1 (09 Jun 2011)
- 09 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> -octave-3.2.4-r2.ebuild,
+ 09 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> -octave-3.2.4-r2.ebuild,
-octave-3.4.0.ebuild, +octave-3.4.0-r1.ebuild,
+files/octave-3.4.0-fltk.patch, +files/octave-3.4.0-gcc46.patch,
+files/octave-3.4.0-help.patch, +files/octave-3.4.0-pkgbuilddir.patch:
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 50f569c18490..0cbda79205f7 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -2,7 +2,17 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<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='sparse'>Enable enhanced support for sparse matrix algebra</flag>
+ <flag name='glpk'>Add support for <pkg>sci-libs/glpk</pkg> for linear programming</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</flag>
</use>
</pkgmetadata>
diff --git a/sci-mathematics/octave/octave-3.2.4-r3.ebuild b/sci-mathematics/octave/octave-3.2.4-r3.ebuild
deleted file mode 100644
index 990f8e5a84f5..000000000000
--- a/sci-mathematics/octave/octave-3.2.4-r3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.4-r3.ebuild,v 1.6 2011/10/05 18:44:23 aballier Exp $
-
-EAPI="2"
-inherit flag-o-matic xemacs-elisp-common autotools
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-IUSE="curl doc emacs fltk fftw readline sparse test xemacs zlib"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="dev-libs/libpcre
- media-gfx/graphicsmagick[cxx]
- media-libs/ftgl
- media-libs/qhull
- sci-libs/qrupdate
- sci-mathematics/glpk
- sci-visualization/gnuplot
- sys-libs/ncurses
- virtual/lapack
- virtual/opengl
- x11-libs/libX11
- curl? ( net-misc/curl )
- fltk? ( x11-libs/fltk:1[opengl] )
- fftw? ( sci-libs/fftw:3.0 )
- sparse? ( sci-libs/arpack
- sci-libs/camd
- sci-libs/ccolamd
- sci-libs/cholmod
- sci-libs/colamd
- sci-libs/cxsparse
- sci-libs/umfpack )
- xemacs? ( app-editors/xemacs )
- zlib? ( sys-libs/zlib )
- !sci-mathematics/octave-forge"
-
-DEPEND="${RDEPEND}
- virtual/latex-base
- sys-apps/texinfo
- dev-texlive/texlive-genericrecommended
- dev-util/gperf
- dev-util/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch \
- "${FILESDIR}"/${PN}-3.2.0_as_needed.patch \
- "${FILESDIR}"/${PN}-3.2.4-imread.patch \
- "${FILESDIR}"/${PN}-3.2.4-ldflags.patch \
- "${FILESDIR}"/${PN}-3.2.4-fltk-magic.patch \
- "${FILESDIR}"/${PN}-3.2.4-dlmread-speedup.patch \
- "${FILESDIR}"/${PN}-3.2.4-addpath.patch \
- "${FILESDIR}"/${PN}-3.2.4-filter-empty-vector.patch \
- "${FILESDIR}"/${PN}-3.2.4-imshow.patch \
- "${FILESDIR}"/${PN}-3.2.4-interp2.patch \
- "${FILESDIR}"/${PN}-3.2.4-no-helvetica.patch \
- "${FILESDIR}"/${PN}-3.2.4-normal-marker-size.patch \
- "${FILESDIR}"/${P}-curl-headers.patch
- has_version ">=x11-libs/fltk-1.3_rc1" && \
- epatch "${FILESDIR}"/${PN}-3.2.4-fltk-1.3.patch
- eautoreconf
-}
-
-src_configure() {
- # hdf5 disabled because not really useful (bug #299876)
- econf \
- --localstatedir=/var/state/octave \
- --enable-shared \
- --without-hdf5 \
- --with-qrupdate \
- --with-blas="$(pkg-config --libs blas)" \
- --with-lapack="$(pkg-config --libs lapack)" \
- $(use_enable readline) \
- $(use_with curl) \
- $(use_with fftw) \
- $(use_with fltk) \
- $(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 zlib)
-}
-
-src_compile() {
- emake || die "emake failed"
- if use xemacs; then
- cd "${S}/emacs"
- xemacs-elisp-comp *.el
- fi
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "emake install failed"
-
- if use doc; then
- einfo "Installing documentation..."
- insinto /usr/share/doc/${PF}
- doins $(find doc -name \*.pdf)
- fi
-
- if use emacs || use xemacs; then
- cd emacs
- exeinto /usr/bin
- doexe octave-tags || die "Failed to install octave-tags"
- doman octave-tags.1 || die "Failed to install octave-tags.1"
- if use xemacs; then
- xemacs-elisp-install ${PN} *.el *.elc
- fi
- cd ..
- fi
- use test && dodoc test/fntests.log
- echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
- doenvd 99octave || die
-}
diff --git a/sci-mathematics/octave/octave-3.4.0-r2.ebuild b/sci-mathematics/octave/octave-3.4.0-r2.ebuild
deleted file mode 100644
index 33247dee0426..000000000000
--- a/sci-mathematics/octave/octave-3.4.0-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.0-r2.ebuild,v 1.3 2011/10/05 18:44:23 aballier Exp $
-
-EAPI=4
-inherit eutils base autotools
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-IUSE="curl doc fftw readline sparse test zlib"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="dev-libs/libpcre
- media-gfx/graphicsmagick[cxx]
- media-libs/ftgl
- media-libs/qhull
- sci-libs/qrupdate
- sci-mathematics/glpk
- sci-visualization/gnuplot
- sys-libs/ncurses
- virtual/lapack
- virtual/opengl
- x11-libs/libX11
- >=x11-libs/fltk-1.3:1[opengl]
- curl? ( net-misc/curl )
- fftw? ( sci-libs/fftw:3.0 )
- sparse? (
- sci-libs/camd
- sci-libs/ccolamd
- sci-libs/cholmod
- sci-libs/colamd
- sci-libs/cxsparse
- sci-libs/umfpack )
- zlib? ( sys-libs/zlib )
- !sci-mathematics/octave-forge"
-
-DEPEND="${RDEPEND}
- virtual/latex-base
- sys-apps/texinfo
- dev-texlive/texlive-genericrecommended
- dev-util/gperf
- dev-util/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-{gcc46,pkgbuilddir,fltk,help,fftshift}.patch \
- "${FILESDIR}"/${P}-curl-headers.patch
- eautoreconf
-}
-
-src_configure() {
- # hdf5 disabled because not really useful (bug #299876)
- econf \
- --localstatedir=/var/state/octave \
- --enable-shared \
- --without-hdf5 \
- --with-glpk \
- --with-opengl \
- --with-qrupdate \
- --with-blas="$(pkg-config --libs blas)" \
- --with-lapack="$(pkg-config --libs lapack)" \
- $(use_enable readline) \
- $(use_with curl) \
- $(use_with fftw fftw3) \
- $(use_with fftw fftw3f) \
- $(use_with sparse umfpack) \
- $(use_with sparse colamd) \
- $(use_with sparse ccolamd) \
- $(use_with sparse cholmod) \
- $(use_with sparse cxsparse) \
- $(use_with zlib z)
-}
-
-src_install() {
- default
- if use doc; then
- einfo "Installing documentation..."
- insinto /usr/share/doc/${PF}
- doins $(find doc -name \*.pdf)
- fi
- use test && dodoc test/fntests.log
- echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
- doenvd 99octave || die
-}
diff --git a/sci-mathematics/octave/octave-3.4.3.ebuild b/sci-mathematics/octave/octave-3.4.3-r1.ebuild
index 4510d5820534..b53bbc734df3 100644
--- a/sci-mathematics/octave/octave-3.4.3.ebuild
+++ b/sci-mathematics/octave/octave-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4.3.ebuild,v 1.1 2011/11/25 17:39:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.3-r1.ebuild,v 1.1 2012/01/03 02:24:04 bicatali Exp $
EAPI=4
inherit eutils base autotools
@@ -11,23 +11,25 @@ HOMEPAGE="http://www.octave.org/"
SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
SLOT="0"
-IUSE="curl doc fftw readline sparse test zlib"
+IUSE="curl doc fftw +glpk +imagemagick opengl +qhull +qrupdate readline +sparse X zlib"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="dev-libs/libpcre
- media-gfx/graphicsmagick[cxx]
- media-libs/ftgl
- media-libs/qhull
- sci-libs/qrupdate
- sci-mathematics/glpk
- sci-visualization/gnuplot
+ app-text/ghostscript-gpl
sys-libs/ncurses
virtual/lapack
- virtual/opengl
- x11-libs/libX11
- >=x11-libs/fltk-1.3:1[opengl]
curl? ( net-misc/curl )
fftw? ( sci-libs/fftw:3.0 )
+ glpk? ( sci-mathematics/glpk )
+ 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 )
sparse? (
sci-libs/camd
sci-libs/ccolamd
@@ -35,14 +37,14 @@ RDEPEND="dev-libs/libpcre
sci-libs/colamd
sci-libs/cxsparse
sci-libs/umfpack )
- zlib? ( sys-libs/zlib )
- !sci-mathematics/octave-forge"
+ X? ( x11-libs/libX11 )
+ zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
- virtual/latex-base
- sys-apps/texinfo
- dev-texlive/texlive-genericrecommended
- dev-util/gperf
+ doc? (
+ virtual/latex-base
+ dev-texlive/texlive-genericrecommended
+ sys-apps/texinfo )
dev-util/pkgconfig"
src_prepare() {
@@ -53,34 +55,34 @@ src_prepare() {
src_configure() {
# hdf5 disabled because not really useful (bug #299876)
econf \
- --localstatedir=/var/state/octave \
+ --localstatedir="${EPREFIX}/var/state/octave" \
--enable-shared \
--without-hdf5 \
- --with-glpk \
- --with-opengl \
- --with-qrupdate \
--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 imagemagick magick) \
+ $(use_with opengl) \
+ $(use_with qhull) \
+ $(use_with qrupdate) \
$(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)
}
src_install() {
default
- if use doc; then
- einfo "Installing documentation..."
- insinto /usr/share/doc/${PF}
- doins $(find doc -name \*.pdf)
- fi
- use test && dodoc test/fntests.log
- echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
- doenvd 99octave || die
+ 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
}