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

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

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
-}