Added glpk, qhull, qrupdate use flags to allow minimal no graphics build and take...
authorSebastien Fabbro <bicatali@gentoo.org>
Tue, 3 Jan 2012 02:24:04 +0000 (02:24 +0000)
committerSebastien Fabbro <bicatali@gentoo.org>
Tue, 3 Jan 2012 02:24:04 +0000 (02:24 +0000)
Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

sci-mathematics/octave/ChangeLog
sci-mathematics/octave/Manifest
sci-mathematics/octave/metadata.xml
sci-mathematics/octave/octave-3.2.4-r3.ebuild [deleted file]
sci-mathematics/octave/octave-3.4.0-r2.ebuild [deleted file]
sci-mathematics/octave/octave-3.4.3-r1.ebuild [moved from sci-mathematics/octave/octave-3.4.3.ebuild with 56% similarity]

index 932f1aba8da1af100266783c5b1c342085fa8a32..69c6e5195f37a90f3076ed56e347ff6a7ff40429 100644 (file)
@@ -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:
index d00440426aa8b6250ee0d9374ea5e928a76ff381..084e9867d1fdc7b8a61af938e9553408efde5d8d 100644 (file)
@@ -22,18 +22,15 @@ AUX octave-3.4.0-gcc46.patch 849 RMD160 c0a17a61646b77aea98f29fb41db0bad9e525c9b
 AUX octave-3.4.0-help.patch 605 RMD160 fa6a63ebb50a452386dc0c10f6b54afe806bd2cc SHA1 f9b12485ac538ac1c145eba4c9228a4c70425b5b SHA256 27107c33b25059da295bcf8061c3321dce17234a61b89b5dd71a5569936b46ae
 AUX octave-3.4.0-pkgbuilddir.patch 1429 RMD160 00765a8faf96f19e3a725da030986867995f6e8e SHA1 ce76db87fb480a3492ed89a906774b49273297e7 SHA256 b6a73e80041ae0847c0eb89e8cdc9f2135622567d18378c429f9ed3e498aed65
 DIST octave-3.2.4.tar.bz2 12080959 RMD160 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43 SHA1 7de078564027108f3436f3ba7bf5993a6b411a67 SHA256 48471d05c7ed9c0a5a4d5fa4ae8a857447ac3da1197f86cfe79b9d8f4fdfd147
-DIST octave-3.4.0.tar.bz2 14619487 RMD160 8448fc8277e19dab8dbc5c0121e673e9198c74ec SHA1 936a8fc962abd96e7568fb5909ec2a4d7997a1a8 SHA256 0fb4f78f43320eec82477c1bbde42877e0e490a9f4903966b1682a9600ffcc2b
 DIST octave-3.4.3.tar.bz2 15085117 RMD160 d6f43fca9097b40f163c140db853d8ac1383ab39 SHA1 fe622c28a38f8730c59e46211bc7b18e7f51a679 SHA256 94d119cc93a38465e9c00dd36b9cc063abbda7ae8cb39407cf88a2bddc9dc148
 EBUILD octave-3.2.4-r1.ebuild 2916 RMD160 45f8a2be227c116671e4b09184d7322392b9b71e SHA1 ca2f91e277d2fd6d8e05e0cdd24b7240b4822151 SHA256 84372c2a81e53ce66a74402becbf1a82dd6128a35473745f6a2504c45c164528
-EBUILD octave-3.2.4-r3.ebuild 3300 RMD160 561eaf4923654b507c44263b9c13983a4d68a31a SHA1 544e0d5e2c86889c15a92be498f77da7fc132206 SHA256 561084be6d67c48884c94c488dd7168f20abe5c5c1299eab783e735c3b396777
-EBUILD octave-3.4.0-r2.ebuild 2192 RMD160 8fb99f465c2bc4abdea565d1a9be26a3e9721a39 SHA1 8724186c8f24c11122f4869757af2fa0d13dc2d2 SHA256 0068c34c30fe9b37717f28a5bcfe33e9938ca71b23a8bf0eb90f99115a52589a
-EBUILD octave-3.4.3.ebuild 2134 RMD160 c380de294643f05fa44e1aa9f277f6bf842c0334 SHA1 c021de4877e9bf8086d6be06241707a44dca59f5 SHA256 11dfaa9915858111c14fe44d94002be0c5ae161328875ec0f22bcf55fbc96cc3
-MISC ChangeLog 26876 RMD160 b1ceb7e1afd051614eeb91c7ab91b4507fb46646 SHA1 526c518dc6825ada71c03d38d7759e045370f6fd SHA256 8a7a349938e26278cc8a7a0f0cc510690837b292c87ccf5804235584fedd2fda
-MISC metadata.xml 260 RMD160 27a4292b758e1199d0092b731cba79033f1b4167 SHA1 9997a99a4d6115f3b901208ba711d735ce9be36e SHA256 5fda55fd44bfec5755e1c3ac828887c37f0eebed6b3b972454e123ac2472d3ff
+EBUILD octave-3.4.3-r1.ebuild 2333 RMD160 8002ff0acbec64ffe441b6cb29efffaf2d757e2f SHA1 03cdca585f203762285dcf6cbc5ce41a505be71d SHA256 d9664f78a72b612e0201ef2510c7eb1f55f2bb9b4f2d8a6f993c7f1675292182
+MISC ChangeLog 27314 RMD160 0e316cf74f4c9cbafa7d512c3ebb0d409a36f776 SHA1 f89ef2ae8c872b803424c57ca5e33485b9b5bc36 SHA256 32a53c177d65e9ae0215d4a7a2952160c5bda83ad616a7d28e11b459073338f3
+MISC metadata.xml 928 RMD160 28d79a8597076528a69c31aae3b7d208a3296e6e SHA1 bd294c06bdf3bb9753f0028d596008fb1b1126df SHA256 6314fe7f4dfc713b292c7ff071c186873989e3d8b08d0637e20f7c52bb4dc4ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7P0sAACgkQ1ycZbhPLE2CrxQCgkAEdl8Asvc85aPoypkvmOOyn
-Ah4An0nQxyWpYs8Jd66G9f870Z9z5iCQ
-=4gKp
+iEYEARECAAYFAk8CZs0ACgkQ1ycZbhPLE2BkJACfQhaCvWPaoVtW7uFKujf58A4l
+4NIAoLKpo9cG2m5Z7GviK8ENK8o/UMT0
+=PRU3
 -----END PGP SIGNATURE-----
index 50f569c18490f77ea6f6f0961a15bddcb9b524bb..0cbda79205f7d244bd21455dac4b48004b84eb98 100644 (file)
@@ -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 (file)
index 990f8e5..0000000
+++ /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 (file)
index 33247de..0000000
+++ /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
-}
similarity index 56%
rename from sci-mathematics/octave/octave-3.4.3.ebuild
rename to sci-mathematics/octave/octave-3.4.3-r1.ebuild
index 4510d5820534dcb8e9e74991bec53cfbebff9185..b53bbc734df302c7522be68963c9f23bab7ebe39 100644 (file)
@@ -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
 }