[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     4e5e8a1eb261f84f53cf25d1c41df734089b31db
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  4 13:31:58 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  4 13:32:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5e8a1e

sci-mathematics/octave: Drop 4* and 5.1.0

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-mathematics/octave/Manifest                    |   4 -
 .../octave/files/octave-4.2.0-imagemagick.patch    | 139 ---------------
 .../octave/files/octave-4.2.0-pkgbuilddir.patch    |  41 -----
 .../octave/files/octave-4.2.0-texi.patch           |  11 --
 .../files/octave-4.2.0-zlib-underlinking.patch     |  10 --
 .../octave-4.2.2-fix-qscintilla-detection.patch    |  14 --
 .../files/octave-4.2.2-imagemagick-configure.patch |  16 --
 .../files/octave-4.4.0-imagemagick-configure.patch |  16 --
 .../octave/files/octave-4.4.0-imagemagick.patch    |  22 ---
 .../octave/files/octave-4.4.0-qt-5.11.patch        |  10 --
 sci-mathematics/octave/metadata.xml                |   1 -
 sci-mathematics/octave/octave-4.2.2.ebuild         | 191 --------------------
 sci-mathematics/octave/octave-4.4.0.ebuild         | 195 --------------------
 sci-mathematics/octave/octave-4.4.1.ebuild         | 196 ---------------------
 sci-mathematics/octave/octave-5.1.0.ebuild         | 192 --------------------
 15 files changed, 1058 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 23044156fe0..62029d3b7e2 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,5 +1 @@
-DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
-DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
-DIST octave-4.4.1.tar.gz 28626462 BLAKE2B 0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6 SHA512 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
-DIST octave-5.1.0.tar.gz 32034788 BLAKE2B d387f41f6ae826b35735fc4208d71be84076a81544f5cd0e3d5410f41a70eebb5b0b3bbf19e4344b88901869d54f2759259dc374c44a430f681d3b0c32cb02cb SHA512 a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498

diff --git a/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch
deleted file mode 100644
index 8fb786964c2..00000000000
--- a/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- a/libinterp/corefcn/__magick_read__.cc
-+++ b/libinterp/corefcn/__magick_read__.cc
-@@ -39,7 +39,15 @@
- 
- #if defined (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,6 +129,9 @@
- 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::GreenChannel)   == 1
-@@ -132,6 +143,9 @@
-       && img.channelDepth (Magick::OpacityChannel) == 1
-       && img.channelDepth (Magick::GrayChannel)    == 1)
-     depth = 1;
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#undef Magick
-+#endif
- 
-   return depth;
- }
-@@ -355,7 +369,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
-@@ -489,7 +506,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++;
-                   }
-@@ -568,7 +586,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++;
-                   }
-@@ -655,7 +674,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++;
-                   }
-@@ -732,10 +752,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:GraphicsMagic-Quantum-Depth",
-                          "your version of %s limits images to %d bits per pixel\n",
--                         MagickPackageName, QuantumDepth);
-+                         MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
- 
-       initialized = true;
-     }
-@@ -1094,8 +1115,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 ();
-@@ -1147,8 +1169,9 @@
-                 for (octave_idx_type row = 0; row < nRows; row++)
-                   {
-                     double grey = octave::math::round (double (*img_fvec) / divisor);
-+                    using namespace Magick;
-                     Magick::Color c (grey, grey, grey,
--                                     MaxRGB - octave::math::round (double (*a_fvec) / divisor));
-+                                     QuantumRange - octave::math::round (double (*a_fvec) / divisor));
-                     pix[GM_idx] = c;
-                     img_fvec++;
-                     a_fvec++;
-@@ -1216,10 +1239,11 @@
-               {
-                 for (octave_idx_type row = 0; row < nRows; row++)
-                   {
-+                    using namespace Magick;
-                     Magick::Color c (octave::math::round (double (*img_fvec)          / divisor),
-                                      octave::math::round (double (img_fvec[G_offset]) / divisor),
-                                      octave::math::round (double (img_fvec[B_offset]) / divisor),
--                                     MaxRGB - octave::math::round (double (*a_fvec) / divisor));
-+                                     QuantumRange - octave::math::round (double (*a_fvec) / divisor));
-                     pix[GM_idx] = c;
-                     img_fvec++;
-                     a_fvec++;
-@@ -1297,7 +1321,8 @@
-                                      octave::math::round (double (img_fvec[Y_offset]) / divisor),
-                                      octave::math::round (double (img_fvec[K_offset]) / divisor));
-                     pix[GM_idx] = c;
--                    ind[GM_idx] = MaxRGB - octave::math::round (double (*a_fvec) / divisor);
-+                    using namespace Magick;
-+                    ind[GM_idx] = QuantumRange - octave::math::round (double (*a_fvec) / divisor);
-                     img_fvec++;
-                     a_fvec++;
-                     GM_idx += nCols;

diff --git a/sci-mathematics/octave/files/octave-4.2.0-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-4.2.0-pkgbuilddir.patch
deleted file mode 100644
index a72ac97c0a1..00000000000
--- a/sci-mathematics/octave/files/octave-4.2.0-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 = tempname ();
-         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/files/octave-4.2.0-texi.patch b/sci-mathematics/octave/files/octave-4.2.0-texi.patch
deleted file mode 100644
index 1352ff5a1f7..00000000000
--- a/sci-mathematics/octave/files/octave-4.2.0-texi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/interpreter/module.mk
-+++ b/doc/interpreter/module.mk
-@@ -298,6 +298,8 @@
- 	$(AWK) -f $(srcdir)/doc/interpreter/mkcontrib.awk $(srcdir)/doc/interpreter/contributors.in > $@-t && \
- 	mv $@-t $@
- 
-+doc/interpreter/preface.texi: doc/interpreter/contributors.texi
-+
- AUTHORS: doc/interpreter/preface.texi doc/interpreter/contributors.texi | doc/interpreter/$(octave_dirstamp)
- 	$(AM_V_MAKEINFO)rm -f $@-t $@ && \
- 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/doc/interpreter/contributors.texi ] && [ ! -f doc/interpreter/contributors.texi ]; then \

diff --git a/sci-mathematics/octave/files/octave-4.2.0-zlib-underlinking.patch b/sci-mathematics/octave/files/octave-4.2.0-zlib-underlinking.patch
deleted file mode 100644
index 0c8736069d8..00000000000
--- a/sci-mathematics/octave/files/octave-4.2.0-zlib-underlinking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libinterp/corefcn/module.mk
-+++ b/libinterp/corefcn/module.mk
-@@ -318,6 +318,7 @@
-   $(HDF5_CPPFLAGS) \
-   $(LLVM_CPPFLAGS) \
-   $(Z_CPPFLAGS)
-+libinterp_corefcn_libcorefcn_la_LIBADD = $(Z_LIBS)
- 
- libinterp_corefcn_libcorefcn_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
- 

diff --git a/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch
deleted file mode 100644
index 80fc2801323..00000000000
--- a/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-In Gentoo, QScintilla for Qt5 has the same library name
-as its Qt4 variant.
-
---- a/m4/acinclude.m4
-+++ b/m4/acinclude.m4
-@@ -1460,7 +1460,7 @@
-     ;;
-     5)
-       QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
--      octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2"
-+      octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2"
-     ;;
-     *)
-       AC_MSG_ERROR([Unrecognized Qt version $qt_version])

diff --git a/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch
deleted file mode 100644
index d80c23ec422..00000000000
--- a/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1560,11 +1560,11 @@ if test $check_magick = yes; then
-   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++ | $SED -e 's/^ *$//')"
-+    MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//' | $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-configure.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch
deleted file mode 100644
index ce81b801d99..00000000000
--- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
deleted file mode 100644
index 2aa6e5b9d8c..00000000000
--- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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,19 @@
-       // 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.
-+#ifdef QuantumDepth
-       if (QuantumDepth < 16)
-+#else
-+      using namespace Magick;
-+      if (MAGICKCORE_QUANTUM_DEPTH < 16)
-+#endif
-         warning_with_id ("Octave:GraphicsMagick-Quantum-Depth",
-                          "your version of %s limits images to %d bits per pixel\n",
-+#ifdef QuantumDepth
-                          MagickPackageName, QuantumDepth);
-+#else
-+                         MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
-+#endif
- 
-       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
deleted file mode 100644
index 70ffbb47199..00000000000
--- a/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/metadata.xml b/sci-mathematics/octave/metadata.xml
index 54f7c4586ad..619b5f255ad 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -10,7 +10,6 @@
 	</longdescription>
 	<use>
 		<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
-		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for low level hash functions</flag>
 		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
 		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
 		<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild
deleted file mode 100644
index 8600b40098f..00000000000
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2020 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 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 ~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-2.9.3-r2:=[qt5(+)]
-	)
-	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=
-	)
-	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= )
-	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 )"
-
-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}"/${P}-imagemagick-configure.patch
-	"${FILESDIR}"/${PN}-4.2.0-imagemagick.patch
-	"${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch
-	"${FILESDIR}"/${P}-ncurses-pkgconfig.patch
-	"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
-	"${FILESDIR}"/${P}-fix-qscintilla-detection.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 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
-}

diff --git a/sci-mathematics/octave/octave-4.4.0.ebuild b/sci-mathematics/octave/octave-4.4.0.ebuild
deleted file mode 100644
index 692b5029491..00000000000
--- a/sci-mathematics/octave/octave-4.4.0.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# 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 ~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= )
-	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-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
-}

diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild b/sci-mathematics/octave/octave-4.4.1.ebuild
deleted file mode 100644
index 192d67e3fde..00000000000
--- a/sci-mathematics/octave/octave-4.4.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2019 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 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 ~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= )
-	imagemagick? (
-		!graphicsmagick? ( >=media-gfx/imagemagick-7:=[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-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() {
-	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
-}

diff --git a/sci-mathematics/octave/octave-5.1.0.ebuild b/sci-mathematics/octave/octave-5.1.0.ebuild
deleted file mode 100644
index d70fbe73ac5..00000000000
--- a/sci-mathematics/octave/octave-5.1.0.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2019 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 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 ~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= )
-	imagemagick? (
-		!graphicsmagick? ( >=media-gfx/imagemagick-7:=[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-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}-5.1.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() {
-	# 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 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() {
-	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
-}