diff options
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/octave/ChangeLog | 11 | ||||
| -rw-r--r-- | sci-mathematics/octave/files/octave-3.4.0-fltk.patch | 24 | ||||
| -rw-r--r-- | sci-mathematics/octave/files/octave-3.4.0-gcc46.patch | 24 | ||||
| -rw-r--r-- | sci-mathematics/octave/files/octave-3.4.0-help.patch | 13 | ||||
| -rw-r--r-- | sci-mathematics/octave/files/octave-3.4.0-pkgbuilddir.patch | 41 | ||||
| -rw-r--r-- | sci-mathematics/octave/octave-3.2.4-r2.ebuild | 112 | ||||
| -rw-r--r-- | sci-mathematics/octave/octave-3.4.0-r1.ebuild (renamed from sci-mathematics/octave/octave-3.4.0.ebuild) | 15 |
7 files changed, 121 insertions, 119 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog index 715243636f56..41b59d19768d 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.102 2011/03/20 20:01:35 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.103 2011/06/09 21:58:24 bicatali Exp $ + +*octave-3.4.0-r1 (09 Jun 2011) + + 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: + Added some patches for compiling on gcc-4.6, fixing fltk, and building + packages directory from fedora. Added a parallel compilation patch. 20 Mar 2011; Justin Lecher <jlec@gentoo.org> octave-3.2.4-r1.ebuild, octave-3.2.4-r2.ebuild, octave-3.2.4-r3.ebuild, octave-3.4.0.ebuild: diff --git a/sci-mathematics/octave/files/octave-3.4.0-fltk.patch b/sci-mathematics/octave/files/octave-3.4.0-fltk.patch new file mode 100644 index 000000000000..eff3642542c6 --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.4.0-fltk.patch @@ -0,0 +1,24 @@ +diff -up octave-3.4.0/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc.fltk octave-3.4.0/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc +--- octave-3.4.0/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc.fltk 2011-02-08 03:00:52.000000000 -0700 ++++ octave-3.4.0/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc 2011-05-26 14:09:51.277484258 -0600 +@@ -27,7 +27,7 @@ along with Octave; see the file COPYING. + #if defined (HAVE_FLTK) + + #include <FL/Fl.H> +-#include <Fl/Fl_File_Chooser.H> ++#include <FL/Fl_File_Chooser.H> + + // FLTK headers may include X11/X.h which defines Complex, and that + // conflicts with Octave's Complex typedef. We don't need the X11 +diff -up octave-3.4.0/src/DLD-FUNCTIONS/__init_fltk__.cc.fltk octave-3.4.0/src/DLD-FUNCTIONS/__init_fltk__.cc +--- octave-3.4.0/src/DLD-FUNCTIONS/__init_fltk__.cc.fltk 2011-05-26 14:10:40.447667595 -0600 ++++ octave-3.4.0/src/DLD-FUNCTIONS/__init_fltk__.cc 2011-05-26 14:10:14.456627808 -0600 +@@ -44,7 +44,7 @@ To initialize: + #include <FL/Fl_Box.H> + #include <FL/Fl_Button.H> + #include <FL/Fl_Choice.H> +-#include <Fl/Fl_File_Chooser.H> ++#include <FL/Fl_File_Chooser.H> + #include <FL/Fl_Gl_Window.H> + #include <FL/Fl_Menu_Bar.H> + #include <FL/Fl_Menu_Button.H> diff --git a/sci-mathematics/octave/files/octave-3.4.0-gcc46.patch b/sci-mathematics/octave/files/octave-3.4.0-gcc46.patch new file mode 100644 index 000000000000..c174204acedb --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.4.0-gcc46.patch @@ -0,0 +1,24 @@ +diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h +--- octave-3.4.0/liboctave/oct-alloc.h.gcc46 2011-02-08 03:00:51.000000000 -0700 ++++ octave-3.4.0/liboctave/oct-alloc.h 2011-02-08 09:41:23.984081687 -0700 +@@ -23,6 +23,8 @@ along with Octave; see the file COPYING. + #if !defined (octave_oct_alloc_h) + #define octave_oct_alloc_h 1 + ++#include <cstddef> ++ + class + OCTAVE_API + octave_allocator +diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc +--- octave-3.4.0/src/pr-output.cc.gcc46 2011-02-08 03:00:52.000000000 -0700 ++++ octave-3.4.0/src/pr-output.cc 2011-02-08 09:55:16.149662744 -0700 +@@ -3024,7 +3024,7 @@ abs (T x) + } + + #define INSTANTIATE_ABS(T) \ +- template /* static */ inline T abs (T) ++ template /* static */ T abs (T) + + INSTANTIATE_ABS(signed char); + INSTANTIATE_ABS(short); diff --git a/sci-mathematics/octave/files/octave-3.4.0-help.patch b/sci-mathematics/octave/files/octave-3.4.0-help.patch new file mode 100644 index 000000000000..de98300b6c40 --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.4.0-help.patch @@ -0,0 +1,13 @@ +Help parallel compilation +patch by Sebastien Fabbro +--- octave-3.4.0/scripts/Makefile.am.orig 2011-06-09 22:27:22.688268651 +0100 ++++ octave-3.4.0/scripts/Makefile.am 2011-02-08 10:00:51.000000000 +0000 +@@ -316,7 +316,7 @@ + + gethelp_SOURCES = gethelp.cc + +-.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile ++.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp + @$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT) + if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \ + cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \ diff --git a/sci-mathematics/octave/files/octave-3.4.0-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-3.4.0-pkgbuilddir.patch new file mode 100644 index 000000000000..c6811dce284b --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.4.0-pkgbuilddir.patch @@ -0,0 +1,41 @@ +--- octave-3.4.0/scripts/pkg/pkg.m.pkgbuilddir 2011-02-08 03:00:51.000000000 -0700 ++++ octave-3.4.0/scripts/pkg/pkg.m 2011-03-18 09:31:24.670165643 -0600 +@@ -644,7 +644,14 @@ + for i = 1:length (files) + tgz = files{i}; + +- if (exist (tgz, "file")) ++ ## The filename pointed to an uncompressed package to begin with. ++ if (exist (tgz, "dir")) ++ if (tgz(1) == '/') ++ packdir = tgz; ++ else ++ packdir = fullfile (pwd(), tgz); ++ endif ++ elseif (exist (tgz, "file")) + ## Create a temporary directory. + tmpdir = tmpnam (); + tmpdirs{end+1} = tmpdir; +@@ -671,20 +678,12 @@ + if (length (dirlist) > 3) + error ("bundles of packages are not allowed"); + endif +- endif + +- ## The filename pointed to an uncompressed package to begin with. +- if (exist (tgz, "dir")) +- dirlist = {".", "..", tgz}; ++ ## The two first entries of dirlist are "." and "..". ++ packdir = fullfile (tmpdir, dirlist{3}); + endif + + if (exist (tgz, "file") || exist (tgz, "dir")) +- ## The two first entries of dirlist are "." and "..". +- if (exist (tgz, "file")) +- packdir = fullfile (tmpdir, dirlist{3}); +- else +- packdir = fullfile (pwd(), dirlist{3}); +- endif + packdirs{end+1} = packdir; + + ## Make sure the package contains necessary files. diff --git a/sci-mathematics/octave/octave-3.2.4-r2.ebuild b/sci-mathematics/octave/octave-3.2.4-r2.ebuild deleted file mode 100644 index ae37eda57f14..000000000000 --- a/sci-mathematics/octave/octave-3.2.4-r2.ebuild +++ /dev/null @@ -1,112 +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-r2.ebuild,v 1.2 2011/03/20 20:01:35 jlec 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 opengl readline sparse test xemacs zlib" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND="dev-libs/libpcre - media-gfx/graphicsmagick[cxx] - media-libs/qhull - sci-libs/qrupdate - sci-mathematics/glpk - sci-visualization/gnuplot - sys-libs/ncurses - virtual/lapack - x11-libs/libX11 - curl? ( net-misc/curl ) - fltk? ( x11-libs/fltk:1[opengl?] ) - fftw? ( sci-libs/fftw:3.0 ) - opengl? ( virtual/opengl media-libs/ftgl ) - 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 - app-text/ptex ) - dev-util/gperf - dev-util/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch - epatch "${FILESDIR}"/${PN}-3.2.0_as_needed.patch - epatch "${FILESDIR}"/${PN}-3.2.4-imread.patch - epatch "${FILESDIR}"/${PN}-3.2.4-ldflags.patch - epatch "${FILESDIR}"/${PN}-3.2.4-fltk-magic.patch - epatch "${FILESDIR}"/${PN}-3.2.4-dlmread-speedup.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 opengl framework-opengl) \ - $(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.ebuild b/sci-mathematics/octave/octave-3.4.0-r1.ebuild index 6914bf1fc734..c82baae44155 100644 --- a/sci-mathematics/octave/octave-3.4.0.ebuild +++ b/sci-mathematics/octave/octave-3.4.0-r1.ebuild @@ -1,9 +1,9 @@ # 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.ebuild,v 1.3 2011/03/20 20:01:35 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.0-r1.ebuild,v 1.1 2011/06/09 21:58:24 bicatali Exp $ -EAPI="2" -inherit multilib +EAPI=4 +inherit eutils base DESCRIPTION="High-level interactive language for numerical computations" LICENSE="GPL-3" @@ -46,6 +46,11 @@ DEPEND="${RDEPEND} dev-util/gperf dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-{gcc46,pkgbuilddir,fltk,help}.patch + eautoreconf +} + src_configure() { # hdf5 disabled because not really useful (bug #299876) econf \ @@ -70,14 +75,12 @@ src_configure() { } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" - + 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 |