diff options
Diffstat (limited to 'sci-mathematics/octave')
| -rw-r--r-- | sci-mathematics/octave/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-mathematics/octave/Manifest | 18 | ||||
| -rw-r--r-- | sci-mathematics/octave/files/digest-octave-2.1.71 | 1 | ||||
| -rw-r--r-- | sci-mathematics/octave/files/digest-octave-2.1.71-r1 | 1 | ||||
| -rw-r--r-- | sci-mathematics/octave/files/digest-octave-2.1.72 | 3 | ||||
| -rw-r--r-- | sci-mathematics/octave/octave-2.1.71.ebuild | 113 | ||||
| -rw-r--r-- | sci-mathematics/octave/octave-2.1.72.ebuild (renamed from sci-mathematics/octave/octave-2.1.71-r1.ebuild) | 26 |
7 files changed, 38 insertions, 133 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog index 816c9df64931..fd9f7916c691 100644 --- a/sci-mathematics/octave/ChangeLog +++ b/sci-mathematics/octave/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-mathematics/octave # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.24 2006/01/30 10:06:57 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.25 2006/01/31 03:47:04 markusle Exp $ + +*octave-2.1.72 (31 Jan 2006) + + 31 Jan 2006; Markus Dittrich <markusle@gentoo.org> -octave-2.1.71.ebuild, + -octave-2.1.71-r1.ebuild, +octave-2.1.72.ebuild: + Bump to latest revision. Removed obsolete versions. + This fixes bug #120976. 30 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> Manifest: Manifest fix. diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index fdefb4f0b841..38e7532f938c 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -7,15 +7,12 @@ SHA256 e69e84efdec60419fb9510efac6e9e7465540403f27cb9c9d5627952a093ead1 files/di MD5 67d13a7bca35d1d0210394b7735fd073 files/digest-octave-2.1.69 67 RMD160 cdc307a2bbed2ed2e053d3977c3c0b0ddd80f1a1 files/digest-octave-2.1.69 67 SHA256 0df9f3da4b6f62ee9e606451cec5802abdbc91d2a7ebcea09bce7f5bc3f6ca60 files/digest-octave-2.1.69 67 -MD5 6582a298022b4c4301eca44791cb6da2 files/digest-octave-2.1.71 67 -RMD160 1dac7a8f6f48e394648c4002f769776f11a5ab1a files/digest-octave-2.1.71 67 -SHA256 56933d0bafd46aaea2f08da908ad1984f76251c1313bff1f2b74ca821d2c9732 files/digest-octave-2.1.71 67 -MD5 6582a298022b4c4301eca44791cb6da2 files/digest-octave-2.1.71-r1 67 -RMD160 1dac7a8f6f48e394648c4002f769776f11a5ab1a files/digest-octave-2.1.71-r1 67 -SHA256 56933d0bafd46aaea2f08da908ad1984f76251c1313bff1f2b74ca821d2c9732 files/digest-octave-2.1.71-r1 67 MD5 6582a298022b4c4301eca44791cb6da2 files/digest-octave-2.1.71-r2 67 RMD160 1dac7a8f6f48e394648c4002f769776f11a5ab1a files/digest-octave-2.1.71-r2 67 SHA256 56933d0bafd46aaea2f08da908ad1984f76251c1313bff1f2b74ca821d2c9732 files/digest-octave-2.1.71-r2 67 +MD5 daab39a464305b9fd4d9778e805141c6 files/digest-octave-2.1.72 247 +RMD160 ef960677ee9c6c79fc74ffefd9129f1774b0e3a3 files/digest-octave-2.1.72 247 +SHA256 1425b913fbce0977e177954ec78e232e9ec995eed733768a1d3696576e51083c files/digest-octave-2.1.72 247 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156 @@ -25,12 +22,9 @@ SHA256 8a159d4a0432901e0967723acaa71e7798caf7fd57970f46eb68a3ab10a67039 octave-2 MD5 ac40b9f81059c8a7e9a563490ab617e8 octave-2.1.69.ebuild 3638 RMD160 369ccc60ef0559c0378ca9b97d6f039c40ea2801 octave-2.1.69.ebuild 3638 SHA256 964f362da0b5789129b19d148bee97d0a35259bae7575b715a6bf60a75f18a50 octave-2.1.69.ebuild 3638 -MD5 650b9c16600e7e97b90ae197cd4632e8 octave-2.1.71-r1.ebuild 3431 -RMD160 f67c36e1326c3a3a6a2fa2696221e149ccfcb06f octave-2.1.71-r1.ebuild 3431 -SHA256 e7f8f0f2b52de9f72a40a5b96570190c2b0b96e2dba4cffcc421a2c330be4f00 octave-2.1.71-r1.ebuild 3431 MD5 8f6f761449c011cbabbc42c942d72e9a octave-2.1.71-r2.ebuild 3780 RMD160 ccf870317428f79c095d0a7100524a45cbb2e477 octave-2.1.71-r2.ebuild 3780 SHA256 8e31e81299c14db4c74a962564eb18a63ae4a38f380cfa1bbfe3f1977dc94fe5 octave-2.1.71-r2.ebuild 3780 -MD5 71bd2a0f999ed981dd71c8bc2f6cd1f6 octave-2.1.71.ebuild 3554 -RMD160 d4ae7d0823d4d227b9301e246d5969729e82be4e octave-2.1.71.ebuild 3554 -SHA256 4482097ddddbcb36b4ea9ad7da3ba75f052048a35a9d468cd930b0e40c75aeef octave-2.1.71.ebuild 3554 +MD5 8f6f761449c011cbabbc42c942d72e9a octave-2.1.72.ebuild 3780 +RMD160 ccf870317428f79c095d0a7100524a45cbb2e477 octave-2.1.72.ebuild 3780 +SHA256 8e31e81299c14db4c74a962564eb18a63ae4a38f380cfa1bbfe3f1977dc94fe5 octave-2.1.72.ebuild 3780 diff --git a/sci-mathematics/octave/files/digest-octave-2.1.71 b/sci-mathematics/octave/files/digest-octave-2.1.71 deleted file mode 100644 index c5707c297b65..000000000000 --- a/sci-mathematics/octave/files/digest-octave-2.1.71 +++ /dev/null @@ -1 +0,0 @@ -MD5 2ab06912017c833549035111f0ab592f octave-2.1.71.tar.bz2 5784751 diff --git a/sci-mathematics/octave/files/digest-octave-2.1.71-r1 b/sci-mathematics/octave/files/digest-octave-2.1.71-r1 deleted file mode 100644 index c5707c297b65..000000000000 --- a/sci-mathematics/octave/files/digest-octave-2.1.71-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 2ab06912017c833549035111f0ab592f octave-2.1.71.tar.bz2 5784751 diff --git a/sci-mathematics/octave/files/digest-octave-2.1.72 b/sci-mathematics/octave/files/digest-octave-2.1.72 new file mode 100644 index 000000000000..f8f726cce87c --- /dev/null +++ b/sci-mathematics/octave/files/digest-octave-2.1.72 @@ -0,0 +1,3 @@ +MD5 47012ee5efee3a36d04fea3341748862 octave-2.1.72.tar.bz2 5808544 +RMD160 b9a1056a98a524591b0f497f3c11ccc436a18eec octave-2.1.72.tar.bz2 5808544 +SHA256 d8b2dec9eb979c35be435896105c1c31dd61aa2c0f27be8b8b2645fa5d60bb90 octave-2.1.72.tar.bz2 5808544 diff --git a/sci-mathematics/octave/octave-2.1.71.ebuild b/sci-mathematics/octave/octave-2.1.71.ebuild deleted file mode 100644 index 2c8cc94eae14..000000000000 --- a/sci-mathematics/octave/octave-2.1.71.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71.ebuild,v 1.3 2006/01/29 19:40:02 cryos Exp $ - -inherit flag-o-matic - -DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations" -HOMEPAGE="http://www.octave.org/" -SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2 - ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -IUSE="emacs static readline zlib tetex hdf5 mpi ifc blas" - -DEPEND="virtual/libc - >=sys-libs/ncurses-5.2-r3 - >=sci-visualization/gnuplot-3.7.1-r3 - >=sci-libs/fftw-2.1.3 - >=dev-util/gperf-2.7.2 - zlib? ( sys-libs/zlib ) - hdf5? ( sci-libs/hdf5 ) - tetex? ( virtual/tetex ) - x86? ( ifc? ( dev-lang/ifc ) ) - blas? ( virtual/blas ) - !=app-text/texi2html-1.70" - -# NOTE: octave supports blas/lapack from intel but this is not open -# source nor is it free (as in beer OR speech) Check out... -# http://developer.intel.com/software/products/mkl/mkl52/index.htm for -# more information - -pkg_setup() { - use ifc || if [ -z `which g77` ] && [ -z `which gfortran` ]; then - #if ifc is defined then the dep was already checked - eerror "No fortran compiler found on the system!" - eerror "Please add fortran to your USE flags and reemerge gcc!" - die - fi -} - -src_compile() { - filter-flags -ffast-math - - local myconf="--localstatedir=/var/state/octave --enable-rpath" - myconf="${myconf} --enable-lite-kernel" - use static || myconf="${myconf} --disable-static --enable-shared --enable-dl" - # Only add -lz to LDFLAGS if we have zlib in USE ! - # BUG #52604 - # Danny van Dyk 2004/08/26 - use zlib && LDFLAGS="${LDFLAGS} -lz" - - econf \ - $(use_with hdf5) \ - $(use_with mpi) \ - $(use_enable readline) \ - ${myconf} \ - LDFLAGS="${LDFLAGS}" || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make install DESTDIR=${D} || die "make install failed" - use tetex && octave-install-doc - if use emacs; then - cd emacs - exeinto /usr/bin - doexe otags - doman otags.1 - for emacsdir in /usr/share/emacs/site-lisp /usr/lib/xemacs/site-lisp; do - insinto ${emacsdir} - doins *.el - done - cd .. - fi - dodir /etc/env.d - echo "LDPATH=/usr/lib/octave-${PV}" > ${D}/etc/env.d/99octave - - # Fixes ls-R files to remove /var/tmp/portage references. - sed -i -e "s:${D}::g" ${D}/usr/libexec/${PN}/ls-R || die - sed -i -e "s:${D}::g" ${D}/usr/share/${PN}/ls-R || die -} - -pkg_postinst() { - echo - einfo "Some users have reported failures at running simple tests if" - einfo "octave was built with agressive optimisations. You can check if" - einfo "your setup is affected by this bug by running the following test" - einfo "(inside the octave interpreter):" - einfo - einfo "octave:1> y = [1 3 4 2 1 5 3 5 6 7 4 5 7 10 11 3];" - einfo "octave:2> g = [1 1 1 1 1 1 1 1 2 2 2 2 2 3 3 3];" - einfo "octave:3> anova(y, g)" - einfo - einfo "If these commands complete successfully with no error message," - einfo "your installation should be ok. Otherwise, try recompiling" - einfo "octave using less agressive \"CFLAGS\" (combining \"-O3\" and" - einfo "\"-march=pentium4\" is known to cause problems)." - echo -} - -octave-install-doc() { - echo "Installing documentation..." - insinto /usr/share/doc/${PF} - doins doc/faq/Octave-FAQ.dvi - doins doc/interpreter/octave.dvi - doins doc/liboctave/liboctave.dvi - doins doc/refcard/refcard-a4.dvi - doins doc/refcard/refcard-legal.dvi - doins doc/refcard/refcard-letter.dvi -} diff --git a/sci-mathematics/octave/octave-2.1.71-r1.ebuild b/sci-mathematics/octave/octave-2.1.72.ebuild index 76e5d5cd6815..39a30bcb0dfb 100644 --- a/sci-mathematics/octave/octave-2.1.71-r1.ebuild +++ b/sci-mathematics/octave/octave-2.1.72.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71-r1.ebuild,v 1.2 2006/01/29 19:41:01 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.72.ebuild,v 1.1 2006/01/31 03:47:04 markusle Exp $ inherit flag-o-matic fortran @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2 ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/${P}.tar.bz2" SLOT="0" -IUSE="emacs static readline zlib tetex hdf5 mpi ifc blas" +IUSE="emacs static readline zlib tetex hdf5 mpi blas" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" DEPEND="virtual/libc @@ -22,8 +22,8 @@ DEPEND="virtual/libc zlib? ( sys-libs/zlib ) hdf5? ( sci-libs/hdf5 ) tetex? ( virtual/tetex ) - x86? ( ifc? ( dev-lang/ifc ) ) blas? ( virtual/blas ) + mpi? ( virtual/mpi ) !=app-text/texi2html-1.70" # NOTE: octave supports blas/lapack from intel but this is not open @@ -42,12 +42,28 @@ src_compile() { # Danny van Dyk 2004/08/26 use zlib && LDFLAGS="${LDFLAGS} -lz" + # MPI requires the use of gcc/g++ wrappers + # mpicc/mpic++ + # octave links agains -lmpi by default + # mpich needs -lmpich instead + if use mpi; then + CC="mpicc" && CXX="mpiCC" + if has_version 'sys-cluster/mpich'; then + myconf="${myconf} --with-mpi=mpich" + else + myconf="${myconf} --with-mpi=mpi" + fi + else + myconf="${myconf} --without-mpi" + fi + + econf \ $(use_with hdf5) \ - $(use_with mpi) \ $(use_enable readline) \ ${myconf} \ - LDFLAGS="${LDFLAGS}" || die "econf failed" + LDFLAGS="${LDFLAGS}" \ + CC="${CC}" CXX="${CXX}" || die "econf failed" emake || die "emake failed" } |