* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2018-07-03 12:47 Mark Wright
0 siblings, 0 replies; 11+ messages in thread
From: Mark Wright @ 2018-07-03 12:47 UTC (permalink / raw
To: gentoo-commits
commit: 9bec43136e0fea48bb5e352b0ac9f14b78444690
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 3 12:46:41 2018 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jul 3 12:46:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bec4313
sci-mathematics/octave: Bump to 4.4.0, thanks Fabio Rossi
for providing a 4.4.0 ebuild and patches, thanks to Anton Kochkov for
reporting 655308.
Rename openssl USE flag to ssl, add support for USE libressl (not tested
with libressl), thanks to Alessandro Barbieri for reporting 620864.
Closes: https://bugs.gentoo.org/655308
Closes: https://bugs.gentoo.org/620864
Package-Manager: Portage-2.3.41, Repoman-2.3.9
sci-mathematics/octave/Manifest | 1 +
.../files/octave-4.4.0-imagemagick-configure.patch | 16 ++
.../octave/files/octave-4.4.0-imagemagick.patch | 16 ++
.../octave/files/octave-4.4.0-qt-5.11.patch | 10 ++
.../octave/files/octave-4.4.0-texi.patch | 11 ++
sci-mathematics/octave/octave-4.4.0.ebuild | 192 +++++++++++++++++++++
6 files changed, 246 insertions(+)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 5a47e212d7a..3280adb74dd 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1 +1,2 @@
DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
+DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch
new file mode 100644
index 00000000000..ce81b801d99
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac 2018-04-30 19:03:56.000000000 +0200
++++ a/configure.ac.new 2018-05-22 12:23:30.371174341 +0200
+@@ -1946,11 +1946,11 @@
+ MAGICK_LIBS=
+
+ PKG_CHECK_EXISTS([$magick++], [
+- dnl Make sure we only get -I, -L, and -l flags.
++ dnl Make sure we only get -I, -D, -L, and -l flags.
+ dnl Some Graphics/ImageMagick++ dnl packages add extra flags that are
+ dnl useful when building Graphics/ImageMagick++ extentions. These extra
+ dnl flags break the Octave build.
+- MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')"
++ MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'`
+ MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')"
+ MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')"
+
diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
new file mode 100644
index 00000000000..2f651e0995e
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
@@ -0,0 +1,16 @@
+--- a/libinterp/corefcn/__magick_read__.cc 2018-05-22 12:25:37.688173855 +0200
++++ a/libinterp/corefcn/__magick_read__.cc.new 2018-05-22 12:32:51.475172200 +0200
+@@ -817,10 +817,11 @@
+ // depth is 8, there's a good chance that we will be limited. It
+ // is also the GraphicsMagick recommended setting and the default
+ // for ImageMagick.
+- if (QuantumDepth < 16)
++ using namespace Magick;
++ if (MAGICKCORE_QUANTUM_DEPTH < 16)
+ warning_with_id ("Octave:GraphicsMagick-Quantum-Depth",
+ "your version of %s limits images to %d bits per pixel\n",
+- MagickPackageName, QuantumDepth);
++ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
+
+ initialized = true;
+ }
diff --git a/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch b/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch
new file mode 100644
index 00000000000..70ffbb47199
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch
@@ -0,0 +1,10 @@
+--- octave-4.4.0-orig/libgui/src/settings-dialog.cc 2018-05-01 03:03:56.000000000 +1000
++++ octave-4.4.0/libgui/src/settings-dialog.cc 2018-07-03 19:35:41.865149269 +1000
+@@ -41,6 +41,7 @@
+ #include <QHash>
+ #include <QMessageBox>
+ #include <QTextCodec>
++#include <QButtonGroup>
+
+ #if defined (HAVE_QSCINTILLA)
+ # include "octave-qscintilla.h"
diff --git a/sci-mathematics/octave/files/octave-4.4.0-texi.patch b/sci-mathematics/octave/files/octave-4.4.0-texi.patch
new file mode 100644
index 00000000000..90ffa5361bf
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.4.0-texi.patch
@@ -0,0 +1,11 @@
+--- a/doc/interpreter/module.mk 2018-04-30 19:03:56.000000000 +0200
++++ a/doc/interpreter/module.mk.new 2018-05-22 12:17:03.587175816 +0200
+@@ -368,6 +368,8 @@
+ $(AWK) -f $(srcdir)/%reldir%/mkcontrib.awk $(srcdir)/%reldir%/contributors.in > $@-t && \
+ mv $@-t $@
+
++%reldir%/preface.texi: %reldir%/contributors.texi
++
+ AUTHORS: %reldir%/preface.texi %reldir%/contributors.texi | %reldir%/$(octave_dirstamp)
+ $(AM_V_MAKEINFO)rm -f $@-t $@ && \
+ if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/%reldir%/contributors.texi ] && [ ! -f %reldir%/contributors.texi ]; then \
diff --git a/sci-mathematics/octave/octave-4.4.0.ebuild b/sci-mathematics/octave/octave-4.4.0.ebuild
new file mode 100644
index 00000000000..54e929a545b
--- /dev/null
+++ b/sci-mathematics/octave/octave-4.4.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/octave/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl
+ portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ app-arch/bzip2
+ app-text/ghostscript-gpl
+ dev-libs/libpcre:3=
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ virtual/blas
+ virtual/lapack
+ curl? ( net-misc/curl:0= )
+ fftw? ( sci-libs/fftw:3.0= )
+ glpk? ( sci-mathematics/glpk:0= )
+ gnuplot? ( sci-visualization/gnuplot )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ x11-libs/qscintilla:=
+ )
+ hdf5? ( sci-libs/hdf5:0= )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ )
+ java? ( >=virtual/jre-1.6.0:* )
+ opengl? (
+ media-libs/freetype:2=
+ media-libs/fontconfig:1.0=
+ virtual/glu
+ >=x11-libs/fltk-1.3:1=[opengl,xft]
+ x11-libs/gl2ps:0=
+ )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ portaudio? ( media-libs/portaudio )
+ postscript? (
+ app-text/epstool
+ media-gfx/pstoedit
+ media-gfx/transfig
+ )
+ qhull? ( media-libs/qhull:0= )
+ qrupdate? ( sci-libs/qrupdate:0= )
+ readline? ( sys-libs/readline:0= )
+ sndfile? ( media-libs/libsndfile )
+ sparse? (
+ sci-libs/arpack:0=
+ sci-libs/camd:0=
+ sci-libs/ccolamd:0=
+ sci-libs/cholmod:0=
+ sci-libs/colamd:0=
+ sci-libs/cxsparse:0=
+ sci-libs/umfpack:0=
+ )
+ X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+ dev-util/gperf
+ sys-apps/texinfo
+ virtual/pkgconfig
+ doc? (
+ dev-texlive/texlive-fontsrecommended
+ || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
+ dev-texlive/texlive-metapost
+ virtual/latex-base
+ )
+ gui? ( dev-qt/linguist-tools:5 )
+ java? ( >=virtual/jdk-1.6.0 )
+ qrupdate? ( app-misc/pax-utils )
+ sparse? ( app-misc/pax-utils )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.4.0-texi.patch
+ "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+ "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
+ "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch
+ "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch
+ "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+ "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
+ "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch
+)
+
+src_prepare() {
+ # nasty prefix hacks for fltk:1 linking
+ if use prefix; then
+ use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+ fi
+
+ # occasional fail on install, force regeneration (bug #401189)
+ rm doc/interpreter/contributors.texi || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # [QA] detect underlinking #593670
+ append-ldflags $(test-flags-CXX -Wl,-z,defs)
+
+ # unfortunate dependency on mpi from hdf5 (bug #302621)
+ use hdf5 && has_version sci-libs/hdf5[mpi] && \
+ export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+ econf \
+ --localstatedir="${EPREFIX}/var/state/octave" \
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+ --disable-64 \
+ --disable-jit \
+ --enable-shared \
+ --with-z \
+ --with-bz2 \
+ --without-OSMesa \
+ $(use_enable static-libs static) \
+ $(use_enable doc docs) \
+ $(use_enable java) \
+ $(use_enable readline) \
+ $(use_with curl) \
+ $(use_with fftw fftw3) \
+ $(use_with fftw fftw3f) \
+ $(use_enable fftw fftw-threads) \
+ $(use_with glpk) \
+ $(use_with hdf5) \
+ $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
+ $(use_with opengl) \
+ $(use_with opengl fltk) \
+ $(use_with ssl openssl) \
+ $(use_with portaudio) \
+ $(use_with qhull) \
+ $(use_with qrupdate) \
+ $(use_with gui qt 5) \
+ $(use_with sndfile) \
+ $(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 X x)
+}
+
+src_compile() {
+ default
+ if use java; then
+ pax-mark m "${S}/src/.libs/octave-cli"
+ fi
+}
+
+src_install() {
+ default
+ if use doc; then
+ dodoc $(find doc -name '*.pdf')
+ else
+ # bug 566134, macros.texi is installed by make install if use doc
+ insinto /usr/share/${PN}/${PV}/etc
+ doins doc/interpreter/macros.texi
+ fi
+ [[ -e test/fntests.log ]] && dodoc test/fntests.log
+ use java && \
+ java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
+ echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
+ doenvd 99octave
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2024-03-15 10:08 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2024-03-15 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 07de6b1ce6757e614a991d530359e02f14d3c190
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 10:02:37 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 10:07:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07de6b1c
sci-mathematics/octave: drop 7.3.0-r2, 8.1.0, 8.2.0, 8.3.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-mathematics/octave/Manifest | 3 -
.../files/octave-4.2.2-ncurses-pkgconfig.patch | 37 ----
.../octave/files/octave-6.4.0-slibtool.patch | 37 ----
.../files/octave-7.3.0-docs-texinfo-7.0.patch | 45 ----
sci-mathematics/octave/octave-7.3.0-r2.ebuild | 236 --------------------
sci-mathematics/octave/octave-8.1.0.ebuild | 233 --------------------
sci-mathematics/octave/octave-8.2.0.ebuild | 241 ---------------------
sci-mathematics/octave/octave-8.3.0.ebuild | 241 ---------------------
8 files changed, 1073 deletions(-)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 07e12a3bd229..033d2df417bb 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,4 +1 @@
-DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5 SHA512 1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
-DIST octave-8.1.0.tar.xz 26957620 BLAKE2B d1d90a242b1517dd0284af454b9de83238c5f515690c1ffd8bd5d8c43ff6c690ccab590a877e74631394295b97292d71b2dc1c62ea50f0c4ff3e9ac728f67dbf SHA512 7e43e1a272cb51e981d4f534bbed2c2915bb714be3f151f98862ed8ecec1ee3a90600dd22778077b6cdecee4c802a2e4d13a49c339cef683e1356941b9e1cd1d
-DIST octave-8.2.0.tar.xz 26970452 BLAKE2B c5bd03861681a7e194a0fb195433d085fc7d98eb3c6f65929ad53c93afef199062902293082e5aeab7c5e15e0045093efbebcc860052e6081708947483425f2f SHA512 9f56428e990c6aa71a5cfe7698602ba681535c36b140fa9248536c260afebd19f6125c92a0fd6d14fab5a794de49e03ccc98e89ac879108f635b3ffc4ec40514
DIST octave-8.3.0.tar.xz 26970776 BLAKE2B 8c7241ff6bd5b23244edb47e74753ddf867139280b899b16ae2cab91c30a73ebdcf471d032ee47bddb67f8c7f5c772a23f4a832cadcca7ada01468b84e451ad4 SHA512 b7c8724ca8376783e8563c2050c2d9219309e559116e5cba0fdc9f50780782ff4cc98d382bdbe26055aebffb6be99b110033c682f661a3966ea1b1ddb12d4ac3
diff --git a/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch b/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch
deleted file mode 100644
index d20fef5c56e9..000000000000
--- a/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/m4/acinclude.m4
-+++ b/m4/acinclude.m4
-@@ -1327,32 +1327,8 @@
- dnl Find a suitable termlib to use.
- dnl
- AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [
-- TERM_LIBS=
-- ac_octave_save_LIBS="$LIBS"
-- AC_SEARCH_LIBS([tputs],
-- [ncurses curses termcap terminfo termlib],
-- [], [])
-- LIBS="$ac_octave_save_LIBS"
-- case "$ac_cv_search_tputs" in
-- -l*)
-- TERM_LIBS="$ac_cv_search_tputs"
-- ;;
-- no)
-- warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!"
-- AC_MSG_WARN([$warn_termlibs])
-- ;;
-- esac
--
--dnl Old code (9/9/2012). Delete when new code is definitely proven.
--dnl
--dnl for _termlib in ncurses curses termcap terminfo termlib; do
--dnl AC_CHECK_LIB([${_termlib}], [tputs], [
--dnl TERM_LIBS="-l${termlib}"
--dnl octave_cv_lib_found_termlib=yes
--dnl break])
--dnl done
--
-- AC_SUBST(TERM_LIBS)
-+ PKG_CHECK_MODULES([TERM], [ncurses])
-+ CPPFLAGS="${CPPFLAGS} ${TERM_CFLAGS}"
- ])
- dnl
- dnl Check for the Qhull version.
diff --git a/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch b/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
deleted file mode 100644
index 1558b334d522..000000000000
--- a/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# HG changeset patch
-# User Markus Mützel <markus.muetzel@gmx.de>
-# Date 1647451226 -3600
-# Node ID 2d394460429ff8313004ddaeea31437e90d16799
-# Parent d3123b682f63723c111a50b77716fe9349d8fb7d
-build: Parse .la files in build tree when installing .oct files (bug #61905).
-
-* Makefile.am (install-oct): Parse .la files in build tree when installing .oct
-files. That should improve compatibility with tools like `slibtool` that don't
-install .la files.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -460,17 +460,18 @@
- if [ -n "`cat $(OCT_FILE_PKG_ADD_FILES)`" ]; then \
- $(INSTALL_DATA) oct-file-pkg-add $(DESTDIR)$(octfiledir)/PKG_ADD; \
- fi
-+ top_build_dir=`pwd` && \
- cd $(DESTDIR)$(octlibdir) && \
- for ltlib in $(OCT_FILE_LIBS); do \
- f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
-- dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
-+ dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$top_build_dir/$$ltlib`; \
- if [ -n "$$dl" ]; then \
- $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
- else \
- echo "error: dlname is empty in $$ltlib!"; \
- exit 1; \
- fi; \
-- lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$f`; \
-+ lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$top_build_dir/$$ltlib`; \
- if [ -n "$$lnames" ]; then \
- rm -f $$f $$lnames $$dl; \
- fi \
-
diff --git a/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch
deleted file mode 100644
index 7a6249ae80d4..000000000000
--- a/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://savannah.gnu.org/bugs/?62648#comment22
-https://bugs.gentoo.org/880623
-
-# HG changeset patch
-# User Rik <rik@octave.org>
-# Date 1668451079 28800
-# Mon Nov 14 10:37:59 2022 -0800
-# Node ID 67d5b2d119e254efc3d9f2658de47b293ac1f6eb
-# Parent 9f4a9dd4a6ee34ddc6e8d0a87d0c703782af7358
-doc: Enable building of Qt documentation with Texinfo >= 7.0 (bug #62648)
-
-* mk-qthelp.pl: Update regular expressions that find the start of data in
-index.html and Function-index.html to include additional pattern generated by
-Texinfo 7.0.
-
---- a/doc/interpreter/mk-qthelp.pl
-+++ b/doc/interpreter/mk-qthelp.pl
-@@ -26,8 +26,11 @@ if ($#ARGV != 1)
- open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
-
- # Skip through preamble of file to find start of list
--while (($_ = <$HTML>) !~ /^<div class="contents">/ ) {;}
--while (($_ = <$HTML>) !~ /^<ul class="no-bullet">/ ) {;}
-+while (defined ($_ = <$HTML>) and ! /^<div class="contents">/ ) {;}
-+while (defined ($_ = <$HTML>)
-+ and ! /^<ul class="(?:no-bullet|toc-numbered-mark)">/ ) {;}
-+
-+die "index.html: reached EOF without finding data start pattern" if eof ($HTML);
-
- $level = 0;
- while (<$HTML>)
-@@ -68,7 +71,11 @@ die "Failed to parse index.html" if ($le
- open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
-
- # Skip through preamble of file to find start of list
--while (($_ = <$HTML>) !~ /^<table class="index-fn/ ) {;}
-+while (defined ($_ = <$HTML>)
-+ and ! /^<table class="(?:index-fn|fn-entries)/ ) {;}
-+
-+die "Function-Index.html: reached EOF without finding data start pattern"
-+ if eof ($HTML);
-
- while (<$HTML>)
- {
-
diff --git a/sci-mathematics/octave/octave-7.3.0-r2.ebuild b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
deleted file mode 100644
index 98af07848357..000000000000
--- a/sci-mathematics/octave/octave-7.3.0-r2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="High-level interactive language for numerical computations"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
-#
-# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
-# ideal, but both "graphicsmagick" and "imagemagick" are global USE
-# flags whose existing descriptions conflict with the obvious way we
-# would want to use them in octave. In any case, upstream doesn't really
-# support imagemagick, only graphicsmagick (bug 864785).
-RDEPEND="
- app-arch/bzip2
- app-arch/unzip
- app-arch/zip
- app-text/ghostscript-gpl
- sys-apps/texinfo
- dev-libs/libpcre:=
- sys-libs/ncurses:=
- sys-libs/zlib
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:= )
- fftw? ( sci-libs/fftw:3.0= )
- fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] )
- glpk? ( sci-mathematics/glpk:= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-libs/qscintilla:=
- )
- hdf5? ( sci-libs/hdf5:= )
- imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
- java? ( >=virtual/jre-1.8:* )
- json? ( dev-libs/rapidjson )
- opengl? (
- media-libs/freetype:=
- media-libs/fontconfig:=
- virtual/glu
- x11-libs/gl2ps:=
- )
- portaudio? ( media-libs/portaudio )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig
- )
- qhull? ( media-libs/qhull:= )
- qrupdate? ( sci-libs/qrupdate:= )
- readline? ( sys-libs/readline:= )
- sndfile? ( media-libs/libsndfile )
- sparse? (
- sci-libs/arpack:=
- sci-libs/camd:=
- sci-libs/ccolamd:=
- sci-libs/cholmod:=
- sci-libs/colamd:=
- sci-libs/cxsparse:=
- sci-libs/umfpack:=
- )
- ssl? (
- dev-libs/openssl:=
- )
- sundials? ( >=sci-libs/sundials-4:= )
- X? ( x11-libs/libX11:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gperf
- virtual/pkgconfig
- doc? (
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-plaingeneric
- dev-texlive/texlive-metapost
- virtual/latex-base
- )
- java? ( >=virtual/jdk-1.8:* )
- gui? ( dev-qt/linguist-tools:5 )
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
-"
-
-# There are three ways to plot in Octave:
-#
-# 1. The old gnuplot renderer
-# 2. The OpenGL renderer using the FLTK backend
-# 3. The OpenGL renderer using the Qt backend
-#
-# It's possible to use the Qt GUI without OpenGL, but OpenGL rendering
-# is all that FLTK is used for, so it doesn't make sense to enable
-# USE=fltk without USE=opengl.
-#
-# Building without either USE=gnuplot or USE=opengl is technically legal,
-# but will leave you unable to plot anything.
-#
-# Octave's FLTK support is unofficially deprecated, in the sense that
-# you'll often get "why are you using FLTK?" in response to
-# bugs. (Upstream bug 59321 for a random example.) In the future, it
-# will probably make sense to merge USE=opengl and USE=X into USE=gui,
-# dropping USE=fltk entirely.
-REQUIRED_USE="
- fltk? ( opengl X )
- gui? ( X )
- opengl? ( || ( fltk gui ) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
- "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
- "${FILESDIR}"/${PN}-6.4.0-slibtool.patch
- "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
- "${FILESDIR}"/${P}-docs-texinfo-7.0.patch
-)
-
-src_prepare() {
- default
-
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- eautoreconf
-}
-
-src_configure() {
- # libstdc++ bug, bug #887815
- append-cxxflags -U_GLIBCXX_ASSERTIONS
-
- # Unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- # Tell autoconf where to find qt binaries, fix bug #837752
- export MOC="$(qt5_get_bindir)/moc" \
- UIC="$(qt5_get_bindir)/uic" \
- RCC="$(qt5_get_bindir)/rcc" \
- LRELEASE="$(qt5_get_bindir)/lrelease" \
- QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
- QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
-
- # Some of these use_with flags are a bit mismatched. The configure
- # script offers only --without-foo, and detects "foo" automatically
- # unless --without-foo is specified. Passing --with-foo is not an
- # error, however, so it kind of works. We wind up with, for example,
- #
- # --with-sundials_ida (no-op) with USE="sundials"
- # --without-sundials_ida (disables it) with USE="-sundials"
- #
- econf \
- --localstatedir="${EPREFIX}/var/state/octave" \
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
- --disable-64 \
- --enable-shared \
- --with-z \
- --with-bz2 \
- $(use_enable doc docs) \
- $(use_enable java) \
- $(use_enable json rapidjson) \
- $(use_enable readline) \
- $(use_with curl) \
- $(use_with fftw fftw3) \
- $(use_with fftw fftw3f) \
- $(use_enable fftw fftw-threads) \
- $(use_with glpk) \
- $(use_with hdf5) \
- $(use_with imagemagick magick GraphicsMagick++) \
- $(use_with opengl) \
- $(use_with fltk) \
- $(use_with ssl openssl) \
- $(use_with portaudio) \
- $(use_with qhull qhull_r) \
- $(use_with qrupdate) \
- $(use_with gui qt 5) \
- $(use_with sndfile) \
- $(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 sundials sundials_ida) \
- $(use_with X x)
-}
-
-src_compile() {
- # Otherwise it will write to /var/cache/fonts/ and trip sandbox
- export VARTEXFONTS="${T}/fonts"
-
- default
-
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- default
-
- if use doc; then
- dodoc $(find doc -name '*.pdf')
- else
- # bug #566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
-
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
-
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
- doenvd 99octave
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/octave/octave-8.1.0.ebuild b/sci-mathematics/octave/octave-8.1.0.ebuild
deleted file mode 100644
index 4db8e4efadcf..000000000000
--- a/sci-mathematics/octave/octave-8.1.0.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="High-level interactive language for numerical computations"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
-#
-# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
-# ideal, but both "graphicsmagick" and "imagemagick" are global USE
-# flags whose existing descriptions conflict with the obvious way we
-# would want to use them in octave. In any case, upstream doesn't really
-# support imagemagick, only graphicsmagick (bug 864785).
-RDEPEND="
- app-arch/bzip2
- app-arch/unzip
- app-arch/zip
- app-text/ghostscript-gpl
- sys-apps/texinfo
- dev-libs/libpcre2
- sys-libs/ncurses:=
- sys-libs/zlib
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:= )
- fftw? ( sci-libs/fftw:3.0= )
- fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] )
- glpk? ( sci-mathematics/glpk:= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-libs/qscintilla:=
- )
- hdf5? ( sci-libs/hdf5:= )
- imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
- java? ( >=virtual/jre-1.8:* )
- json? ( dev-libs/rapidjson )
- opengl? (
- media-libs/freetype:=
- media-libs/fontconfig:=
- virtual/glu
- x11-libs/gl2ps:=
- )
- portaudio? ( media-libs/portaudio )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig
- )
- qhull? ( media-libs/qhull:= )
- qrupdate? ( sci-libs/qrupdate:= )
- readline? ( sys-libs/readline:= )
- sndfile? ( media-libs/libsndfile )
- sparse? (
- sci-libs/arpack:=
- sci-libs/camd:=
- sci-libs/ccolamd:=
- sci-libs/cholmod:=
- sci-libs/colamd:=
- sci-libs/cxsparse:=
- sci-libs/umfpack:=
- )
- ssl? (
- dev-libs/openssl:=
- )
- sundials? ( >=sci-libs/sundials-4:= )
- X? ( x11-libs/libX11:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gperf
- virtual/pkgconfig
- doc? (
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-plaingeneric
- dev-texlive/texlive-metapost
- virtual/latex-base
- )
- java? ( >=virtual/jdk-1.8:* )
- gui? ( dev-qt/linguist-tools:5 )
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
-"
-
-# There are three ways to plot in Octave:
-#
-# 1. The old gnuplot renderer
-# 2. The OpenGL renderer using the FLTK backend
-# 3. The OpenGL renderer using the Qt backend
-#
-# It's possible to use the Qt GUI without OpenGL, but OpenGL rendering
-# is all that FLTK is used for, so it doesn't make sense to enable
-# USE=fltk without USE=opengl.
-#
-# Building without either USE=gnuplot or USE=opengl is technically legal,
-# but will leave you unable to plot anything.
-#
-# Octave's FLTK support is unofficially deprecated, in the sense that
-# you'll often get "why are you using FLTK?" in response to
-# bugs. (Upstream bug 59321 for a random example.) In the future, it
-# will probably make sense to merge USE=opengl and USE=X into USE=gui,
-# dropping USE=fltk entirely.
-REQUIRED_USE="
- fltk? ( opengl X )
- gui? ( X )
- opengl? ( || ( fltk gui ) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
- "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
-)
-
-src_prepare() {
- default
-
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- eautoreconf
-}
-
-src_configure() {
- # libstdc++ bug, bug #887815
- append-cxxflags -U_GLIBCXX_ASSERTIONS
-
- # Unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- # Tell autoconf where to find qt binaries, fix bug #837752
- export MOC="$(qt5_get_bindir)/moc" \
- UIC="$(qt5_get_bindir)/uic" \
- RCC="$(qt5_get_bindir)/rcc" \
- LRELEASE="$(qt5_get_bindir)/lrelease" \
- QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
- QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
-
- # Some of these use_with flags are a bit mismatched. The configure
- # script offers only --without-foo, and detects "foo" automatically
- # unless --without-foo is specified. Passing --with-foo is not an
- # error, however, so it kind of works. We wind up with, for example,
- #
- # --with-sundials_ida (no-op) with USE="sundials"
- # --without-sundials_ida (disables it) with USE="-sundials"
- #
- econf \
- --localstatedir="${EPREFIX}/var/state/octave" \
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
- --disable-64 \
- --enable-shared \
- --with-z \
- --with-bz2 \
- $(use_enable doc docs) \
- $(use_enable java) \
- $(use_enable json rapidjson) \
- $(use_enable readline) \
- $(use_with curl) \
- $(use_with fftw fftw3) \
- $(use_with fftw fftw3f) \
- $(use_enable fftw fftw-threads) \
- $(use_with glpk) \
- $(use_with hdf5) \
- $(use_with imagemagick magick GraphicsMagick++) \
- $(use_with opengl) \
- $(use_with fltk) \
- $(use_with ssl openssl) \
- $(use_with portaudio) \
- $(use_with qhull qhull_r) \
- $(use_with qrupdate) \
- $(use_with gui qt 5) \
- $(use_with sndfile) \
- $(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 sundials sundials_ida) \
- $(use_with X x)
-}
-
-src_compile() {
- # Otherwise it will write to /var/cache/fonts/ and trip sandbox
- export VARTEXFONTS="${T}/fonts"
-
- default
-
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- default
-
- if use doc; then
- dodoc $(find doc -name '*.pdf')
- else
- # bug #566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
-
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
-
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
- doenvd 99octave
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/octave/octave-8.2.0.ebuild b/sci-mathematics/octave/octave-8.2.0.ebuild
deleted file mode 100644
index d0d284820f9f..000000000000
--- a/sci-mathematics/octave/octave-8.2.0.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="High-level interactive language for numerical computations"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
-#
-# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
-# ideal, but both "graphicsmagick" and "imagemagick" are global USE
-# flags whose existing descriptions conflict with the obvious way we
-# would want to use them in octave. In any case, upstream doesn't really
-# support imagemagick, only graphicsmagick (bug 864785).
-RDEPEND="
- app-arch/bzip2
- app-arch/unzip
- app-arch/zip
- app-text/ghostscript-gpl
- sys-apps/texinfo
- dev-libs/libpcre2
- sys-libs/ncurses:=
- sys-libs/zlib
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:= )
- fftw? ( sci-libs/fftw:3.0= )
- fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] )
- glpk? ( sci-mathematics/glpk:= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-libs/qscintilla:=
- )
- hdf5? ( sci-libs/hdf5:= )
- imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
- java? ( >=virtual/jre-1.8:* )
- json? ( dev-libs/rapidjson )
- opengl? (
- media-libs/freetype:=
- media-libs/fontconfig:=
- virtual/glu
- x11-libs/gl2ps:=
- )
- portaudio? ( media-libs/portaudio )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig
- )
- qhull? ( media-libs/qhull:= )
- qrupdate? ( sci-libs/qrupdate:= )
- readline? ( sys-libs/readline:= )
- sndfile? ( media-libs/libsndfile )
- sparse? (
- sci-libs/arpack:=
- sci-libs/camd:=
- sci-libs/ccolamd:=
- sci-libs/cholmod:=
- sci-libs/colamd:=
- sci-libs/cxsparse:=
- sci-libs/umfpack:=
- )
- ssl? (
- dev-libs/openssl:=
- )
- sundials? ( >=sci-libs/sundials-4:= )
- X? ( x11-libs/libX11:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gperf
- virtual/pkgconfig
- doc? (
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-plaingeneric
- dev-texlive/texlive-metapost
- virtual/latex-base
- )
- java? ( >=virtual/jdk-1.8:* )
- gui? ( dev-qt/linguist-tools:5 )
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
-"
-
-# There are three ways to plot in Octave:
-#
-# 1. The old gnuplot renderer
-# 2. The OpenGL renderer using the FLTK backend
-# 3. The OpenGL renderer using the Qt backend
-#
-# It's possible to use the Qt GUI without OpenGL, but OpenGL rendering
-# is all that FLTK is used for, so it doesn't make sense to enable
-# USE=fltk without USE=opengl.
-#
-# Building without either USE=gnuplot or USE=opengl is technically legal,
-# but will leave you unable to plot anything.
-#
-# Octave's FLTK support is unofficially deprecated, in the sense that
-# you'll often get "why are you using FLTK?" in response to
-# bugs. (Upstream bug 59321 for a random example.) In the future, it
-# will probably make sense to merge USE=opengl and USE=X into USE=gui,
-# dropping USE=fltk entirely.
-REQUIRED_USE="
- fltk? ( opengl X )
- gui? ( X )
- opengl? ( || ( fltk gui ) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
- "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
-)
-
-src_prepare() {
- default
-
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- eautoreconf
-}
-
-src_configure() {
- # libstdc++ bug, bug #887815
- append-cxxflags -U_GLIBCXX_ASSERTIONS
-
- # Unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- # Tell autoconf where to find qt binaries, fix bug #837752
- export MOC="$(qt5_get_bindir)/moc" \
- UIC="$(qt5_get_bindir)/uic" \
- RCC="$(qt5_get_bindir)/rcc" \
- LRELEASE="$(qt5_get_bindir)/lrelease" \
- QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
- QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
-
- # Some of these use_with flags are a bit mismatched. The configure
- # script offers only --without-foo, and detects "foo" automatically
- # unless --without-foo is specified. Passing --with-foo is not an
- # error, however, so it kind of works. We wind up with, for example,
- #
- # --with-sundials_ida (no-op) with USE="sundials"
- # --without-sundials_ida (disables it) with USE="-sundials"
- #
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --disable-64
- --enable-shared
- --with-z
- --with-bz2
-
- # bug #901965
- --without-libiconv-prefix
- --without-libreadline-prefix
-
- $(use_enable doc docs)
- $(use_enable java)
- $(use_enable json rapidjson)
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_enable fftw fftw-threads)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with imagemagick magick GraphicsMagick++)
- $(use_with opengl)
- $(use_with fltk)
- $(use_with ssl openssl)
- $(use_with portaudio)
- $(use_with qhull qhull_r)
- $(use_with qrupdate)
- $(use_with gui qt 5)
- $(use_with sndfile)
- $(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 sundials sundials_ida)
- $(use_with X x)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Otherwise it will write to /var/cache/fonts/ and trip sandbox
- export VARTEXFONTS="${T}/fonts"
-
- default
-
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- default
-
- if use doc; then
- dodoc $(find doc -name '*.pdf')
- else
- # bug #566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
-
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
-
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
- doenvd 99octave
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/octave/octave-8.3.0.ebuild b/sci-mathematics/octave/octave-8.3.0.ebuild
deleted file mode 100644
index d0d284820f9f..000000000000
--- a/sci-mathematics/octave/octave-8.3.0.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="High-level interactive language for numerical computations"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
-#
-# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
-# ideal, but both "graphicsmagick" and "imagemagick" are global USE
-# flags whose existing descriptions conflict with the obvious way we
-# would want to use them in octave. In any case, upstream doesn't really
-# support imagemagick, only graphicsmagick (bug 864785).
-RDEPEND="
- app-arch/bzip2
- app-arch/unzip
- app-arch/zip
- app-text/ghostscript-gpl
- sys-apps/texinfo
- dev-libs/libpcre2
- sys-libs/ncurses:=
- sys-libs/zlib
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:= )
- fftw? ( sci-libs/fftw:3.0= )
- fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] )
- glpk? ( sci-mathematics/glpk:= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-libs/qscintilla:=
- )
- hdf5? ( sci-libs/hdf5:= )
- imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
- java? ( >=virtual/jre-1.8:* )
- json? ( dev-libs/rapidjson )
- opengl? (
- media-libs/freetype:=
- media-libs/fontconfig:=
- virtual/glu
- x11-libs/gl2ps:=
- )
- portaudio? ( media-libs/portaudio )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig
- )
- qhull? ( media-libs/qhull:= )
- qrupdate? ( sci-libs/qrupdate:= )
- readline? ( sys-libs/readline:= )
- sndfile? ( media-libs/libsndfile )
- sparse? (
- sci-libs/arpack:=
- sci-libs/camd:=
- sci-libs/ccolamd:=
- sci-libs/cholmod:=
- sci-libs/colamd:=
- sci-libs/cxsparse:=
- sci-libs/umfpack:=
- )
- ssl? (
- dev-libs/openssl:=
- )
- sundials? ( >=sci-libs/sundials-4:= )
- X? ( x11-libs/libX11:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gperf
- virtual/pkgconfig
- doc? (
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-plaingeneric
- dev-texlive/texlive-metapost
- virtual/latex-base
- )
- java? ( >=virtual/jdk-1.8:* )
- gui? ( dev-qt/linguist-tools:5 )
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
-"
-
-# There are three ways to plot in Octave:
-#
-# 1. The old gnuplot renderer
-# 2. The OpenGL renderer using the FLTK backend
-# 3. The OpenGL renderer using the Qt backend
-#
-# It's possible to use the Qt GUI without OpenGL, but OpenGL rendering
-# is all that FLTK is used for, so it doesn't make sense to enable
-# USE=fltk without USE=opengl.
-#
-# Building without either USE=gnuplot or USE=opengl is technically legal,
-# but will leave you unable to plot anything.
-#
-# Octave's FLTK support is unofficially deprecated, in the sense that
-# you'll often get "why are you using FLTK?" in response to
-# bugs. (Upstream bug 59321 for a random example.) In the future, it
-# will probably make sense to merge USE=opengl and USE=X into USE=gui,
-# dropping USE=fltk entirely.
-REQUIRED_USE="
- fltk? ( opengl X )
- gui? ( X )
- opengl? ( || ( fltk gui ) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
- "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
-)
-
-src_prepare() {
- default
-
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- eautoreconf
-}
-
-src_configure() {
- # libstdc++ bug, bug #887815
- append-cxxflags -U_GLIBCXX_ASSERTIONS
-
- # Unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- # Tell autoconf where to find qt binaries, fix bug #837752
- export MOC="$(qt5_get_bindir)/moc" \
- UIC="$(qt5_get_bindir)/uic" \
- RCC="$(qt5_get_bindir)/rcc" \
- LRELEASE="$(qt5_get_bindir)/lrelease" \
- QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
- QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
-
- # Some of these use_with flags are a bit mismatched. The configure
- # script offers only --without-foo, and detects "foo" automatically
- # unless --without-foo is specified. Passing --with-foo is not an
- # error, however, so it kind of works. We wind up with, for example,
- #
- # --with-sundials_ida (no-op) with USE="sundials"
- # --without-sundials_ida (disables it) with USE="-sundials"
- #
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --disable-64
- --enable-shared
- --with-z
- --with-bz2
-
- # bug #901965
- --without-libiconv-prefix
- --without-libreadline-prefix
-
- $(use_enable doc docs)
- $(use_enable java)
- $(use_enable json rapidjson)
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_enable fftw fftw-threads)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with imagemagick magick GraphicsMagick++)
- $(use_with opengl)
- $(use_with fltk)
- $(use_with ssl openssl)
- $(use_with portaudio)
- $(use_with qhull qhull_r)
- $(use_with qrupdate)
- $(use_with gui qt 5)
- $(use_with sndfile)
- $(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 sundials sundials_ida)
- $(use_with X x)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Otherwise it will write to /var/cache/fonts/ and trip sandbox
- export VARTEXFONTS="${T}/fonts"
-
- default
-
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- default
-
- if use doc; then
- dodoc $(find doc -name '*.pdf')
- else
- # bug #566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
-
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
-
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
- doenvd 99octave
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2022-11-23 21:18 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2022-11-23 21:18 UTC (permalink / raw
To: gentoo-commits
commit: a85f69392e0384f5b34f1d00e08482d69f4868e1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 20:57:54 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 20:57:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85f6939
sci-mathematics/octave: drop 5.2.0
Closes: https://bugs.gentoo.org/854489
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-mathematics/octave/Manifest | 1 -
...le-getcwd-path-max-test-as-it-is-too-slow.patch | 11 --
.../octave/files/octave-4.4.0-texi.patch | 11 --
sci-mathematics/octave/octave-5.2.0.ebuild | 200 ---------------------
4 files changed, 223 deletions(-)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 01f81cd55afc..1c82c201102b 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,4 +1,3 @@
-DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23 SHA512 b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5 SHA512 1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
diff --git a/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch b/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
deleted file mode 100644
index f6fa7be3b28f..000000000000
--- a/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/getcwd.m4
-+++ b/m4/getcwd.m4
-@@ -110,7 +110,7 @@
-
- gl_abort_bug=no
- case "$host_os" in
-- mingw*)
-+ *-gnu* | gnu* | mingw*)
- gl_cv_func_getcwd_path_max=yes
- ;;
- *)
diff --git a/sci-mathematics/octave/files/octave-4.4.0-texi.patch b/sci-mathematics/octave/files/octave-4.4.0-texi.patch
deleted file mode 100644
index 90ffa5361bf7..000000000000
--- a/sci-mathematics/octave/files/octave-4.4.0-texi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/interpreter/module.mk 2018-04-30 19:03:56.000000000 +0200
-+++ a/doc/interpreter/module.mk.new 2018-05-22 12:17:03.587175816 +0200
-@@ -368,6 +368,8 @@
- $(AWK) -f $(srcdir)/%reldir%/mkcontrib.awk $(srcdir)/%reldir%/contributors.in > $@-t && \
- mv $@-t $@
-
-+%reldir%/preface.texi: %reldir%/contributors.texi
-+
- AUTHORS: %reldir%/preface.texi %reldir%/contributors.texi | %reldir%/$(octave_dirstamp)
- $(AM_V_MAKEINFO)rm -f $@-t $@ && \
- if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/%reldir%/contributors.texi ] && [ ! -f %reldir%/contributors.texi ]; then \
diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild b/sci-mathematics/octave/octave-5.2.0.ebuild
deleted file mode 100644
index 0427a86b5e74..000000000000
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
- portaudio postscript +qhull +qrupdate readline sndfile +sparse
- ssl static-libs X zlib"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-arch/bzip2
- app-text/ghostscript-gpl
- dev-libs/libpcre:3=
- sys-libs/ncurses:0=
- sys-libs/zlib
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:0= )
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:0= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-libs/qscintilla:=
- )
- hdf5? ( sci-libs/hdf5:0= )
- java? ( >=virtual/jre-1.6.0:* )
- opengl? (
- media-libs/freetype:2=
- media-libs/fontconfig:1.0=
- virtual/glu
- >=x11-libs/fltk-1.3:1=[opengl,xft]
- x11-libs/gl2ps:0=
- )
- ssl? (
- dev-libs/openssl:0=
- )
- portaudio? ( media-libs/portaudio )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig
- )
- qhull? ( media-libs/qhull:0= )
- qrupdate? ( sci-libs/qrupdate:0= )
- readline? ( sys-libs/readline:0= )
- sndfile? ( media-libs/libsndfile )
- sparse? (
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/cxsparse:0=
- sci-libs/umfpack:0=
- )
- X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
- dev-util/gperf
- sys-apps/texinfo
- virtual/pkgconfig
- doc? (
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-plaingeneric
- dev-texlive/texlive-metapost
- virtual/latex-base
- )
- gui? ( dev-qt/linguist-tools:5 )
- java? ( >=virtual/jdk-1.6.0 )
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )"
-
-# Removed "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
-# because I think Z_LIBS are added to LIBOCTINTERP_LINK_DEPS
-# in the top-level configure.ac now.
-#
-# Both "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
-# and "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch were removed
-# because this support has been broken upstream for a long time,
-# and a fix that involves "using namespace Magick;" was rejected
-# as far as I can tell. Moreover, the configure.ac patch no longer
-# applies. In the meantime, I've remove support for USE=imagemagick
-# and USE=graphicsmagick.
-#
-# Removed "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch because it was fixed
-# in https://hg.savannah.gnu.org/hgweb/octave/rev/cdaa884568b1
-#
-# The texi patch is upstream as https://savannah.gnu.org/bugs/?58057
-# and should be in a future release.
-PATCHES=(
- "${FILESDIR}"/${PN}-4.4.0-texi.patch
- "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
- "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
- "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-)
-
-src_prepare() {
- # nasty prefix hacks for fltk:1 linking
- if use prefix; then
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
- fi
-
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- econf \
- --localstatedir="${EPREFIX}/var/state/octave" \
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
- --disable-64 \
- --disable-jit \
- --enable-shared \
- --with-z \
- --with-bz2 \
- $(use_enable static-libs static) \
- $(use_enable doc docs) \
- $(use_enable java) \
- $(use_enable readline) \
- $(use_with curl) \
- $(use_with fftw fftw3) \
- $(use_with fftw fftw3f) \
- $(use_enable fftw fftw-threads) \
- $(use_with glpk) \
- $(use_with hdf5) \
- $(use_with opengl) \
- $(use_with opengl fltk) \
- $(use_with ssl openssl) \
- $(use_with portaudio) \
- $(use_with qhull) \
- $(use_with qrupdate) \
- $(use_with gui qt 5) \
- $(use_with sndfile) \
- $(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 X x)
-}
-
-src_compile() {
- export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
- default
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- default
- if use doc; then
- dodoc $(find doc -name '*.pdf')
- else
- # bug 566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- use java && \
- java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
- doenvd 99octave
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2022-11-15 4:58 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-11-15 4:58 UTC (permalink / raw
To: gentoo-commits
commit: c8016a40d4749950f493e0831547351a1f8a2982
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 04:58:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 04:58:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8016a40
sci-mathematics/octave: fix build loop with USE=doc & texinfo-7.0
Closes: https://bugs.gentoo.org/880623
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/octave-7.3.0-docs-texinfo-7.0.patch | 45 ++++++++++++++++++++++
sci-mathematics/octave/octave-7.3.0-r1.ebuild | 1 +
2 files changed, 46 insertions(+)
diff --git a/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch
new file mode 100644
index 000000000000..7a6249ae80d4
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch
@@ -0,0 +1,45 @@
+https://savannah.gnu.org/bugs/?62648#comment22
+https://bugs.gentoo.org/880623
+
+# HG changeset patch
+# User Rik <rik@octave.org>
+# Date 1668451079 28800
+# Mon Nov 14 10:37:59 2022 -0800
+# Node ID 67d5b2d119e254efc3d9f2658de47b293ac1f6eb
+# Parent 9f4a9dd4a6ee34ddc6e8d0a87d0c703782af7358
+doc: Enable building of Qt documentation with Texinfo >= 7.0 (bug #62648)
+
+* mk-qthelp.pl: Update regular expressions that find the start of data in
+index.html and Function-index.html to include additional pattern generated by
+Texinfo 7.0.
+
+--- a/doc/interpreter/mk-qthelp.pl
++++ b/doc/interpreter/mk-qthelp.pl
+@@ -26,8 +26,11 @@ if ($#ARGV != 1)
+ open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
+
+ # Skip through preamble of file to find start of list
+-while (($_ = <$HTML>) !~ /^<div class="contents">/ ) {;}
+-while (($_ = <$HTML>) !~ /^<ul class="no-bullet">/ ) {;}
++while (defined ($_ = <$HTML>) and ! /^<div class="contents">/ ) {;}
++while (defined ($_ = <$HTML>)
++ and ! /^<ul class="(?:no-bullet|toc-numbered-mark)">/ ) {;}
++
++die "index.html: reached EOF without finding data start pattern" if eof ($HTML);
+
+ $level = 0;
+ while (<$HTML>)
+@@ -68,7 +71,11 @@ die "Failed to parse index.html" if ($le
+ open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
+
+ # Skip through preamble of file to find start of list
+-while (($_ = <$HTML>) !~ /^<table class="index-fn/ ) {;}
++while (defined ($_ = <$HTML>)
++ and ! /^<table class="(?:index-fn|fn-entries)/ ) {;}
++
++die "Function-Index.html: reached EOF without finding data start pattern"
++ if eof ($HTML);
+
+ while (<$HTML>)
+ {
+
diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
index 05285cf1f3e5..0901c51c9f76 100644
--- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
@@ -131,6 +131,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
"${FILESDIR}"/${PN}-6.4.0-slibtool.patch
"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
+ "${FILESDIR}"/${P}-docs-texinfo-7.0.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2022-05-05 0:11 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-05-05 0:11 UTC (permalink / raw
To: gentoo-commits
commit: 92866628bc2358685c29fc8bef7bc1121929b103
Author: Thamognya Kodi <contact <AT> thamognya <DOT> com>
AuthorDate: Thu Apr 21 12:28:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 5 00:11:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92866628
sci-mathematics/octave: version bump to 7.1.0
Bug: https://bugs.gentoo.org/839285
Closes: https://github.com/gentoo/gentoo/pull/25143
Signed-off-by: Thamognya Kodi <contact <AT> thamognya.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-mathematics/octave/Manifest | 1 +
.../files/octave-6.4.0-omit-qtchooser-qtver.patch | 63 ++++++
sci-mathematics/octave/octave-7.1.0.ebuild | 213 +++++++++++++++++++++
3 files changed, 277 insertions(+)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 1b45de02c2e9..acebc906380c 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,2 +1,3 @@
DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
+DIST octave-7.1.0.tar.gz 34187598 BLAKE2B da4c1b47e0d71f05edc47036b9b10fb83aa6edb8aa911ff22f77a013935ea37295f776f5c478e198c38102b8d1ad68edada818c9b46ad1061a466b5c77eeed58 SHA512 042a68bd2c5c873ccc846c6de13743c6fddd166e8b062948daf184133eb774a05e29ab6132829886411a5ba330126d20a3d0700a606819a424c3db6e57471888
diff --git a/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
new file mode 100644
index 000000000000..3dc9c3e1d191
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
@@ -0,0 +1,63 @@
+diff -urNp octave-6.4.0-orig/configure octave-6.4.0-dwok/configure
+--- octave-6.4.0-orig/configure 2022-04-19 20:45:23.112463584 +0200
++++ octave-6.4.0-dwok/configure 2022-04-19 20:44:19.024774083 +0200
+@@ -77543,9 +77543,6 @@ esac
+ fi
+
+ if test -n "$MOC"; then
+- if test -n "$QTCHOOSER"; then
+- MOCFLAGS="-qt=$qt_version"
+- fi
+ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE moc"
+ else
+ QT_TOOLS_MISSING="$QT_TOOLS_MISSING moc"
+@@ -77778,9 +77775,6 @@ esac
+ fi
+
+ if test -n "$UIC"; then
+- if test -n "$QTCHOOSER"; then
+- UICFLAGS="-qt=$qt_version"
+- fi
+ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE uic"
+ else
+ QT_TOOLS_MISSING="$QT_TOOLS_MISSING uic"
+@@ -78013,9 +78007,6 @@ esac
+ fi
+
+ if test -n "$RCC"; then
+- if test -n "$QTCHOOSER"; then
+- RCCFLAGS="-qt=$qt_version"
+- fi
+ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE rcc"
+ else
+ QT_TOOLS_MISSING="$QT_TOOLS_MISSING rcc"
+@@ -78248,9 +78239,6 @@ esac
+ fi
+
+ if test -n "$LRELEASE"; then
+- if test -n "$QTCHOOSER"; then
+- LRELEASEFLAGS="-qt=$qt_version"
+- fi
+ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE lrelease"
+ else
+ QT_TOOLS_MISSING="$QT_TOOLS_MISSING lrelease"
+@@ -78483,9 +78471,6 @@ esac
+ fi
+
+ if test -n "$QCOLLECTIONGENERATOR"; then
+- if test -n "$QTCHOOSER"; then
+- QCOLLECTIONGENERATORFLAGS="-qt=$qt_version"
+- fi
+ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
+ else
+ QT_TOOLS_MISSING="$QT_TOOLS_MISSING qcollectiongenerator"
+@@ -78718,9 +78703,6 @@ esac
+ fi
+
+ if test -n "$QHELPGENERATOR"; then
+- if test -n "$QTCHOOSER"; then
+- QHELPGENERATORFLAGS="-qt=$qt_version"
+- fi
+ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qhelpgenerator"
+ else
+ QT_TOOLS_MISSING="$QT_TOOLS_MISSING qhelpgenerator"
diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild b/sci-mathematics/octave/octave-7.1.0.ebuild
new file mode 100644
index 000000000000..fe852460a5bb
--- /dev/null
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+HOMEPAGE="https://www.gnu.org/software/octave/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
+ portaudio postscript +qhull +qrupdate readline sndfile +sparse
+ ssl static-libs sundials X zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug 775254).
+#
+RDEPEND="
+ app-arch/bzip2
+ app-arch/unzip
+ app-arch/zip
+ app-text/ghostscript-gpl
+ sys-apps/texinfo
+ dev-libs/libpcre:3=
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ virtual/blas
+ virtual/lapack
+ curl? ( net-misc/curl:0= )
+ fftw? ( sci-libs/fftw:3.0= )
+ glpk? ( sci-mathematics/glpk:0= )
+ gnuplot? ( sci-visualization/gnuplot )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ x11-libs/qscintilla:=
+ )
+ hdf5? ( sci-libs/hdf5:0= )
+ java? ( >=virtual/jre-1.6.0:* )
+ opengl? (
+ media-libs/freetype:2=
+ media-libs/fontconfig:1.0=
+ virtual/glu
+ >=x11-libs/fltk-1.3:1=[opengl,xft]
+ x11-libs/gl2ps:0=
+ )
+ portaudio? ( media-libs/portaudio )
+ postscript? (
+ app-text/epstool
+ media-gfx/pstoedit
+ media-gfx/transfig
+ )
+ qhull? ( media-libs/qhull:0= )
+ qrupdate? ( sci-libs/qrupdate:0= )
+ readline? ( sys-libs/readline:0= )
+ sndfile? ( media-libs/libsndfile )
+ sparse? (
+ sci-libs/arpack:0=
+ sci-libs/camd:0=
+ sci-libs/ccolamd:0=
+ sci-libs/cholmod:0=
+ sci-libs/colamd:0=
+ sci-libs/cxsparse:0=
+ sci-libs/umfpack:0=
+ )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ sundials? ( >=sci-libs/sundials-4:0= )
+ X? ( x11-libs/libX11:0= )"
+BDEPEND="${RDEPEND}
+ dev-util/gperf
+ virtual/pkgconfig
+ doc? (
+ dev-texlive/texlive-fontsrecommended
+ dev-texlive/texlive-plaingeneric
+ dev-texlive/texlive-metapost
+ virtual/latex-base
+ )
+ gui? ( dev-qt/linguist-tools:5 )
+ java? ( >=virtual/jdk-1.6.0 )
+ qrupdate? ( app-misc/pax-utils )
+ sparse? ( app-misc/pax-utils )
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+ "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+ "${FILESDIR}/${PN}-6.4.0-slibtool.patch"
+)
+
+src_prepare() {
+ # nasty prefix hacks for fltk:1 linking
+ if use prefix; then
+ use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+ fi
+
+ # occasional fail on install, force regeneration (bug #401189)
+ rm doc/interpreter/contributors.texi || die
+
+ default
+ # patch for unknown option 'qt' (bug #839285)
+ eapply "${FILESDIR}/${PN}-6.4.0-omit-qtchooser-qtver.patch"
+ eautoreconf
+}
+
+src_configure() {
+ # unfortunate dependency on mpi from hdf5 (bug #302621)
+ use hdf5 && has_version sci-libs/hdf5[mpi] && \
+ export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+ # tell autoconf where to find qt binaries, fix bug #837752
+ export MOC="$(qt5_get_bindir)/moc" UIC="$(qt5_get_bindir)/uic" RCC="$(qt5_get_bindir)/rcc" \
+ LRELEASE="$(qt5_get_bindir)/lrelease" QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
+ QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
+
+ # Some of these use_with flags are a bit mismatched. The configure
+ # script offers only --without-foo, and detects "foo" automatically
+ # unless --without-foo is specified. Passing --with-foo is not an
+ # error, however, so it kind of works. We wind up with, for example,
+ #
+ # --with-sundials_ida (no-op) with USE="sundials"
+ # --without-sundials_ida (disables it) with USE="-sundials"
+ #
+ # The --enable-link-all-dependencies flag is needed because
+ # otherwise, the build system appends --no-undefined to LDFLAGS and
+ # then proceeds to undefine things. GNU libtool ignores this, but
+ # slibtool (for example) does not (bug 776583).
+ econf \
+ --localstatedir="${EPREFIX}/var/state/octave" \
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+ --disable-64 \
+ --disable-jit \
+ --enable-link-all-dependencies \
+ --enable-shared \
+ --with-z \
+ --with-bz2 \
+ $(use_enable static-libs static) \
+ $(use_enable doc docs) \
+ $(use_enable java) \
+ $(use_enable readline) \
+ $(use_with curl) \
+ $(use_with fftw fftw3) \
+ $(use_with fftw fftw3f) \
+ $(use_enable fftw fftw-threads) \
+ $(use_with glpk) \
+ $(use_with hdf5) \
+ $(use_with opengl) \
+ $(use_with opengl fltk) \
+ $(use_with ssl openssl) \
+ $(use_with portaudio) \
+ $(use_with qhull) \
+ $(use_with qrupdate) \
+ $(use_with gui qt 5) \
+ $(use_with sndfile) \
+ $(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 sundials sundials_ida) \
+ $(use_with X x)
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
+ default
+ if use java; then
+ pax-mark m "${S}/src/.libs/octave-cli"
+ fi
+}
+
+src_install() {
+ default
+ if use doc; then
+ dodoc $(find doc -name '*.pdf')
+ else
+ # bug 566134, macros.texi is installed by make install if use doc
+ insinto /usr/share/${PN}/${PV}/etc
+ doins doc/interpreter/macros.texi
+ fi
+ [[ -e test/fntests.log ]] && dodoc test/fntests.log
+ use java && \
+ java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+ echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
+ doenvd 99octave
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2017-10-08 16:43 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2017-10-08 16:43 UTC (permalink / raw
To: gentoo-commits
commit: b028a2c63ff7fe94201305761d6d9daf3745af5f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 8 14:46:45 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 16:42:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b028a2c6
sci-mathematics/octave: Fix >=qscintilla-2.10 detection
Gentoo-bug: 617024
Package-Manager: Portage-2.3.11, Repoman-2.3.3
.../octave/files/octave-4.2.0-fix-qscintilla-detection.patch | 2 +-
sci-mathematics/octave/octave-4.2.1.ebuild | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
index 9d18b6a6d7c..ea714ecbfbb 100644
--- a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
+++ b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
@@ -8,7 +8,7 @@ as its Qt4 variant.
5)
QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
-+ octave_qscintilla_libnames=qscintilla2
++ octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2"
;;
*)
AC_MSG_ERROR([Unrecognized Qt version $qt_version])
diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild b/sci-mathematics/octave/octave-4.2.1.ebuild
index 00a2d44ce48..e7ecf516cc4 100644
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
DESCRIPTION="High-level interactive language for numerical computations"
LICENSE="GPL-3"
@@ -175,3 +175,13 @@ src_install() {
echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
doenvd 99octave
}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2017-06-11 21:44 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2017-06-11 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 8fc2192f2c98e1de3f9667d4d968141c6df8d55c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 21:02:50 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 21:43:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc2192f
sci-mathematics/octave: Remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4771
sci-mathematics/octave/Manifest | 3 -
.../octave/files/octave-3.4.3-pkgbuilddir.patch | 44 ---
.../octave/files/octave-3.4.3-texi.patch | 11 -
.../octave/files/octave-3.6.3-legendtext.patch | 13 -
.../octave/files/octave-3.6.4-texinfo.patch | 378 ---------------------
...le-getcwd-path-max-test-as-it-is-too-slow.patch | 11 -
.../files/octave-3.8.0-imagemagick-configure.patch | 16 -
.../octave/files/octave-3.8.1-imagemagick.patch | 138 --------
.../octave/files/octave-3.8.1-pkgbuilddir.patch | 41 ---
sci-mathematics/octave/octave-3.6.4-r1.ebuild | 124 -------
sci-mathematics/octave/octave-3.8.2-r3.ebuild | 151 --------
sci-mathematics/octave/octave-4.2.0-r4.ebuild | 177 ----------
12 files changed, 1107 deletions(-)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index b0da42bbc13..31d611c011f 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,4 +1 @@
-DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
-DIST octave-3.8.2.tar.bz2 17834980 SHA256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc WHIRLPOOL c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
-DIST octave-4.2.0.tar.gz 25320153 SHA256 443ba73782f3531c94bcf016f2f0362a58e186ddb8269af7dcce973562795567 SHA512 5d16665d4ef8f218320f471704f8702f3a2911cc4a083cae318c1df0f787d50dddbc511dc91e11379314d65cecac6d521abac026860feca19d11ffdb52d3e678 WHIRLPOOL b5973f4e96aa4785436afa7fcc637cce021e4b5e93c3368f61712c808191bc26e3ece9d649f0b99e3df03672cb6df16c28cad931f3317b555f4f3167e4092f34
DIST octave-4.2.1.tar.gz 25409651 SHA256 80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b SHA512 c437c57eb145ddea7b97124dc6406d130fd91c9141198b93bc756bb05cb3f7645a7c591443faeb65e69edf6abc2b8d5612e515f7703a04eed27213a2133009b7 WHIRLPOOL 4488287a9223ed99fe4ff3423f8ea5157cb538eb54918a53024082083a2f22d2af751f7dde0e489266a518d6ea5265e9c68536b5d5d9a186919d9979e9575333
diff --git a/sci-mathematics/octave/files/octave-3.4.3-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-3.4.3-pkgbuilddir.patch
deleted file mode 100644
index 5340c9a19b9..00000000000
--- a/sci-mathematics/octave/files/octave-3.4.3-pkgbuilddir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Allow installation of already extracted packages with pkg.m
-Forwarded: not-needed
-Author: Thomas Weber <tweber@debian.org>
---- scripts/pkg/pkg.m.orig 2011-02-08 03:00:51.000000000 -0700
-+++ 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/files/octave-3.4.3-texi.patch b/sci-mathematics/octave/files/octave-3.4.3-texi.patch
deleted file mode 100644
index 2ce38b2cc30..00000000000
--- a/sci-mathematics/octave/files/octave-3.4.3-texi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/interpreter/Makefile.am
-+++ b/doc/interpreter/Makefile.am
-@@ -202,6 +202,8 @@
- $(AWK) -f $(srcdir)/mkcontrib.awk $(srcdir)/contributors.in > $@-t
- mv $@-t $@
-
-+preface.texi: contributors.texi
-+
- ../../AUTHORS: preface.texi contributors.texi
- rm -f AUTHORS
- -$(MAKEINFO) -D AUTHORSONLY \
diff --git a/sci-mathematics/octave/files/octave-3.6.3-legendtext.patch b/sci-mathematics/octave/files/octave-3.6.3-legendtext.patch
deleted file mode 100644
index 046c721fdb2..00000000000
--- a/sci-mathematics/octave/files/octave-3.6.3-legendtext.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-should be fixed in octave-3.8 and above
-
---- src/gl2ps-renderer.cc.orig 2012-05-31 03:43:29.000000000 +0200
-+++ src/gl2ps-renderer.cc 2012-10-10 18:41:10.526639551 +0200
-@@ -223,7 +223,7 @@
-
- // FIXME: handle margin and surrounding box
-
-- glRasterPos3d (pos(0), pos(1), pos(2));
-+ glRasterPos3d (pos(0), pos(1), pos.numel() > 2 ? pos(2) : 0.0);
-
- octave_value string_prop = props.get_string ();
-
diff --git a/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch b/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch
deleted file mode 100644
index 67f876f7bc4..00000000000
--- a/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-diff -Nur octave-3.6.4.orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpreter/audio.texi
---- octave-3.6.4.orig/doc/interpreter/audio.texi 2013-02-21 12:37:50.000000000 -0800
-+++ octave-3.6.4/doc/interpreter/audio.texi 2013-06-19 08:52:43.259790240 -0700
-@@ -146,18 +146,18 @@
- Load the RIFF/WAVE sound file @var{filename}, and return the samples
- in vector @var{y}. If the file contains multichannel data, then
- @var{y} is a matrix with the channels represented as columns.
--
--@deftypefnx {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
-+@end deftypefn
-+@deftypefn {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
- Additionally return the sample rate (@var{fs}) in Hz and the number of bits
- per sample (@var{bps}).
--
--@deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
-+@end deftypefn
-+@deftypefn {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
- Read only the first @var{n} samples from each channel.
--
--@deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
-+@end deftypefn
-+@deftypefn {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
- Read only samples @var{n1} through @var{n2} from each channel.
--
--@deftypefnx {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
-+@end deftypefn
-+@deftypefn {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
- Return the number of samples (@var{n}) and channels (@var{ch})
- instead of the audio data.
- @seealso{@ref{doc-wavwrite,,wavwrite}}
-diff -Nur octave-3.6.4.orig/doc/interpreter/io.texi octave-3.6.4/doc/interpreter/io.texi
---- octave-3.6.4.orig/doc/interpreter/io.texi 2013-02-21 12:37:51.000000000 -0800
-+++ octave-3.6.4/doc/interpreter/io.texi 2013-06-19 08:52:43.259790240 -0700
-@@ -1391,22 +1391,22 @@
- for the file. Valid values for @var{arch} are:
-
- @table @asis
--@samp{native}
-+@item @samp{native}
- The format of the current machine (this is the default).
-
--@samp{ieee-be}
-+@item @samp{ieee-be}
- IEEE big endian format.
-
--@samp{ieee-le}
-+@item @samp{ieee-le}
- IEEE little endian format.
-
--@samp{vaxd}
-+@item @samp{vaxd}
- VAX D floating format.
-
--@samp{vaxg}
-+@item @samp{vaxg}
- VAX G floating format.
-
--@samp{cray}
-+@item @samp{cray}
- Cray floating format.
- @end table
-
-diff -Nur octave-3.6.4.orig/doc/interpreter/octave.texi octave-3.6.4/doc/interpreter/octave.texi
---- octave-3.6.4.orig/doc/interpreter/octave.texi 2013-02-21 12:19:23.000000000 -0800
-+++ octave-3.6.4/doc/interpreter/octave.texi 2013-06-19 08:52:43.259790240 -0700
-@@ -129,7 +129,9 @@
- @sp 2
- @multitable @columnfractions 0.4 0.025 0.65
- @item
--@flushright @image{octave_logo,2.1in} @end flushright
-+@flushright
-+@image{octave_logo,2.1in}
-+@end flushright
- @tab
- @c this is a spacer column
- @tab
-diff -Nur octave-3.6.4.orig/doc/interpreter/plot.texi octave-3.6.4/doc/interpreter/plot.texi
---- octave-3.6.4.orig/doc/interpreter/plot.texi 2013-02-21 12:37:52.000000000 -0800
-+++ octave-3.6.4/doc/interpreter/plot.texi 2013-06-19 08:52:43.260790204 -0700
-@@ -2707,21 +2707,20 @@
- Set the data aspect ratio of the current axes. The aspect ratio is
- a normalized 3-element vector representing the span of the x, y, and
- z-axes limits.
--
--@deftypefnx {Function File} {@var{data_aspect_ratio} =} daspect ( )
-+@end deftypefn
-+@deftypefn {Function File} {@var{data_aspect_ratio} =} daspect ( )
- Return the data aspect ratio of the current axes.
--
--@deftypefnx {Function File} {} daspect (@var{mode})
-+@end deftypefn
-+@deftypefn {Function File} {} daspect (@var{mode})
- Set the data aspect ratio mode of the current axes.
--
--@deftypefnx {Function File} {@var{data_aspect_ratio_mode} =} daspect ("mode")
-+@end deftypefn
-+@deftypefn {Function File} {@var{data_aspect_ratio_mode} =} daspect ("mode")
- Return the data aspect ratio mode of the current axes.
--
--@deftypefnx {Function File} {} daspect (@var{hax}, @dots{})
-+@end deftypefn
-+@deftypefn {Function File} {} daspect (@var{hax}, @dots{})
- Use the axes, with handle @var{hax}, instead of the current axes.
--
--@seealso{@ref{doc-axis,,axis}, @ref{doc-pbaspect,,pbaspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
- @end deftypefn
-+@seealso{@ref{doc-axis,,axis}, @ref{doc-pbaspect,,pbaspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
-
-
- @c pbaspect scripts/plot/pbaspect.m
-@@ -2730,21 +2729,20 @@
- Set the plot box aspect ratio of the current axes. The aspect ratio
- is a normalized 3-element vector representing the rendered lengths of
- the x, y, and z-axes.
--
--@deftypefnx {Function File} {@var{plot_box_aspect_ratio} =} pbaspect ( )
-+@end deftypefn
-+@deftypefn {Function File} {@var{plot_box_aspect_ratio} =} pbaspect ( )
- Return the plot box aspect ratio of the current axes.
--
--@deftypefnx {Function File} {} pbaspect (@var{mode})
-+@end deftypefn
-+@deftypefn {Function File} {} pbaspect (@var{mode})
- Set the plot box aspect ratio mode of the current axes.
--
--@deftypefnx {Function File} {@var{plot_box_aspect_ratio_mode} =} pbaspect ("mode")
-+@end deftypefn
-+@deftypefn {Function File} {@var{plot_box_aspect_ratio_mode} =} pbaspect ("mode")
- Return the plot box aspect ratio mode of the current axes.
--
--@deftypefnx {Function File} {} pbaspect (@var{hax}, @dots{})
-+@end deftypefn
-+@deftypefn {Function File} {} pbaspect (@var{hax}, @dots{})
- Use the axes, with handle @var{hax}, instead of the current axes.
--
--@seealso{@ref{doc-axis,,axis}, @ref{doc-daspect,,daspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
- @end deftypefn
-+@seealso{@ref{doc-axis,,axis}, @ref{doc-daspect,,daspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
-
-
- @node Three-dimensional Function Plotting
-@@ -3147,7 +3145,7 @@
- @item "hide"
- Hide legend on the plot
-
--@itemx "toggle"
-+@item "toggle"
- Toggles between "hide" and "show"
-
- @item "boxon"
-@@ -3162,7 +3160,7 @@
- @item "right"
- Place text to the right of the keys
-
--@itemx "off"
-+@item "off"
- Delete the legend object
- @end table
- @end deftypefn
-@@ -4139,11 +4137,11 @@
- is sent to a file the size is determined by the plot box defined by
- the figure's "paperposition" property.
-
--@itemx -append
-+@item -append
- Appends the PS, or PDF output to a pre-existing file of the
- same type.
-
--@itemx -r@var{NUM}
-+@item -r@var{NUM}
- Resolution of bitmaps in pixels per inch. For both metafiles and
- SVG the default is the screen resolution, for other it is 150 dpi.
- To specify screen resolution, use "-r0".
-@@ -6296,15 +6294,15 @@
- A character indicating a plot marker to be place at each data point, or
- @code{"none"}, meaning no markers should be displayed.
-
--@itemx markeredgecolor
-+@item markeredgecolor
- The color of the edge around the marker, or @code{"auto"}, meaning that
- the edge color is the same as the face color. @xref{Colors}.
-
--@itemx markerfacecolor
-+@item markerfacecolor
- The color of the marker, or @code{"none"} to indicate that the marker
- should not be filled. @xref{Colors}.
-
--@itemx markersize
-+@item markersize
- A number specifying the size of the marker. The default is 1. A value
- of 2 is twice as large as the default, etc.
- @end table
-@@ -6442,7 +6440,8 @@
- @deftypefn {Function File} {@var{value} =} getappdata (@var{h}, @var{name})
- Return the @var{value} for named application data for the object(s) with
- handle(s) @var{h}.
--@deftypefnx {Function File} {@var{appdata} =} getappdata (@var{h})
-+@end deftypefn
-+@deftypefn {Function File} {@var{appdata} =} getappdata (@var{h})
- Return a structure, @var{appdata}, whose fields correspond to the appdata
- properties.
- @end deftypefn
-diff -Nur octave-3.6.4.orig/doc/interpreter/poly.texi octave-3.6.4/doc/interpreter/poly.texi
---- octave-3.6.4.orig/doc/interpreter/poly.texi 2013-02-21 12:37:52.000000000 -0800
-+++ octave-3.6.4/doc/interpreter/poly.texi 2013-06-19 08:52:43.260790204 -0700
-@@ -82,8 +82,8 @@
- (@var{x}-@var{mu}(1))/@var{mu}(2).
- If @var{x} is a vector or matrix, the polynomial is evaluated for each of
- the elements of @var{x}.
--
--@deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
-+@end deftypefn
-+@deftypefn {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
- @deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s}, @var{mu})
- In addition to evaluating the polynomial, the second output
- represents the prediction interval, @var{y} +/- @var{dy}, which
-diff -Nur octave-3.6.4.orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter/set.texi
---- octave-3.6.4.orig/doc/interpreter/set.texi 2013-02-21 12:37:52.000000000 -0800
-+++ octave-3.6.4/doc/interpreter/set.texi 2013-06-19 08:52:43.260790204 -0700
-@@ -150,8 +150,9 @@
- 3 4
- @end group
- @end example
-+@end deftypefn
-
--@deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
-+@deftypefn {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
-
- Return index vectors @var{ia} and @var{ib} such that @code{a(ia)} and
- @code{b(ib)} are disjoint sets whose union is @var{c}.
-diff -Nur octave-3.6.4.orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpreter/signal.texi
---- octave-3.6.4.orig/doc/interpreter/signal.texi 2013-02-21 12:37:52.000000000 -0800
-+++ octave-3.6.4/doc/interpreter/signal.texi 2013-06-19 08:52:43.261790169 -0700
-@@ -454,17 +454,17 @@
-
- For fastest computation, @var{n} should factor into a small number of
- small primes.
--
--@deftypefnx {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
-+@end deftypefn
-+@deftypefn {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
- Evaluate the response at the specific frequencies in the vector @var{w}.
- The values for @var{w} are measured in radians.
--
--@deftypefnx {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
-+@end deftypefn
-+@deftypefn {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
- Return frequencies in Hz instead of radians assuming a sampling rate
- @var{Fs}. If you are evaluating the response at specific frequencies
- @var{w}, those frequencies should be requested in Hz rather than radians.
--
--@deftypefnx {Function File} {} freqz (@dots{})
-+@end deftypefn
-+@deftypefn {Function File} {} freqz (@dots{})
- Plot the pass band, stop band and phase response of @var{h} rather
- than returning them.
- @end deftypefn
-diff -Nur octave-3.6.4.orig/doc/interpreter/strings.texi octave-3.6.4/doc/interpreter/strings.texi
---- octave-3.6.4.orig/doc/interpreter/strings.texi 2013-02-21 12:37:52.000000000 -0800
-+++ octave-3.6.4/doc/interpreter/strings.texi 2013-06-19 08:52:43.261790169 -0700
-@@ -1136,7 +1136,7 @@
- @item %s
- The word is parsed as a string.
-
--@itemx %f
-+@item %f
- @itemx %n
- The word is parsed as a number and converted to double.
-
-diff -Nur octave-3.6.4.orig/doc/interpreter/system.texi octave-3.6.4/doc/interpreter/system.texi
---- octave-3.6.4.orig/doc/interpreter/system.texi 2013-02-21 12:37:52.000000000 -0800
-+++ octave-3.6.4/doc/interpreter/system.texi 2013-06-19 08:52:43.261790169 -0700
-@@ -839,7 +839,7 @@
- @deftypefnx {Function File} {} datetick (@var{axis}, @var{form})
- @deftypefnx {Function File} {} datetick (@dots{}, "keeplimits")
- @deftypefnx {Function File} {} datetick (@dots{}, "keepticks")
--@deftypefnx {Function File} {} datetick (@dots{ax}, @dots{})
-+@comment @deftypefnx {Function File} {} datetick (@dots{ax}, @dots{})
- Add date formatted tick labels to an axis. The axis the apply the
- ticks to is determined by @var{axis} that can take the values "x",
- "y" or "z". The default value is "x". The formatting of the labels is
-@@ -1261,9 +1261,10 @@
- interpreted as filename globbing patterns (as they are used by Unix shells).
- Within a pattern
- @table @code
--@itemx *
-+
-+@item *
- matches any string, including the null string,
--@itemx ?
-+@item ?
- matches any single character, and
-
- @item [@dots{}]
-@@ -2789,8 +2790,8 @@
- Display a header containing the current Octave version number, license
- string and operating system, followed by the installed package names,
- versions, and installation directories.
--
--@deftypefnx {Function File} {v =} ver ()
-+@end deftypefn
-+@deftypefn {Function File} {v =} ver ()
- Return a vector of structures, respecting Octave and each installed package.
- The structure includes the following fields.
-
-@@ -2807,11 +2808,11 @@
- @item Date
- Date respecting the version/revision.
- @end table
--
--@deftypefnx {Function File} {v =} ver ("Octave")
-+@end deftypefn
-+@deftypefn {Function File} {v =} ver ("Octave")
- Return version information for Octave only.
--
--@deftypefnx {Function File} {v =} ver (@var{package})
-+@end deftypefn
-+@deftypefn {Function File} {v =} ver (@var{package})
- Return version information for @var{package}.
-
- @seealso{@ref{doc-version,,version}, @ref{doc-octave_config_info,,octave_config_info}}
-@@ -2878,19 +2879,19 @@
- @anchor{doc-license}
- @deftypefn {Function File} {} license
- Display the license of Octave.
--
--@deftypefnx {Function File} {} license ("inuse")
-+@end deftypefn
-+@deftypefn {Function File} {} license ("inuse")
- Display a list of packages currently being used.
--
--@deftypefnx {Function File} {@var{retval} =} license ("inuse")
-+@end deftypefn
-+@deftypefn {Function File} {@var{retval} =} license ("inuse")
- Return a structure containing the fields @code{feature} and @code{user}.
--
--@deftypefnx {Function File} {@var{retval} =} license ("test", @var{feature})
-+@end deftypefn
-+@deftypefn {Function File} {@var{retval} =} license ("test", @var{feature})
- Return 1 if a license exists for the product identified by the string
- @var{feature} and 0 otherwise. The argument @var{feature} is case
- insensitive and only the first 27 characters are checked.
--
--@deftypefnx {Function File} {} license ("test", @var{feature}, @var{toggle})
-+@end deftypefn
-+@deftypefn {Function File} {} license ("test", @var{feature}, @var{toggle})
- Enable or disable license testing for @var{feature}, depending on
- @var{toggle}, which may be one of:
-
-@@ -2902,8 +2903,8 @@
- @item "disable"
- Future tests for the specified license of @var{feature} return 0.
- @end table
--
--@deftypefnx {Function File} {@var{retval} =} license ("checkout", @var{feature})
-+@end deftypefn
-+@deftypefn {Function File} {@var{retval} =} license ("checkout", @var{feature})
- Check out a license for @var{feature}, returning 1 on success and 0
- on failure.
-
-diff -Nur octave-3.6.4.orig/doc/liboctave/liboctave.texi octave-3.6.4/doc/liboctave/liboctave.texi
---- octave-3.6.4.orig/doc/liboctave/liboctave.texi 2013-02-21 12:19:23.000000000 -0800
-+++ octave-3.6.4/doc/liboctave/liboctave.texi 2013-06-19 08:54:27.914379692 -0700
-@@ -80,10 +80,10 @@
- @end ifnottex
-
- @titlepage
--@title{Octave C++ Classes}
--@subtitle{Edition 1.0 for Octave version @value{VERSION}}
--@subtitle{September 1993}
--@author{John W. Eaton}
-+@title@{Octave C++ Classes@}
-+@subtitle@{Edition 1.0 for Octave version @value{VERSION}@}
-+@subtitle@{September 1993@}
-+@author@{John W. Eaton@}
- @page
- @vskip 0pt plus 1filll
- Copyright @copyright{} 1996, 1997 John W. Eaton.
diff --git a/sci-mathematics/octave/files/octave-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch b/sci-mathematics/octave/files/octave-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
deleted file mode 100644
index 135330d2f45..00000000000
--- a/sci-mathematics/octave/files/octave-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- octave-3.8.0-orig/m4/getcwd.m4 2013-12-28 09:00:39.000000000 +1100
-+++ octave-3.8.0/m4/getcwd.m4 2014-02-15 13:11:06.783512435 +1100
-@@ -108,7 +108,7 @@
-
- gl_abort_bug=no
- case "$host_os" in
-- mingw*)
-+ *-gnu* | gnu* | mingw*)
- gl_cv_func_getcwd_path_max=yes
- ;;
- *)
diff --git a/sci-mathematics/octave/files/octave-3.8.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-3.8.0-imagemagick-configure.patch
deleted file mode 100644
index 1406237fea4..00000000000
--- a/sci-mathematics/octave/files/octave-3.8.0-imagemagick-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- octave-3.8.0-orig/configure.ac 2013-12-28 08:58:28.000000000 +1100
-+++ octave-3.8.0/configure.ac 2014-02-15 20:11:53.821172574 +1100
-@@ -995,11 +995,11 @@
- MAGICK_LIBS=
-
- PKG_CHECK_EXISTS([$magick++], [
-- ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++
-+ ## Make sure we only get -I, -D, -L, and -l flags. Some Graphics/ImageMagick++
- ## packages add extra flags that are useful when building
- ## Graphics/ImageMagick++ extentions. These extra flags break the
- ## Octave build.
-- MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
-+ MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'`
- MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
- MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
-
diff --git a/sci-mathematics/octave/files/octave-3.8.1-imagemagick.patch b/sci-mathematics/octave/files/octave-3.8.1-imagemagick.patch
deleted file mode 100644
index f3415505dff..00000000000
--- a/sci-mathematics/octave/files/octave-3.8.1-imagemagick.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- octave-3.8.1-orig/libinterp/dldfcn/__magick_read__.cc 2014-03-07 06:37:51.000000000 +1100
-+++ octave-3.8.1/libinterp/dldfcn/__magick_read__.cc 2014-03-09 00:18:04.593088077 +1100
-@@ -38,8 +38,15 @@
- #include "gripes.h"
-
- #ifdef HAVE_MAGICK
--
-+#define MAGICKCORE_EXCLUDE_DEPRECATED 1
- #include <Magick++.h>
-+#if !defined(QuantumRange) && defined(MaxRGB)
-+#define QuantumRange MaxRGB
-+#endif
-+#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth)
-+#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth
-+#endif
-+
- #include <clocale>
-
- // In theory, it should be enough to check the class:
-@@ -104,12 +111,18 @@
- get_depth (Magick::Image& img)
- {
- octave_idx_type depth = img.depth ();
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#define Magick MagickCore
-+#endif
- if (depth == 8
- && img.channelDepth (Magick::RedChannel) == 1
- && img.channelDepth (Magick::CyanChannel) == 1
- && img.channelDepth (Magick::OpacityChannel) == 1
- && img.channelDepth (Magick::GrayChannel) == 1)
- depth = 1;
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#undef Magick
-+#endif
-
- return depth;
- }
-@@ -332,7 +345,10 @@
- if (imvec[def_elem].depth () == 32)
- divisor = std::numeric_limits<uint32_t>::max ();
- else
-- divisor = MaxRGB / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
-+ {
-+ using namespace Magick;
-+ divisor = QuantumRange / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
-+ }
-
- // FIXME: this workaround should probably be fixed in GM by creating a
- // new ImageType BilevelMatteType
-@@ -464,7 +480,8 @@
- for (octave_idx_type row = 0; row < nRows; row++)
- {
- img_fvec[idx] = pix->red / divisor;
-- a_fvec[idx] = (MaxRGB - pix->opacity) / divisor;
-+ using namespace Magick;
-+ a_fvec[idx] = (QuantumRange - pix->opacity) / divisor;
- pix += row_shift;
- idx++;
- }
-@@ -541,7 +558,8 @@
- rbuf[idx] = pix->red / divisor;
- gbuf[idx] = pix->green / divisor;
- bbuf[idx] = pix->blue / divisor;
-- a_fvec[a_idx++] = (MaxRGB - pix->opacity) / divisor;
-+ using namespace Magick;
-+ a_fvec[a_idx++] = (QuantumRange - pix->opacity) / divisor;
- pix += row_shift;
- idx++;
- }
-@@ -626,7 +644,8 @@
- mbuf[idx] = pix->green / divisor;
- ybuf[idx] = pix->blue / divisor;
- kbuf[idx] = pix->opacity / divisor;
-- a_fvec[a_idx++] = (MaxRGB - *apix) / divisor;
-+ using namespace Magick;
-+ a_fvec[a_idx++] = (QuantumRange - *apix) / divisor;
- pix += row_shift;
- idx++;
- }
-@@ -685,9 +704,10 @@
- // Restore locale from before GraphicsMagick initialisation
- setlocale (LC_ALL, locale.c_str ());
-
-- if (QuantumDepth < 32)
-+ using namespace Magick;
-+ if (MAGICKCORE_QUANTUM_DEPTH < 32)
- warning ("your version of %s limits images to %d bits per pixel",
-- MagickPackageName, QuantumDepth);
-+ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
-
- initialized = true;
- }
-@@ -1060,8 +1080,9 @@
- // From GM documentation:
- // Color arguments are must be scaled to fit the Quantum size according to
- // the range of MaxRGB
-+ using namespace Magick;
- const double divisor = static_cast<double>((uint64_t (1) << bitdepth) - 1)
-- / MaxRGB;
-+ / QuantumRange;
-
- const P *img_fvec = img.fortran_vec ();
- const P *a_fvec = alpha.fortran_vec ();
-@@ -1111,8 +1132,9 @@
- for (octave_idx_type row = 0; row < nRows; row++)
- {
- double grey = double (*img_fvec) / divisor;
-+ using namespace Magick;
- Magick::Color c (grey, grey, grey,
-- MaxRGB - (double (*a_fvec) / divisor));
-+ QuantumRange - (double (*a_fvec) / divisor));
- pix[GM_idx] = c;
- img_fvec++;
- a_fvec++;
-@@ -1178,10 +1200,11 @@
- {
- for (octave_idx_type row = 0; row < nRows; row++)
- {
-+ using namespace Magick;
- Magick::Color c (double (*img_fvec) / divisor,
- double (img_fvec[G_offset]) / divisor,
- double (img_fvec[B_offset]) / divisor,
-- MaxRGB - (double (*a_fvec) / divisor));
-+ QuantumRange - (double (*a_fvec) / divisor));
- pix[GM_idx] = c;
- img_fvec++;
- a_fvec++;
-@@ -1257,7 +1280,8 @@
- double (img_fvec[Y_offset]) / divisor,
- double (img_fvec[K_offset]) / divisor);
- pix[GM_idx] = c;
-- ind[GM_idx] = MaxRGB - (double (*a_fvec) / divisor);
-+ using namespace Magick;
-+ ind[GM_idx] = QuantumRange - (double (*a_fvec) / divisor);
- img_fvec++;
- a_fvec++;
- GM_idx += nCols;
diff --git a/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch
deleted file mode 100644
index 5cb27844557..00000000000
--- a/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/scripts/pkg/private/install.m
-+++ b/scripts/pkg/private/install.m
-@@ -62,7 +62,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;
-@@ -89,20 +96,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.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
deleted file mode 100644
index 191446ebdfc..00000000000
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick opengl postscript
- +qhull +qrupdate readline +sparse static-libs X zlib"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-text/ghostscript-gpl
- dev-libs/libpcre
- sys-libs/ncurses:0=
- virtual/lapack
- curl? ( net-misc/curl )
- fftw? ( sci-libs/fftw:3.0 )
- glpk? ( sci-mathematics/glpk )
- gnuplot? ( sci-visualization/gnuplot )
- hdf5? ( sci-libs/hdf5 )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- )
- opengl? (
- media-libs/freetype:2
- media-libs/fontconfig
- >=x11-libs/fltk-1.3:1[opengl]
- virtual/glu )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig )
- qhull? ( media-libs/qhull )
- qrupdate? ( sci-libs/qrupdate )
- readline? ( sys-libs/readline:0 )
- sparse? (
- sci-libs/arpack
- sci-libs/camd
- sci-libs/ccolamd
- sci-libs/cholmod
- sci-libs/colamd
- sci-libs/cxsparse
- sci-libs/umfpack )
- X? ( x11-libs/libX11 )
- zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
- doc? (
- virtual/latex-base
- || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
- sys-apps/texinfo )
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,texi}.patch
- "${FILESDIR}"/${PN}-3.6.3-legendtext.patch
- "${FILESDIR}"/${PN}-3.6.4-texinfo.patch
-)
-
-src_prepare() {
- # nasty prefix hack for fltk:1 linking
- if use prefix && use opengl; then
- sed -i \
- -e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
- configure.ac
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- $(use_enable prefix rpath)
- $(use_enable doc docs)
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
- $(use_with opengl)
- $(use_with qhull)
- $(use_with qrupdate)
- $(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 X x)
- $(use_with zlib z)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- use doc && dodoc $(find doc -name \*.pdf)
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
- doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-3.8.2-r3.ebuild b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
deleted file mode 100644
index 9ae07cee479..00000000000
--- a/sci-mathematics/octave/octave-3.8.2-r3.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
- postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-text/ghostscript-gpl
- dev-libs/libpcre:3=
- sys-libs/ncurses:0=
- virtual/lapack
- curl? ( net-misc/curl:0= )
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:0= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? ( x11-libs/qscintilla:=[qt4(-)] )
- hdf5? ( sci-libs/hdf5:0= )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- )
- java? ( >=virtual/jre-1.6.0:* )
- opengl? (
- media-libs/freetype:2=
- media-libs/fontconfig:1.0=
- >=x11-libs/fltk-1.3:1=[opengl,xft]
- x11-libs/gl2ps:0=
- virtual/glu )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig )
- qhull? ( media-libs/qhull:0= )
- qrupdate? ( sci-libs/qrupdate:0= )
- readline? ( sys-libs/readline:0= )
- sparse? (
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/cxsparse:0=
- sci-libs/umfpack:0= )
- X? ( x11-libs/libX11:0= )
- zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
- java? ( >=virtual/jdk-1.6.0 )
- doc? (
- virtual/latex-base
- || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
- dev-texlive/texlive-metapost
- sys-apps/texinfo )
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.3-texi.patch
- "${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
- "${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
- "${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
-)
-
-src_prepare() {
- # nasty prefix hacks for fltk:1 and qt4 linking
- if use prefix; then
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
- use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
- fi
-
- # Fix bug 501756
- sed -i \
- -e 's@A-Za-z0-9@[:alnum:]@g' \
- -e 's@A-Za-z@[:alpha:]@g' \
- libinterp/mkbuiltins || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- $(use_enable doc docs)
- $(use_enable java)
- $(use_enable gui)
- # requires llvm < 3.5
- --disable-jit
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_enable fftw fftw-threads)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
- $(use_with opengl)
- $(use_with qhull)
- $(use_with qrupdate)
- $(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 X x)
- $(use_with zlib z)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- emake
- if use java ; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- use doc && dodoc $(find doc -name \*.pdf)
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
- doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-4.2.0-r4.ebuild b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
deleted file mode 100644
index 2bbb86439b6..00000000000
--- a/sci-mathematics/octave/octave-4.2.0-r4.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl
- portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-arch/bzip2
- app-text/ghostscript-gpl
- dev-libs/libpcre:3=
- sys-libs/ncurses:0=
- sys-libs/zlib
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:0= )
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:0= )
- gnuplot? ( sci-visualization/gnuplot )
- hdf5? ( sci-libs/hdf5:0= )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- )
- java? ( >=virtual/jre-1.6.0:* )
- opengl? (
- media-libs/freetype:2=
- media-libs/fontconfig:1.0=
- >=x11-libs/fltk-1.3:1=[opengl,xft]
- x11-libs/gl2ps:0=
- virtual/glu
- )
- openssl? ( dev-libs/openssl:0= )
- portaudio? ( media-libs/portaudio )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig
- )
- qhull? ( media-libs/qhull:0= )
- qrupdate? ( sci-libs/qrupdate:0= )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
- )
- readline? ( sys-libs/readline:0= )
- sndfile? ( media-libs/libsndfile )
- sparse? (
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/cxsparse:0=
- sci-libs/umfpack:0=
- )
- X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
- gui? ( dev-qt/linguist-tools:5 )
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
- java? ( >=virtual/jdk-1.6.0 )
- doc? (
- virtual/latex-base
- dev-texlive/texlive-fontsrecommended
- || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
- dev-texlive/texlive-metapost
- )
- sys-apps/texinfo
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.2.0-texi.patch
- "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
- "${FILESDIR}"/${PN}-4.2.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-4.2.0-imagemagick.patch
- "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch
- "${FILESDIR}"/${PN}-4.2.0-ncurses-pkgconfig.patch
- "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
- "${FILESDIR}"/${PN}-4.2.0-fix-qscintilla-detection.patch
-)
-
-src_prepare() {
- # nasty prefix hacks for fltk:1 and qt4 linking
- if use prefix; then
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
- fi
-
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- # [QA] detect underlinking #593670
- append-ldflags $(test-flags-CXX -Wl,-z,defs)
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- econf \
- --localstatedir="${EPREFIX}/var/state/octave" \
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
- --disable-64 \
- --disable-jit \
- --enable-shared \
- --with-z \
- --with-bz2 \
- --without-OSMesa \
- $(use_enable static-libs static) \
- $(use_enable doc docs) \
- $(use_enable java) \
- $(use_enable readline) \
- $(use_with curl) \
- $(use_with fftw fftw3) \
- $(use_with fftw fftw3f) \
- $(use_enable fftw fftw-threads) \
- $(use_with glpk) \
- $(use_with hdf5) \
- $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
- $(use_with opengl) \
- $(use_with opengl fltk) \
- $(use_with openssl) \
- $(use_with portaudio) \
- $(use_with qhull) \
- $(use_with qrupdate) \
- $(use_with gui qt 5) \
- $(use_with sndfile) \
- $(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 X x)
-}
-
-src_compile() {
- default
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- default
- if use doc; then
- dodoc $(find doc -name '*.pdf')
- else
- # bug 566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- use java && \
- java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
- doenvd 99octave
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2016-11-20 20:38 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2016-11-20 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 4ab72caed4c1866930393039b185cce8b20248c9
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 20:17:18 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 20:37:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab72cae
sci-mathematics/octave: Remove old
Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2872
sci-mathematics/octave/Manifest | 4 -
.../octave/files/octave-3.6.4-gcc-4.8.patch | 34 -----
.../octave/files/octave-3.8.0-pkgbuilddir.patch | 40 -----
.../files/octave-4.0.0-imagemagick-configure.patch | 16 --
.../octave/files/octave-4.0.0-imagemagick.patch | 139 -----------------
.../octave/files/octave-4.0.0-texinfo.patch | 63 --------
.../octave/files/octave-4.0.3-imagemagick.patch | 139 -----------------
.../files/octave-4.0.3-ncurses-pkgconfig.patch | 42 -----
.../files/octave-4.0.3-zlib-underlinking.patch | 13 --
sci-mathematics/octave/octave-3.6.4-r1.ebuild | 132 ----------------
sci-mathematics/octave/octave-4.0.0-r1.ebuild | 169 --------------------
sci-mathematics/octave/octave-4.0.0.ebuild | 158 -------------------
sci-mathematics/octave/octave-4.0.1-r1.ebuild | 164 --------------------
sci-mathematics/octave/octave-4.0.1.ebuild | 158 -------------------
sci-mathematics/octave/octave-4.0.2-r2.ebuild | 164 --------------------
sci-mathematics/octave/octave-4.0.3.ebuild | 170 ---------------------
16 files changed, 1605 deletions(-)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 516c99f..c2b7f89 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,7 +1,3 @@
DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
DIST octave-3.8.2.tar.bz2 17834980 SHA256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc WHIRLPOOL c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
-DIST octave-4.0.0.tar.xz 15759196 SHA256 cf6be2fac6796fda68971e249c96d026ce4a1b0ed074ce49a5791365a958c474 SHA512 54559686d017b7fe731a89a24e74d08781365028d2799a86f25ebf4c433013eab03e5b4381a992b79e40bce1827a6eee2aefd0798b739128dd8dd7b41d936b89 WHIRLPOOL 0e0154dac5ac76268d99533186a88f54bc811817cdf2222c3c0bc22ff456fd23829f7015eebcb9d441665c1d2782ed57c06ab00880f64d63b22ef4aad43f132a
-DIST octave-4.0.1.tar.xz 15637340 SHA256 d58f4861f93dbf4c98f3574d6066cfa25001349bd58ce063cf443efba4e1c287 SHA512 7fa22b50c9116c917b2a2bd63d81a8106eba95842a5de736fbf89ee6ea3dbd5542c183ab6229b62f548ad07abbf67514152a8e553e8fbdf86036d44ced669798 WHIRLPOOL 7bcc16a1e01543dc0baab92993a305c6fea7fc9eb9d806004a1b3e11479c34d8a40000de60e2291a27c846d54abc35883a16583bc324681d7897624fa40d98bb
-DIST octave-4.0.2.tar.xz 15668728 SHA256 98c11ecead8ea759eb1d010ad6319a63a1c6199d3a7e2abbafe453c753090403 SHA512 e79d43528d47a2b3f0fbc9e43eefd5fb8e199dd3818ffd745c1424c7cfca9397186dab129b6f61ee52f5c5203d613e5290d8dc5e32b318cfdd3d38f7facf63cd WHIRLPOOL bf870ef3b6affb4a157951d99132078f528b52be403f7d01bfd98fd657d4089ebbf5fb78f340ce18e59ae27d5eddb9edbbf76583810bcf2dbd5c9ce8ea3434cd
-DIST octave-4.0.3.tar.xz 15697064 SHA256 dc2bec8c68fa5733a5847563634b1729356a84f3a5071008ecdb793293f0aa85 SHA512 bad009235b04be09c051dd27ebef7df2542adec0a0b57c070662deebe33a0cdceb7d6816653f5afc3fc0cc1287ba1ca1a5c50858169004210224039374c9c55d WHIRLPOOL 69546306417c85b65ae371035be906d5968b1af358ba16ff3c979a925766be92b933d386b6b594c70befaf8ddd95cf27fcd94934c03713688d05141e86a92dd0
DIST octave-4.2.0.tar.gz 25320153 SHA256 443ba73782f3531c94bcf016f2f0362a58e186ddb8269af7dcce973562795567 SHA512 5d16665d4ef8f218320f471704f8702f3a2911cc4a083cae318c1df0f787d50dddbc511dc91e11379314d65cecac6d521abac026860feca19d11ffdb52d3e678 WHIRLPOOL b5973f4e96aa4785436afa7fcc637cce021e4b5e93c3368f61712c808191bc26e3ece9d649f0b99e3df03672cb6df16c28cad931f3317b555f4f3167e4092f34
diff --git a/sci-mathematics/octave/files/octave-3.6.4-gcc-4.8.patch b/sci-mathematics/octave/files/octave-3.6.4-gcc-4.8.patch
deleted file mode 100644
index 1e13ebc..00000000
--- a/sci-mathematics/octave/files/octave-3.6.4-gcc-4.8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Fix compilation of C++ MEX files with GCC 4.8
- The header mex.h was including mexproto.h within an extern "C" block. In turn,
- mexproto.h includes cstdlib.
- .
- Apparently, including cstdlib within an extern "C" block was working with GCC
- 4.7, but this is no longer the case with GCC 4.8.
- .
- The fix consists in including mexproto.h outside of the extern "C" block.
-Author: Sébastien Villemot <sebastien@debian.org>
-Bug: https://savannah.gnu.org/bugs/index.php?38746
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705485
-Last-Update: 2013-05-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/mex.h
-+++ b/src/mex.h
-@@ -64,6 +64,8 @@
-
- #define mxMAXNAME 64
-
-+#include "mexproto.h"
-+
- #if defined (__cplusplus)
- extern "C" {
- #endif
-@@ -74,8 +76,6 @@
- void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]);
- #endif
-
--#include "mexproto.h"
--
- /* V4 floating point routines renamed in V5. */
- #define mexIsNaN mxIsNaN
- #define mexIsFinite mxIsFinite
diff --git a/sci-mathematics/octave/files/octave-3.8.0-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-3.8.0-pkgbuilddir.patch
deleted file mode 100644
index 983f6b5..00000000
--- a/sci-mathematics/octave/files/octave-3.8.0-pkgbuilddir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- octave-3.8.0-orig/scripts/pkg/private/install.m 2013-12-28 08:57:42.000000000 +1100
-+++ octave-3.8.0/scripts/pkg/private/install.m 2014-02-10 00:59:40.747194765 +1100
-@@ -63,6 +63,14 @@
- 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;
-@@ -89,20 +97,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/files/octave-4.0.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.0.0-imagemagick-configure.patch
deleted file mode 100644
index 4e88ac0..00000000
--- a/sci-mathematics/octave/files/octave-4.0.0-imagemagick-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- octave-4.0.0-orig/configure.ac 2015-05-27 02:16:39.000000000 +1000
-+++ octave-4.0.0/configure.ac 2015-07-06 18:11:43.461136517 +1000
-@@ -1086,11 +1086,11 @@
- MAGICK_LIBS=
-
- PKG_CHECK_EXISTS([$magick++], [
-- ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++
-+ ## Make sure we only get -I, -D, -L, and -l flags. Some Graphics/ImageMagick++
- ## packages add extra flags that are useful when building
- ## Graphics/ImageMagick++ extentions. These extra flags break the
- ## Octave build.
-- MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
-+ MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'`
- MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
- MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
-
diff --git a/sci-mathematics/octave/files/octave-4.0.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.0.0-imagemagick.patch
deleted file mode 100644
index 9e36891..00000000
--- a/sci-mathematics/octave/files/octave-4.0.0-imagemagick.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- octave-4.0.0-orig/libinterp/dldfcn/__magick_read__.cc 2015-05-24 00:21:53.000000000 +1000
-+++ octave-4.0.0/libinterp/dldfcn/__magick_read__.cc 2015-07-06 18:17:52.263146804 +1000
-@@ -38,8 +38,15 @@
- #include "gripes.h"
-
- #ifdef HAVE_MAGICK
--
-+#define MAGICKCORE_EXCLUDE_DEPRECATED 1
- #include <Magick++.h>
-+#if !defined(QuantumRange) && defined(MaxRGB)
-+#define QuantumRange MaxRGB
-+#endif
-+#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth)
-+#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth
-+#endif
-+
- #include <clocale>
-
- // In theory, it should be enough to check the class:
-@@ -121,12 +128,18 @@
- get_depth (Magick::Image& img)
- {
- octave_idx_type depth = img.depth ();
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#define Magick MagickCore
-+#endif
- if (depth == 8
- && img.channelDepth (Magick::RedChannel) == 1
- && img.channelDepth (Magick::CyanChannel) == 1
- && img.channelDepth (Magick::OpacityChannel) == 1
- && img.channelDepth (Magick::GrayChannel) == 1)
- depth = 1;
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#undef Magick
-+#endif
-
- return depth;
- }
-@@ -350,7 +363,10 @@
- if (imvec[def_elem].depth () == 32)
- divisor = std::numeric_limits<uint32_t>::max ();
- else
-- divisor = MaxRGB / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
-+ {
-+ using namespace Magick;
-+ divisor = QuantumRange / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
-+ }
-
- // FIXME: this workaround should probably be fixed in GM by creating a
- // new ImageType BilevelMatteType
-@@ -484,7 +500,8 @@
- for (octave_idx_type row = 0; row < nRows; row++)
- {
- img_fvec[idx] = pix->red / divisor;
-- a_fvec[idx] = (MaxRGB - pix->opacity) / divisor;
-+ using namespace Magick;
-+ a_fvec[idx] = (QuantumRange - pix->opacity) / divisor;
- pix += row_shift;
- idx++;
- }
-@@ -563,7 +580,8 @@
- rbuf[idx] = pix->red / divisor;
- gbuf[idx] = pix->green / divisor;
- bbuf[idx] = pix->blue / divisor;
-- a_fvec[a_idx++] = (MaxRGB - pix->opacity) / divisor;
-+ using namespace Magick;
-+ a_fvec[a_idx++] = (QuantumRange - pix->opacity) / divisor;
- pix += row_shift;
- idx++;
- }
-@@ -650,7 +668,8 @@
- mbuf[idx] = pix->green / divisor;
- ybuf[idx] = pix->blue / divisor;
- kbuf[idx] = pix->opacity / divisor;
-- a_fvec[a_idx++] = (MaxRGB - *apix) / divisor;
-+ using namespace Magick;
-+ a_fvec[a_idx++] = (QuantumRange - *apix) / divisor;
- pix += row_shift;
- idx++;
- }
-@@ -709,10 +728,11 @@
- // Restore locale from before GraphicsMagick initialisation
- setlocale (LC_ALL, locale.c_str ());
-
-- if (QuantumDepth < 32)
-+ using namespace Magick;
-+ if (MAGICKCORE_QUANTUM_DEPTH < 32)
- warning_with_id ("Octave:GraphicsMagic-Quantum-Depth",
- "your version of %s limits images to %d bits per pixel",
-- MagickPackageName, QuantumDepth);
-+ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
-
- initialized = true;
- }
-@@ -1087,8 +1107,9 @@
- // From GM documentation:
- // Color arguments are must be scaled to fit the Quantum size according to
- // the range of MaxRGB
-+ using namespace Magick;
- const double divisor = static_cast<double>((uint64_t (1) << bitdepth) - 1)
-- / MaxRGB;
-+ / QuantumRange;
-
- const P *img_fvec = img.fortran_vec ();
- const P *a_fvec = alpha.fortran_vec ();
-@@ -1140,8 +1161,9 @@
- for (octave_idx_type row = 0; row < nRows; row++)
- {
- double grey = double (*img_fvec) / divisor;
-+ using namespace Magick;
- Magick::Color c (grey, grey, grey,
-- MaxRGB - (double (*a_fvec) / divisor));
-+ QuantumRange - (double (*a_fvec) / divisor));
- pix[GM_idx] = c;
- img_fvec++;
- a_fvec++;
-@@ -1209,10 +1231,11 @@
- {
- for (octave_idx_type row = 0; row < nRows; row++)
- {
-+ using namespace Magick;
- Magick::Color c (double (*img_fvec) / divisor,
- double (img_fvec[G_offset]) / divisor,
- double (img_fvec[B_offset]) / divisor,
-- MaxRGB - (double (*a_fvec) / divisor));
-+ QuantumRange - (double (*a_fvec) / divisor));
- pix[GM_idx] = c;
- img_fvec++;
- a_fvec++;
-@@ -1290,7 +1313,8 @@
- double (img_fvec[Y_offset]) / divisor,
- double (img_fvec[K_offset]) / divisor);
- pix[GM_idx] = c;
-- ind[GM_idx] = MaxRGB - (double (*a_fvec) / divisor);
-+ using namespace Magick;
-+ ind[GM_idx] = QuantumRange - (double (*a_fvec) / divisor);
- img_fvec++;
- a_fvec++;
- GM_idx += nCols;
diff --git a/sci-mathematics/octave/files/octave-4.0.0-texinfo.patch b/sci-mathematics/octave/files/octave-4.0.0-texinfo.patch
deleted file mode 100644
index d94e751..00000000
--- a/sci-mathematics/octave/files/octave-4.0.0-texinfo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -r 3300cb76cccd -r 2ec049e50ed8 libinterp/corefcn/utils.cc
---- a/libinterp/corefcn/utils.cc Tue Jul 07 19:09:35 2015 -0700
-+++ b/libinterp/corefcn/utils.cc Thu Jul 09 21:44:09 2015 -0400
-@@ -1379,7 +1379,7 @@
- \n\
- Implementation Note: Strings are first converted to double values before the\n\
- checks for valid indices are made. Unless a string contains the NULL\n\
--character @nospell{\"\\0\"}, it will always be a valid index.\n\
-+character @nospell{\"@xbackslashchar{}0\"}, it will always be a valid index.\n\
- @end deftypefn")
- {
- octave_value retval;
-diff -r 3300cb76cccd -r 2ec049e50ed8 scripts/io/beep.m
---- a/scripts/io/beep.m Tue Jul 07 19:09:35 2015 -0700
-+++ b/scripts/io/beep.m Thu Jul 09 21:44:09 2015 -0400
-@@ -20,9 +20,9 @@
- ## @deftypefn {Function File} {} beep ()
- ## Produce a beep from the speaker (or visual bell).
- ##
--## This function sends the alarm character @qcode{"\a"} to the terminal.
--## Depending on the user's configuration this may produce an audible beep,
--## a visual bell, or nothing at all.
-+## This function sends the alarm character @qcode{"@xbackslashchar{}a"} to
-+## the terminal. Depending on the user's configuration this may produce an
-+## audible beep, a visual bell, or nothing at all.
- ## @seealso{puts, fputs, printf, fprintf}
- ## @end deftypefn
-
-diff -r 2ec049e50ed8 -r 45d7be391982 doc/Makefile.am
---- a/doc/Makefile.am Thu Jul 09 21:44:09 2015 -0400
-+++ b/doc/Makefile.am Thu Jul 09 21:45:26 2015 -0400
-@@ -26,7 +26,6 @@
-
- EXTRA_DIST = \
- Makefile.am \
-- texinfo.tex \
- texmf.cnf
-
- SUBDIRS = doxyhtml interpreter liboctave refcard
-diff -r 2ec049e50ed8 -r 45d7be391982 doc/interpreter/Makefile.am
---- a/doc/interpreter/Makefile.am Thu Jul 09 21:44:09 2015 -0400
-+++ b/doc/interpreter/Makefile.am Thu Jul 09 21:45:26 2015 -0400
-@@ -20,8 +20,6 @@
-
- include $(top_srcdir)/build-aux/common.mk
-
--TEXINFO_TEX = ../texinfo.tex
--
- ## Leading PATH_SEPARATOR required due to weak parsing by dvips (12/04/09)
- TEXINPUTS := "$(PATH_SEPARATOR)$(srcdir)$(PATH_SEPARATOR)$(TEXINPUTS)$(PATH_SEPARATOR)"
- export TEXINPUTS
-diff -r 2ec049e50ed8 -r 45d7be391982 doc/liboctave/Makefile.am
---- a/doc/liboctave/Makefile.am Thu Jul 09 21:44:09 2015 -0400
-+++ b/doc/liboctave/Makefile.am Thu Jul 09 21:45:26 2015 -0400
-@@ -20,8 +20,6 @@
-
- include $(top_srcdir)/build-aux/common.mk
-
--TEXINFO_TEX = ../texinfo.tex
--
- info_TEXINFOS = liboctave.texi
-
- liboctave_TEXINFOS = \
diff --git a/sci-mathematics/octave/files/octave-4.0.3-imagemagick.patch b/sci-mathematics/octave/files/octave-4.0.3-imagemagick.patch
deleted file mode 100644
index 5ad31c2..00000000
--- a/sci-mathematics/octave/files/octave-4.0.3-imagemagick.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- octave-4.0.3/libinterp/corefcn/__magick_read__.cc
-+++ octave-4.0.3/libinterp/corefcn/__magick_read__.cc
-@@ -38,8 +38,15 @@
- #include "gripes.h"
-
- #ifdef HAVE_MAGICK
--
-+#define MAGICKCORE_EXCLUDE_DEPRECATED 1
- #include <Magick++.h>
-+#if !defined(QuantumRange) && defined(MaxRGB)
-+#define QuantumRange MaxRGB
-+#endif
-+#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth)
-+#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth
-+#endif
-+
- #include <clocale>
-
- // In theory, it should be enough to check the class:
-@@ -121,12 +128,18 @@
- get_depth (Magick::Image& img)
- {
- octave_idx_type depth = img.depth ();
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#define Magick MagickCore
-+#endif
- if (depth == 8
- && img.channelDepth (Magick::RedChannel) == 1
- && img.channelDepth (Magick::CyanChannel) == 1
- && img.channelDepth (Magick::OpacityChannel) == 1
- && img.channelDepth (Magick::GrayChannel) == 1)
- depth = 1;
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#undef Magick
-+#endif
-
- return depth;
- }
-@@ -350,7 +363,10 @@
- if (imvec[def_elem].depth () == 32)
- divisor = std::numeric_limits<uint32_t>::max ();
- else
-- divisor = MaxRGB / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
-+ {
-+ using namespace Magick;
-+ divisor = QuantumRange / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
-+ }
-
- // FIXME: this workaround should probably be fixed in GM by creating a
- // new ImageType BilevelMatteType
-@@ -484,7 +500,8 @@
- for (octave_idx_type row = 0; row < nRows; row++)
- {
- img_fvec[idx] = pix->red / divisor;
-- a_fvec[idx] = (MaxRGB - pix->opacity) / divisor;
-+ using namespace Magick;
-+ a_fvec[idx] = (QuantumRange - pix->opacity) / divisor;
- pix += row_shift;
- idx++;
- }
-@@ -563,7 +580,8 @@
- rbuf[idx] = pix->red / divisor;
- gbuf[idx] = pix->green / divisor;
- bbuf[idx] = pix->blue / divisor;
-- a_fvec[a_idx++] = (MaxRGB - pix->opacity) / divisor;
-+ using namespace Magick;
-+ a_fvec[a_idx++] = (QuantumRange - pix->opacity) / divisor;
- pix += row_shift;
- idx++;
- }
-@@ -650,7 +668,8 @@
- mbuf[idx] = pix->green / divisor;
- ybuf[idx] = pix->blue / divisor;
- kbuf[idx] = pix->opacity / divisor;
-- a_fvec[a_idx++] = (MaxRGB - *apix) / divisor;
-+ using namespace Magick;
-+ a_fvec[a_idx++] = (QuantumRange - *apix) / divisor;
- pix += row_shift;
- idx++;
- }
-@@ -709,10 +728,11 @@
- // Restore locale from before GraphicsMagick initialisation
- setlocale (LC_ALL, locale.c_str ());
-
-- if (QuantumDepth < 32)
-+ using namespace Magick;
-+ if (MAGICKCORE_QUANTUM_DEPTH < 32)
- warning_with_id ("Octave:GraphicsMagic-Quantum-Depth",
- "your version of %s limits images to %d bits per pixel",
-- MagickPackageName, QuantumDepth);
-+ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
-
- initialized = true;
- }
-@@ -1087,8 +1107,9 @@
- // From GM documentation:
- // Color arguments are must be scaled to fit the Quantum size according to
- // the range of MaxRGB
-+ using namespace Magick;
- const double divisor = static_cast<double>((uint64_t (1) << bitdepth) - 1)
-- / MaxRGB;
-+ / QuantumRange;
-
- const P *img_fvec = img.fortran_vec ();
- const P *a_fvec = alpha.fortran_vec ();
-@@ -1140,8 +1161,9 @@
- for (octave_idx_type row = 0; row < nRows; row++)
- {
- double grey = xround (double (*img_fvec) / divisor);
-+ using namespace Magick;
- Magick::Color c (grey, grey, grey,
-- MaxRGB - xround (double (*a_fvec) / divisor));
-+ QuantumRange - (double (*a_fvec) / divisor));
- pix[GM_idx] = c;
- img_fvec++;
- a_fvec++;
-@@ -1209,10 +1231,11 @@
- {
- for (octave_idx_type row = 0; row < nRows; row++)
- {
-+ using namespace Magick;
- Magick::Color c (xround (double (*img_fvec) / divisor),
- xround (double (img_fvec[G_offset]) / divisor),
- xround (double (img_fvec[B_offset]) / divisor),
-- MaxRGB - xround (double (*a_fvec) / divisor));
-+ QuantumRange - (double (*a_fvec) / divisor));
- pix[GM_idx] = c;
- img_fvec++;
- a_fvec++;
-@@ -1290,7 +1313,8 @@
- xround (double (img_fvec[Y_offset]) / divisor),
- xround (double (img_fvec[K_offset]) / divisor));
- pix[GM_idx] = c;
-- ind[GM_idx] = MaxRGB - xround (double (*a_fvec) / divisor);
-+ using namespace Magick;
-+ ind[GM_idx] = QuantumRange - (double (*a_fvec) / divisor);
- img_fvec++;
- a_fvec++;
- GM_idx += nCols;
diff --git a/sci-mathematics/octave/files/octave-4.0.3-ncurses-pkgconfig.patch b/sci-mathematics/octave/files/octave-4.0.3-ncurses-pkgconfig.patch
deleted file mode 100644
index 2034274..00000000
--- a/sci-mathematics/octave/files/octave-4.0.3-ncurses-pkgconfig.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Instead of trying to find obscure termcap libraries, use pkg-config
-to detect the proper flags required for curses support.
-See also:
-https://bugs.gentoo.org/show_bug.cgi?id=590676
-
---- a/m4/acinclude.m4
-+++ b/m4/acinclude.m4
-@@ -1085,32 +1085,8 @@
- dnl Find a suitable termlib to use.
- dnl
- AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [
-- TERM_LIBS=
-- ac_octave_save_LIBS="$LIBS"
-- AC_SEARCH_LIBS([tputs],
-- [ncurses curses termcap terminfo termlib],
-- [], [])
-- LIBS="$ac_octave_save_LIBS"
-- case "$ac_cv_search_tputs" in
-- -l*)
-- TERM_LIBS="$ac_cv_search_tputs"
-- ;;
-- no)
-- warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!"
-- AC_MSG_WARN([$warn_termlibs])
-- ;;
-- esac
--
--dnl Old code (9/9/2012). Delete when new code is definitely proven.
--dnl
--dnl for _termlib in ncurses curses termcap terminfo termlib; do
--dnl AC_CHECK_LIB([${_termlib}], [tputs], [
--dnl TERM_LIBS="-l${termlib}"
--dnl octave_cv_lib_found_termlib=yes
--dnl break])
--dnl done
--
-- AC_SUBST(TERM_LIBS)
-+ PKG_CHECK_MODULES([TERM], [ncurses])
-+ CPPFLAGS="${CPPFLAGS} ${TERM_CFLAGS}"
- ])
- dnl
- dnl Check for the Qhull version.
diff --git a/sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch b/sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch
deleted file mode 100644
index 7bc1187..00000000
--- a/sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix underlinking caused by missing -lz link.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=593670
-
---- a/libinterp/corefcn/module.mk
-+++ b/libinterp/corefcn/module.mk
-@@ -361,6 +361,7 @@
- $(HDF5_CPPFLAGS) \
- $(LLVM_CPPFLAGS) \
- $(Z_CPPFLAGS)
-+corefcn_libcorefcn_la_LIBADD = $(Z_LIBS)
-
- corefcn_libcorefcn_la_CXXFLAGS = $(AM_CXXFLAGS) $(LLVM_CXXFLAGS)
-
diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
deleted file mode 100644
index 3aeefdd..00000000
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick opengl postscript
- +qhull +qrupdate readline +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-text/ghostscript-gpl
- dev-libs/libpcre
- sys-libs/ncurses:0=
- virtual/lapack
- curl? ( net-misc/curl )
- fftw? ( sci-libs/fftw:3.0 )
- glpk? ( sci-mathematics/glpk )
- gnuplot? ( sci-visualization/gnuplot )
- hdf5? ( sci-libs/hdf5 )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- opengl? (
- media-libs/freetype:2
- media-libs/fontconfig
- >=x11-libs/fltk-1.3:1[opengl]
- virtual/glu )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig )
- qhull? ( media-libs/qhull )
- qrupdate? ( sci-libs/qrupdate )
- readline? ( sys-libs/readline:0 )
- sparse? (
- sci-libs/arpack
- sci-libs/camd
- sci-libs/ccolamd
- sci-libs/cholmod
- sci-libs/colamd
- sci-libs/cxsparse
- sci-libs/umfpack )
- X? ( x11-libs/libX11 )
- zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
- doc? (
- virtual/latex-base
- dev-texlive/texlive-genericrecommended
- dev-texlive/texlive-metapost
- sys-apps/texinfo )
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,texi}.patch
- "${FILESDIR}"/${PN}-3.6.3-legendtext.patch
- "${FILESDIR}"/${P}-texinfo.patch
- "${FILESDIR}"/${P}-gcc-4.8.patch
-)
-
-src_prepare() {
- # nasty prefix hack for fltk:1 linking
- if use prefix && use opengl; then
- sed -i \
- -e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
- configure.ac
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- $(use_enable prefix rpath)
- $(use_enable doc docs)
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with opengl)
- $(use_with qhull)
- $(use_with qrupdate)
- $(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 X x)
- $(use_with zlib z)
- )
- if use graphicsmagick; then
- myeconfargs+=( "--with-magick=GraphicsMagick" )
- elif use imagemagick; then
- myeconfargs+=( "--with-magick=ImageMagick" )
- else
- myeconfargs+=( "--without-magick" )
- fi
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- use doc && dodoc $(find doc -name \*.pdf)
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
- doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
deleted file mode 100644
index d3b1bf3..00000000
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
- postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-text/ghostscript-gpl
- dev-libs/libpcre:3=
- sys-libs/ncurses:0=
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:0= )
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:0= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? ( x11-libs/qscintilla:0= )
- hdf5? ( sci-libs/hdf5:0= )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- java? ( >=virtual/jre-1.6.0:* )
- opengl? (
- media-libs/freetype:2=
- media-libs/fontconfig:1.0=
- >=x11-libs/fltk-1.3:1=[opengl,xft]
- x11-libs/gl2ps:0=
- virtual/glu )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig )
- qhull? ( media-libs/qhull:0= )
- qrupdate? ( sci-libs/qrupdate:0= )
- readline? ( sys-libs/readline:0= )
- sparse? (
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/cxsparse:0=
- sci-libs/umfpack:0= )
- X? ( x11-libs/libX11:0= )
- zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
- java? ( >=virtual/jdk-1.6.0 )
- doc? (
- virtual/latex-base
- dev-texlive/texlive-genericrecommended
- dev-texlive/texlive-metapost )
- sys-apps/texinfo
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.3-texi.patch
- "${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick.patch
- "${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
-)
-
-src_prepare() {
- # nasty prefix hacks for fltk:1 and qt4 linking
- if use prefix; then
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
- use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
- fi
-
- # Fix bug 501756
- sed -i \
- -e 's@A-Za-z0-9@[:alnum:]@g' \
- -e 's@A-Za-z@[:alpha:]@g' \
- libinterp/mkbuiltins || die
-
- # Fix bug 554226 - sci-mathematics/octave-4.0.0 fails because of a LaTeX error
- epatch "${FILESDIR}"/${PN}-4.0.0-texinfo.patch
- rm -f "${S}"/doc/texinfo.tex || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --disable-64
- --disable-jit
- $(use_enable doc docs)
- $(use_enable java)
- $(use_enable gui)
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_enable fftw fftw-threads)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with opengl)
- $(use_with qhull)
- $(use_with qrupdate)
- $(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 X x)
- $(use_with zlib z)
- )
- if use graphicsmagick; then
- myeconfargs+=( "--with-magick=GraphicsMagick" )
- elif use imagemagick; then
- myeconfargs+=( "--with-magick=ImageMagick" )
- else
- myeconfargs+=( "--without-magick" )
- fi
- autotools-utils_src_configure
-}
-
-src_compile() {
- emake
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dodoc $(find doc -name \*.pdf)
- else
- # bug 566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
- doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
deleted file mode 100644
index 813c601..00000000
--- a/sci-mathematics/octave/octave-4.0.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
- postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-text/ghostscript-gpl
- dev-libs/libpcre:3=
- sys-libs/ncurses:0=
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:0= )
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:0= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? ( x11-libs/qscintilla:0= )
- hdf5? ( sci-libs/hdf5:0= )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- java? ( >=virtual/jre-1.6.0:* )
- opengl? (
- media-libs/freetype:2=
- media-libs/fontconfig:1.0=
- >=x11-libs/fltk-1.3:1=[opengl,xft]
- x11-libs/gl2ps:0=
- virtual/glu )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig )
- qhull? ( media-libs/qhull:0= )
- qrupdate? ( sci-libs/qrupdate:0= )
- readline? ( sys-libs/readline:0= )
- sparse? (
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/cxsparse:0=
- sci-libs/umfpack:0= )
- X? ( x11-libs/libX11:0= )
- zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
- java? ( >=virtual/jdk-1.6.0 )
- doc? (
- virtual/latex-base
- dev-texlive/texlive-genericrecommended
- dev-texlive/texlive-metapost
- sys-apps/texinfo )
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.3-texi.patch
- "${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick.patch
- "${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
-)
-
-src_prepare() {
- # nasty prefix hacks for fltk:1 and qt4 linking
- if use prefix; then
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
- use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
- fi
-
- # Fix bug 501756
- sed -i \
- -e 's@A-Za-z0-9@[:alnum:]@g' \
- -e 's@A-Za-z@[:alpha:]@g' \
- libinterp/mkbuiltins || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --disable-64
- --disable-jit
- $(use_enable doc docs)
- $(use_enable java)
- $(use_enable gui)
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_enable fftw fftw-threads)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with opengl)
- $(use_with qhull)
- $(use_with qrupdate)
- $(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 X x)
- $(use_with zlib z)
- )
- if use graphicsmagick; then
- myeconfargs+=( "--with-magick=GraphicsMagick" )
- elif use imagemagick; then
- myeconfargs+=( "--with-magick=ImageMagick" )
- else
- myeconfargs+=( "--without-magick" )
- fi
- autotools-utils_src_configure
-}
-
-src_compile() {
- emake
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- use doc && dodoc $(find doc -name \*.pdf)
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
- doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
deleted file mode 100644
index ab22a98..00000000
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
- postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-text/ghostscript-gpl
- dev-libs/libpcre:3=
- sys-libs/ncurses:0=
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:0= )
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:0= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? ( x11-libs/qscintilla:0= )
- hdf5? ( sci-libs/hdf5:0= )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- java? ( >=virtual/jre-1.6.0:* )
- opengl? (
- media-libs/freetype:2=
- media-libs/fontconfig:1.0=
- >=x11-libs/fltk-1.3:1=[opengl,xft]
- x11-libs/gl2ps:0=
- virtual/glu )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig )
- qhull? ( media-libs/qhull:0= )
- qrupdate? ( sci-libs/qrupdate:0= )
- readline? ( sys-libs/readline:0= )
- sparse? (
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/cxsparse:0=
- sci-libs/umfpack:0= )
- X? ( x11-libs/libX11:0= )
- zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
- java? ( >=virtual/jdk-1.6.0 )
- doc? (
- virtual/latex-base
- dev-texlive/texlive-genericrecommended
- dev-texlive/texlive-metapost )
- sys-apps/texinfo
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.3-texi.patch
- "${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick.patch
- "${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
-)
-
-src_prepare() {
- # nasty prefix hacks for fltk:1 and qt4 linking
- if use prefix; then
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
- use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
- fi
-
- # Fix bug 501756
- sed -i \
- -e 's@A-Za-z0-9@[:alnum:]@g' \
- -e 's@A-Za-z@[:alpha:]@g' \
- libinterp/mkbuiltins || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --disable-64
- --disable-jit
- $(use_enable doc docs)
- $(use_enable java)
- $(use_enable gui)
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_enable fftw fftw-threads)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with opengl)
- $(use_with qhull)
- $(use_with qrupdate)
- $(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 X x)
- $(use_with zlib z)
- )
- if use graphicsmagick; then
- myeconfargs+=( "--with-magick=GraphicsMagick" )
- elif use imagemagick; then
- myeconfargs+=( "--with-magick=ImageMagick" )
- else
- myeconfargs+=( "--without-magick" )
- fi
- autotools-utils_src_configure
-}
-
-src_compile() {
- emake
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dodoc $(find doc -name \*.pdf)
- else
- # bug 566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
- doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
deleted file mode 100644
index 813c601..00000000
--- a/sci-mathematics/octave/octave-4.0.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
- postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-text/ghostscript-gpl
- dev-libs/libpcre:3=
- sys-libs/ncurses:0=
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:0= )
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:0= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? ( x11-libs/qscintilla:0= )
- hdf5? ( sci-libs/hdf5:0= )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- java? ( >=virtual/jre-1.6.0:* )
- opengl? (
- media-libs/freetype:2=
- media-libs/fontconfig:1.0=
- >=x11-libs/fltk-1.3:1=[opengl,xft]
- x11-libs/gl2ps:0=
- virtual/glu )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig )
- qhull? ( media-libs/qhull:0= )
- qrupdate? ( sci-libs/qrupdate:0= )
- readline? ( sys-libs/readline:0= )
- sparse? (
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/cxsparse:0=
- sci-libs/umfpack:0= )
- X? ( x11-libs/libX11:0= )
- zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
- java? ( >=virtual/jdk-1.6.0 )
- doc? (
- virtual/latex-base
- dev-texlive/texlive-genericrecommended
- dev-texlive/texlive-metapost
- sys-apps/texinfo )
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.3-texi.patch
- "${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick.patch
- "${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
-)
-
-src_prepare() {
- # nasty prefix hacks for fltk:1 and qt4 linking
- if use prefix; then
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
- use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
- fi
-
- # Fix bug 501756
- sed -i \
- -e 's@A-Za-z0-9@[:alnum:]@g' \
- -e 's@A-Za-z@[:alpha:]@g' \
- libinterp/mkbuiltins || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --disable-64
- --disable-jit
- $(use_enable doc docs)
- $(use_enable java)
- $(use_enable gui)
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_enable fftw fftw-threads)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with opengl)
- $(use_with qhull)
- $(use_with qrupdate)
- $(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 X x)
- $(use_with zlib z)
- )
- if use graphicsmagick; then
- myeconfargs+=( "--with-magick=GraphicsMagick" )
- elif use imagemagick; then
- myeconfargs+=( "--with-magick=ImageMagick" )
- else
- myeconfargs+=( "--without-magick" )
- fi
- autotools-utils_src_configure
-}
-
-src_compile() {
- emake
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- use doc && dodoc $(find doc -name \*.pdf)
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
- doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-4.0.2-r2.ebuild b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
deleted file mode 100644
index ab22a98..00000000
--- a/sci-mathematics/octave/octave-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
- postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-text/ghostscript-gpl
- dev-libs/libpcre:3=
- sys-libs/ncurses:0=
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:0= )
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:0= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? ( x11-libs/qscintilla:0= )
- hdf5? ( sci-libs/hdf5:0= )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- java? ( >=virtual/jre-1.6.0:* )
- opengl? (
- media-libs/freetype:2=
- media-libs/fontconfig:1.0=
- >=x11-libs/fltk-1.3:1=[opengl,xft]
- x11-libs/gl2ps:0=
- virtual/glu )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig )
- qhull? ( media-libs/qhull:0= )
- qrupdate? ( sci-libs/qrupdate:0= )
- readline? ( sys-libs/readline:0= )
- sparse? (
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/cxsparse:0=
- sci-libs/umfpack:0= )
- X? ( x11-libs/libX11:0= )
- zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
- java? ( >=virtual/jdk-1.6.0 )
- doc? (
- virtual/latex-base
- dev-texlive/texlive-genericrecommended
- dev-texlive/texlive-metapost )
- sys-apps/texinfo
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.3-texi.patch
- "${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick.patch
- "${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
-)
-
-src_prepare() {
- # nasty prefix hacks for fltk:1 and qt4 linking
- if use prefix; then
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
- use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
- fi
-
- # Fix bug 501756
- sed -i \
- -e 's@A-Za-z0-9@[:alnum:]@g' \
- -e 's@A-Za-z@[:alpha:]@g' \
- libinterp/mkbuiltins || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- local myeconfargs=(
- --localstatedir="${EPREFIX}/var/state/octave"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --disable-64
- --disable-jit
- $(use_enable doc docs)
- $(use_enable java)
- $(use_enable gui)
- $(use_enable readline)
- $(use_with curl)
- $(use_with fftw fftw3)
- $(use_with fftw fftw3f)
- $(use_enable fftw fftw-threads)
- $(use_with glpk)
- $(use_with hdf5)
- $(use_with opengl)
- $(use_with qhull)
- $(use_with qrupdate)
- $(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 X x)
- $(use_with zlib z)
- )
- if use graphicsmagick; then
- myeconfargs+=( "--with-magick=GraphicsMagick" )
- elif use imagemagick; then
- myeconfargs+=( "--with-magick=ImageMagick" )
- else
- myeconfargs+=( "--without-magick" )
- fi
- autotools-utils_src_configure
-}
-
-src_compile() {
- emake
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dodoc $(find doc -name \*.pdf)
- else
- # bug 566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
- doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-4.0.3.ebuild b/sci-mathematics/octave/octave-4.0.3.ebuild
deleted file mode 100644
index 53b5c7e..00000000
--- a/sci-mathematics/octave/octave-4.0.3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
- postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- app-text/ghostscript-gpl
- dev-libs/libpcre:3=
- sys-libs/ncurses:0=
- virtual/blas
- virtual/lapack
- curl? ( net-misc/curl:0= )
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:0= )
- gnuplot? ( sci-visualization/gnuplot )
- gui? ( x11-libs/qscintilla:0= )
- hdf5? ( sci-libs/hdf5:0= )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- imagemagick? ( media-gfx/imagemagick:=[cxx] )
- java? ( >=virtual/jre-1.6.0:* )
- opengl? (
- media-libs/freetype:2=
- media-libs/fontconfig:1.0=
- >=x11-libs/fltk-1.3:1=[opengl,xft]
- x11-libs/gl2ps:0=
- virtual/glu )
- postscript? (
- app-text/epstool
- media-gfx/pstoedit
- media-gfx/transfig )
- qhull? ( media-libs/qhull:0= )
- qrupdate? ( sci-libs/qrupdate:0= )
- readline? ( sys-libs/readline:0= )
- sparse? (
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/ccolamd:0=
- sci-libs/cholmod:0=
- sci-libs/colamd:0=
- sci-libs/cxsparse:0=
- sci-libs/umfpack:0= )
- X? ( x11-libs/libX11:0= )
- sys-libs/zlib"
-
-DEPEND="${RDEPEND}
- qrupdate? ( app-misc/pax-utils )
- sparse? ( app-misc/pax-utils )
- java? ( >=virtual/jdk-1.6.0 )
- doc? (
- virtual/latex-base
- dev-texlive/texlive-genericrecommended
- dev-texlive/texlive-metapost )
- sys-apps/texinfo
- dev-util/gperf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4.3-texi.patch
- "${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
- "${FILESDIR}"/${PN}-4.0.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-4.0.3-imagemagick.patch
- "${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
- "${FILESDIR}"/${PN}-4.0.3-ncurses-pkgconfig.patch
- "${FILESDIR}"/${PN}-4.0.3-zlib-underlinking.patch
-)
-
-src_prepare() {
- # nasty prefix hacks for fltk:1 and qt4 linking
- if use prefix; then
- use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
- use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
- fi
-
- # Fix bug 501756
- sed -i \
- -e 's@A-Za-z0-9@[:alnum:]@g' \
- -e 's@A-Za-z@[:alpha:]@g' \
- libinterp/mkbuiltins || die
-
- # occasional fail on install, force regeneration (bug #401189)
- rm doc/interpreter/contributors.texi || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- # [QA] detect underlinking #593670
- append-ldflags $(test-flags-CXX -Wl,-z,defs)
-
- # unfortunate dependency on mpi from hdf5 (bug #302621)
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- local myconf
- if use graphicsmagick; then
- myconf="--with-magick=GraphicsMagick"
- elif use imagemagick; then
- myconf="--with-magick=ImageMagick"
- else
- myconf="--without-magick"
- fi
-
- econf ${myconf} \
- --localstatedir="${EPREFIX}/var/state/octave" \
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
- --disable-64 \
- --disable-jit \
- --enable-shared \
- --with-z \
- $(use_enable static-libs static) \
- $(use_enable doc docs) \
- $(use_enable java) \
- $(use_enable gui) \
- $(use_enable readline) \
- $(use_with curl) \
- $(use_with fftw fftw3) \
- $(use_with fftw fftw3f) \
- $(use_enable fftw fftw-threads) \
- $(use_with glpk) \
- $(use_with hdf5) \
- $(use_with opengl) \
- $(use_with qhull) \
- $(use_with qrupdate) \
- $(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 X x)
-}
-
-src_compile() {
- default
- if use java; then
- pax-mark m "${S}/src/.libs/octave-cli"
- fi
-}
-
-src_install() {
- default
- if use doc; then
- dodoc $(find doc -name \*.pdf)
- else
- # bug 566134, macros.texi is installed by make install if use doc
- insinto /usr/share/${PN}/${PV}/etc
- doins doc/interpreter/macros.texi
- fi
- [[ -e test/fntests.log ]] && dodoc test/fntests.log
- use java && \
- java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
- doenvd 99octave
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2016-09-24 12:44 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2016-09-24 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 430460192fa2d64c196a18b34d386d4f244f5755
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 12:43:45 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 12:44:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43046019
sci-mathematics/octave: Fix zlib underlinking
Gentoo-bug: 593670
* [QA] Add -Wl,-z,defs to LDFLAGS
* Make dependency on sys-libs/zlib unconditional
Package-Manager: portage-2.3.1
.../octave/files/octave-4.0.3-zlib-underlinking.patch | 13 +++++++++++++
sci-mathematics/octave/octave-4.0.3.ebuild | 14 +++++++++-----
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch b/sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch
new file mode 100644
index 00000000..7bc1187
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch
@@ -0,0 +1,13 @@
+Fix underlinking caused by missing -lz link.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=593670
+
+--- a/libinterp/corefcn/module.mk
++++ b/libinterp/corefcn/module.mk
+@@ -361,6 +361,7 @@
+ $(HDF5_CPPFLAGS) \
+ $(LLVM_CPPFLAGS) \
+ $(Z_CPPFLAGS)
++corefcn_libcorefcn_la_LIBADD = $(Z_LIBS)
+
+ corefcn_libcorefcn_la_CXXFLAGS = $(AM_CXXFLAGS) $(LLVM_CXXFLAGS)
+
diff --git a/sci-mathematics/octave/octave-4.0.3.ebuild b/sci-mathematics/octave/octave-4.0.3.ebuild
index 408fc9e..53b5c7e 100644
--- a/sci-mathematics/octave/octave-4.0.3.ebuild
+++ b/sci-mathematics/octave/octave-4.0.3.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
sci-libs/cxsparse:0=
sci-libs/umfpack:0= )
X? ( x11-libs/libX11:0= )
- zlib? ( sys-libs/zlib:0= )"
+ sys-libs/zlib"
DEPEND="${RDEPEND}
qrupdate? ( app-misc/pax-utils )
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0.3-imagemagick.patch
"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
"${FILESDIR}"/${PN}-4.0.3-ncurses-pkgconfig.patch
+ "${FILESDIR}"/${PN}-4.0.3-zlib-underlinking.patch
)
src_prepare() {
@@ -98,6 +99,9 @@ src_prepare() {
}
src_configure() {
+ # [QA] detect underlinking #593670
+ append-ldflags $(test-flags-CXX -Wl,-z,defs)
+
# unfortunate dependency on mpi from hdf5 (bug #302621)
use hdf5 && has_version sci-libs/hdf5[mpi] && \
export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
@@ -118,6 +122,7 @@ src_configure() {
--disable-64 \
--disable-jit \
--enable-shared \
+ --with-z \
$(use_enable static-libs static) \
$(use_enable doc docs) \
$(use_enable java) \
@@ -138,8 +143,7 @@ src_configure() {
$(use_with sparse ccolamd) \
$(use_with sparse cholmod) \
$(use_with sparse cxsparse) \
- $(use_with X x) \
- $(use_with zlib z)
+ $(use_with X x)
}
src_compile() {
@@ -160,7 +164,7 @@ src_install() {
fi
[[ -e test/fntests.log ]] && dodoc test/fntests.log
use java && \
- java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
- echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
+ java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
+ echo "LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
doenvd 99octave
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2016-09-11 21:58 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2016-09-11 21:58 UTC (permalink / raw
To: gentoo-commits
commit: 8070e24f0d096ad0c4df319f87f6550bd4ee7388
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 21:58:12 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 21:58:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8070e24f
sci-mathematics/octave: Remove left-over 'use jit' calls
* https://github.com/gentoo/gentoo/pull/2288
Package-Manager: portage-2.3.0
sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch | 11 -----------
sci-mathematics/octave/octave-4.0.0-r1.ebuild | 2 +-
sci-mathematics/octave/octave-4.0.0.ebuild | 2 +-
sci-mathematics/octave/octave-4.0.1-r1.ebuild | 2 +-
sci-mathematics/octave/octave-4.0.1.ebuild | 2 +-
sci-mathematics/octave/octave-4.0.2-r2.ebuild | 2 +-
sci-mathematics/octave/octave-4.0.3.ebuild | 2 +-
7 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch b/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch
deleted file mode 100644
index 72931ee..00000000
--- a/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- octave-3.8.0-orig/libinterp/corefcn/jit-typeinfo.cc 2013-12-28 08:57:41.000000000 +1100
-+++ octave-3.8.0/libinterp/corefcn/jit-typeinfo.cc 2014-02-14 15:45:47.388031654 +1100
-@@ -872,7 +872,7 @@
- jit_operation::to_idx (const std::vector<jit_type*>& types) const
- {
- octave_idx_type numel = types.size ();
-- numel = std::max (2, numel);
-+ numel = std::max (static_cast<octave_idx_type>(2), numel);
-
- Array<octave_idx_type> idx (dim_vector (1, numel));
- for (octave_idx_type i = 0; i < static_cast<octave_idx_type> (types.size ());
diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
index 52f52e8..d3b1bf3 100644
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
@@ -147,7 +147,7 @@ src_configure() {
src_compile() {
emake
- if use java || use jit ; then
+ if use java; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index d846668..813c601 100644
--- a/sci-mathematics/octave/octave-4.0.0.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0.ebuild
@@ -142,7 +142,7 @@ src_configure() {
src_compile() {
emake
- if use java || use jit ; then
+ if use java; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
index 666ac67..ab22a98 100644
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
@@ -142,7 +142,7 @@ src_configure() {
src_compile() {
emake
- if use java || use jit ; then
+ if use java; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
index d846668..813c601 100644
--- a/sci-mathematics/octave/octave-4.0.1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1.ebuild
@@ -142,7 +142,7 @@ src_configure() {
src_compile() {
emake
- if use java || use jit ; then
+ if use java; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
diff --git a/sci-mathematics/octave/octave-4.0.2-r2.ebuild b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
index 666ac67..ab22a98 100644
--- a/sci-mathematics/octave/octave-4.0.2-r2.ebuild
+++ b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
@@ -142,7 +142,7 @@ src_configure() {
src_compile() {
emake
- if use java || use jit ; then
+ if use java; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
diff --git a/sci-mathematics/octave/octave-4.0.3.ebuild b/sci-mathematics/octave/octave-4.0.3.ebuild
index 117d917..408fc9e 100644
--- a/sci-mathematics/octave/octave-4.0.3.ebuild
+++ b/sci-mathematics/octave/octave-4.0.3.ebuild
@@ -144,7 +144,7 @@ src_configure() {
src_compile() {
default
- if use java || use jit ; then
+ if use java; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/
@ 2016-06-05 11:47 Michał Górny
0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2016-06-05 11:47 UTC (permalink / raw
To: gentoo-commits
commit: a663d1f5cf154936b347888c2c91a0bd87ff3870
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 20:47:11 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 11:47:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a663d1f5
sci-mathematics/octave: Remove jit from 3* as it requires llvm < 3.5
.../octave/files/octave-3.8.0-llvm-3.4.patch | 63 ----------------------
.../octave/files/octave-3.8.0-llvm-configure.patch | 12 -----
sci-mathematics/octave/octave-3.8.2.ebuild | 12 ++---
3 files changed, 4 insertions(+), 83 deletions(-)
diff --git a/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch b/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch
deleted file mode 100644
index 63c5303..0000000
--- a/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -aur octave-3.8.0/libinterp/corefcn/jit-util.h octave-3.8.0.fix/libinterp/corefcn/jit-util.h
---- octave-3.8.0/libinterp/corefcn/jit-util.h 2013-12-27 15:57:41.000000000 -0600
-+++ octave-3.8.0.fix/libinterp/corefcn/jit-util.h 2014-01-16 17:06:47.512782643 -0600
-@@ -42,8 +42,10 @@
- {
- class Value;
- class Module;
-- class FunctionPassManager;
-- class PassManager;
-+ namespace legacy {
-+ class FunctionPassManager;
-+ class PassManager;
-+ }
- class ExecutionEngine;
- class Function;
- class BasicBlock;
-diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.cc octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc
---- octave-3.8.0/libinterp/corefcn/pt-jit.cc 2013-12-27 15:58:17.000000000 -0600
-+++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc 2014-01-16 17:08:28.030924785 -0600
-@@ -52,7 +52,7 @@
- #include <llvm/Bitcode/ReaderWriter.h>
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
- #include <llvm/ExecutionEngine/JIT.h>
--#include <llvm/PassManager.h>
-+#include <llvm/IR/LegacyPassManager.h>
-
- #ifdef HAVE_LLVM_IR_FUNCTION_H
- #include <llvm/IR/LLVMContext.h>
-@@ -1888,10 +1888,10 @@
- if (! engine)
- return false;
-
-- module_pass_manager = new llvm::PassManager ();
-+ module_pass_manager = new llvm::legacy::PassManager ();
- module_pass_manager->add (llvm::createAlwaysInlinerPass ());
-
-- pass_manager = new llvm::FunctionPassManager (module);
-+ pass_manager = new llvm::legacy::FunctionPassManager (module);
- #ifdef HAVE_LLVM_DATALAYOUT
- pass_manager->add (new llvm::DataLayout (*engine->getDataLayout ()));
- #else
-@@ -2007,7 +2007,7 @@
- {
- std::string error;
- llvm::raw_fd_ostream fout ("test.bc", error,
-- llvm::raw_fd_ostream::F_Binary);
-+ llvm::sys::fs::F_Binary);
- llvm::WriteBitcodeToFile (module, fout);
- }
- }
-diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.h octave-3.8.0.fix/libinterp/corefcn/pt-jit.h
---- octave-3.8.0/libinterp/corefcn/pt-jit.h 2013-12-27 15:58:17.000000000 -0600
-+++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.h 2014-01-16 17:05:08.224619116 -0600
-@@ -384,8 +384,8 @@
- size_t trip_count (const octave_value& bounds) const;
-
- llvm::Module *module;
-- llvm::PassManager *module_pass_manager;
-- llvm::FunctionPassManager *pass_manager;
-+ llvm::legacy::PassManager *module_pass_manager;
-+ llvm::legacy::FunctionPassManager *pass_manager;
- llvm::ExecutionEngine *engine;
- };
diff --git a/sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch b/sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch
deleted file mode 100644
index 82c6c14..0000000
--- a/sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- octave-3.8.0-orig/configure.ac 2013-12-28 08:58:28.000000000 +1100
-+++ octave-3.8.0/configure.ac 2014-02-15 20:51:21.431570121 +1100
-@@ -805,7 +805,8 @@
- dnl Use -isystem so we don't get warnings from llvm headers
- LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
- LLVM_CXXFLAGS=
-- LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
-+ dnl If llvm-config --ldflags has -L ending with /llvm then specify this directory with -R
-+ LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags | sed -e 's/-L\(@<:@^ \t@:>@*\/llvm\)/-L\1 -R\1/' -e 's/-@<:@^LR@:>@.*@<:@ \t@:>@//g'`"
-
-
- LDFLAGS="$LDFLAGS $LLVM_LDFLAGS"
diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2.ebuild
index b649ce0..7d12d6f 100644
--- a/sci-mathematics/octave/octave-3.8.2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java opengl
postscript +qhull +qrupdate readline +sparse static-libs X zlib"
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -34,7 +34,6 @@ RDEPEND="
media-gfx/graphicsmagick[cxx]
media-gfx/imagemagick[cxx] ) )
java? ( >=virtual/jre-1.6.0:* )
- jit? ( <sys-devel/llvm-3.5:0= )
opengl? (
media-libs/freetype:2=
media-libs/fontconfig:1.0=
@@ -75,7 +74,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.3-texi.patch
"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
"${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
)
@@ -87,9 +85,6 @@ src_prepare() {
use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
fi
- has_version ">=sys-devel/llvm-3.4" && \
- epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
-
# Fix bug 501756
sed -i \
-e 's@A-Za-z0-9@[:alnum:]@g' \
@@ -113,7 +108,8 @@ src_configure() {
$(use_enable doc docs)
$(use_enable java)
$(use_enable gui)
- $(use_enable jit)
+ # requires llvm < 3.5
+ --disable-jit
$(use_enable readline)
$(use_with curl)
$(use_with fftw fftw3)
@@ -147,7 +143,7 @@ src_configure() {
src_compile() {
emake
- if use java || use jit ; then
+ if use java ; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-03-15 10:08 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-03 12:47 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/ Mark Wright
-- strict thread matches above, loose matches on Subject: below --
2024-03-15 10:08 Andreas Sturmlechner
2022-11-23 21:18 Andreas Sturmlechner
2022-11-15 4:58 Sam James
2022-05-05 0:11 Sam James
2017-10-08 16:43 Andreas Sturmlechner
2017-06-11 21:44 David Seifert
2016-11-20 20:38 David Seifert
2016-09-24 12:44 David Seifert
2016-09-11 21:58 David Seifert
2016-06-05 11:47 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox