summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-07-09 15:44:10 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-07-09 15:44:10 +0000
commit07526220c4dff5897dfe7eab315785b82725f4f3 (patch)
treebfb9be35732e3dc9d4ff50567ebc6970d76affd5 /sci-mathematics
parentstable amd64, bug 327345 (diff)
downloadgentoo-2-07526220c4dff5897dfe7eab315785b82725f4f3.tar.gz
gentoo-2-07526220c4dff5897dfe7eab315785b82725f4f3.tar.bz2
gentoo-2-07526220c4dff5897dfe7eab315785b82725f4f3.zip
Remove old
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/octave/ChangeLog7
-rw-r--r--sci-mathematics/octave/files/octave-2.1.73-f2c-fix.patch11
-rw-r--r--sci-mathematics/octave/files/octave-2.1.73-gcc4.1-gentoo.patch24
-rw-r--r--sci-mathematics/octave/files/octave-example-fix.patch9
-rw-r--r--sci-mathematics/octave/octave-2.1.73-r1.ebuild146
5 files changed, 6 insertions, 191 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 969f580b921c..1c128172ee0e 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-mathematics/octave
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.94 2010/07/09 10:19:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.95 2010/07/09 15:44:10 xarthisius Exp $
+
+ 09 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ -octave-2.1.73-r1.ebuild, -files/octave-2.1.73-f2c-fix.patch,
+ -files/octave-2.1.73-gcc4.1-gentoo.patch, -files/octave-example-fix.patch:
+ Remove old
09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
octave-3.2.4-r1.ebuild:
diff --git a/sci-mathematics/octave/files/octave-2.1.73-f2c-fix.patch b/sci-mathematics/octave/files/octave-2.1.73-f2c-fix.patch
deleted file mode 100644
index b64ebd1a78f5..000000000000
--- a/sci-mathematics/octave/files/octave-2.1.73-f2c-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- octave-2.1.73/configure.in 2006-03-20 16:10:52.000000000 -0500
-+++ octave-2.1.73-new/configure.in 2006-10-31 21:12:46.000000000 -0500
-@@ -564,7 +564,7 @@
- CONFLIB_ARG="-L. -lconflib"
- fi
- rm -f conftest*
-- AC_CHECK_LIB(f2c, f_open, FLIBS=-lf2c, FLIBS=, $CONFLIB_ARG)
-+ AC_CHECK_LIB(f2c, f_open, FLIBS="/usr/lib/libf2c.a", FLIBS=, $CONFLIB_ARG -static)
- rm -f $oct_conflib
-
- if test -z "$FLIBS"; then
diff --git a/sci-mathematics/octave/files/octave-2.1.73-gcc4.1-gentoo.patch b/sci-mathematics/octave/files/octave-2.1.73-gcc4.1-gentoo.patch
deleted file mode 100644
index 6848c204dc14..000000000000
--- a/sci-mathematics/octave/files/octave-2.1.73-gcc4.1-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur octave-2.1.73/liboctave/ArrayN.h octave-2.1.73-new/liboctave/ArrayN.h
---- octave-2.1.73/liboctave/ArrayN.h 2005-05-02 07:16:12.000000000 -0400
-+++ octave-2.1.73-new/liboctave/ArrayN.h 2006-06-09 18:10:08.000000000 -0400
-@@ -63,7 +63,7 @@
- ArrayN (const dim_vector& dv) : Array<T> (dv) { }
-
- ArrayN (const dim_vector& dv, const T& val)
-- : Array<T> (dv) { fill (val); }
-+ : Array<T> (dv) { Array<T>::fill (val); }
-
- template <class U>
- explicit ArrayN (const Array2<U>& a) : Array<T> (a, a.dims ()) { }
-diff -Naur octave-2.1.73/liboctave/DiagArray2.h octave-2.1.73-new/liboctave/DiagArray2.h
---- octave-2.1.73/liboctave/DiagArray2.h 2005-05-02 07:16:16.000000000 -0400
-+++ octave-2.1.73-new/liboctave/DiagArray2.h 2006-06-09 18:10:08.000000000 -0400
-@@ -125,7 +125,7 @@
- {
- this->dimensions = dim_vector (r, c);
-
-- fill (val);
-+ Array<T>::fill (val);
- }
-
- DiagArray2 (const Array<T>& a) : Array<T> (a)
diff --git a/sci-mathematics/octave/files/octave-example-fix.patch b/sci-mathematics/octave/files/octave-example-fix.patch
deleted file mode 100644
index bfd664ce109d..000000000000
--- a/sci-mathematics/octave/files/octave-example-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur octave-2.1.73/test/octave.test/system/tilde_expand-1.m octave-2.1.73-new/test/octave.test/system/tilde_expand-1.m
---- octave-2.1.73/test/octave.test/system/tilde_expand-1.m 1997-02-25 23:29:27.000000000 -0500
-+++ octave-2.1.73-new/test/octave.test/system/tilde_expand-1.m 2006-11-03 10:09:37.000000000 -0500
-@@ -1,4 +1,3 @@
- x = getpwuid (getuid ());
--(strcmp (x.dir, tilde_expand ("~"))
-- && strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name)))
-+( strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name)))
- && strcmp ("foobar", tilde_expand ("foobar")))
diff --git a/sci-mathematics/octave/octave-2.1.73-r1.ebuild b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
deleted file mode 100644
index 79dcffdb64f8..000000000000
--- a/sci-mathematics/octave/octave-2.1.73-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.11 2010/06/23 09:32:45 jlec Exp $
-
-inherit flag-o-matic fortran autotools
-
-DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations"
-LICENSE="GPL-2"
-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"
-
-SLOT="0"
-IUSE="emacs static readline zlib doc hdf5 mpi blas"
-KEYWORDS="~alpha ~amd64 ~ppc ppc64 sparc ~x86"
-
-DEPEND="dev-util/dejagnu
- >=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 )
- doc? ( virtual/latex-base )
- blas? ( virtual/blas )
- mpi? ( virtual/mpi )
- !=app-text/texi2html-1.70"
-RDEPEND="${DEPEND}"
-
-# 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
-FORTRAN="gfortran g77 f2c"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-gcc4.1-gentoo.patch
- epatch "${FILESDIR}"/${PN}-example-fix.patch
- epatch "${FILESDIR}"/${P}-f2c-fix.patch
- eautoconf
-}
-
-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 && append-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"
- if has_version 'sys-cluster/mpich' ; then
- CXX="mpiCC"
- myconf="${myconf} --with-mpi=mpich"
- elif has_version 'sys-cluster/mpich2' ; then
- if built_with_use sys-cluster/mpich2 cxx ; then
- elog "mpich2 must be built without C++ support!"
- die "please rebuild mpich2 with USE=-cxx..."
- fi
- F77="mpif77"
- myconf="${myconf} --with-mpi=mpich"
- else
- myconf="${myconf} --with-mpi=mpi"
- fi
- else
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- myconf="${myconf} --without-mpi"
- fi
-
- CC="${CC}" CXX="${CXX}" F77="${F77}" \
- econf \
- $(use_with hdf5) \
- $(use_enable readline) \
- ${myconf} \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- # needed to avoid possible sandbox violations by latex
- export VARTEXFONTS="${T}/fonts"
-
- make install DESTDIR="${D}" || die "make install failed"
- if use doc; then
- octave-install-doc || die "Octave doc install failed"
- fi
- if use emacs; then
- cd emacs
- exeinto /usr/bin
- doexe otags || die
- doman otags.1 || die
- for emacsdir in /usr/share/emacs/site-lisp /usr/lib/xemacs/site-lisp; do
- insinto ${emacsdir}
- doins *.el || die
- done
- cd ..
- fi
- dodir /etc/env.d || die
- echo "LDPATH=/usr/lib/octave-${PV}" > "${D}"/etc/env.d/99octave || die
-
- # 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 || die
- doins doc/interpreter/octave.dvi || die
- doins doc/liboctave/liboctave.dvi || die
- doins doc/refcard/refcard-a4.dvi || die
- doins doc/refcard/refcard-legal.dvi || die
- doins doc/refcard/refcard-letter.dvi || die
-}