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

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

commit:     2467683d5a9fbe396020dedb13b7b9f504356327
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 11:42:36 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 13:23:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2467683d

sci-mathematics/octave: drop 8.3.0-r2

Bug: https://bugs.gentoo.org/938709
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-mathematics/octave/Manifest                    |   1 -
 .../files/octave-6.4.0-omit-qtchooser-qtver.patch  |  22 --
 sci-mathematics/octave/metadata.xml                |   1 -
 sci-mathematics/octave/octave-8.3.0-r2.ebuild      | 241 ---------------------
 4 files changed, 265 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 63a8b3a5d0dd..6c8766899894 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,2 +1 @@
-DIST octave-8.3.0.tar.xz 26970776 BLAKE2B 8c7241ff6bd5b23244edb47e74753ddf867139280b899b16ae2cab91c30a73ebdcf471d032ee47bddb67f8c7f5c772a23f4a832cadcca7ada01468b84e451ad4 SHA512 b7c8724ca8376783e8563c2050c2d9219309e559116e5cba0fdc9f50780782ff4cc98d382bdbe26055aebffb6be99b110033c682f661a3966ea1b1ddb12d4ac3
 DIST octave-9.2.0.tar.xz 27425184 BLAKE2B 55480201037871d878090972bf89d5ff43508276f41e77accdd16b752758775e883fe3875d19ea4fc2b33cf8a9a9f39684f05c85e027ca53ee2cdfda6c6bae72 SHA512 cb1667cd6557d48ecd7ae191bc44c9b9fd4f79e7cf4bf6c917093d120c4312e9594e6dddc5287661627ac053e9f23faaec40a1286d792d859f1fefbfdb3eeb8c

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
deleted file mode 100644
index 2b16fbf411e1..000000000000
--- a/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/839285
---- a/m4/acinclude.m4
-+++ b/m4/acinclude.m4
-@@ -2095,9 +2071,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [
-   if test -z "$m4_toupper([$1])_QTVER"; then
-     AC_CHECK_TOOLS(m4_toupper([$1]), [$1])
-     if test -n "$m4_toupper([$1])"; then
--      if test -n "$QTCHOOSER"; then
--        m4_toupper([$1])FLAGS="-qt=$qt_version"
--      fi
-       QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
-     else
-       QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1"
-@@ -2167,8 +2167,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1])
-   QT_TOOLS_MISSING=
- 
-   if test $build_qt_gui = yes; then
--    AC_CHECK_TOOLS(QTCHOOSER, [qtchooser])
--
-     OCTAVE_CHECK_QT_TOOL([moc])
-     OCTAVE_CHECK_QT_TOOL([uic])
-     OCTAVE_CHECK_QT_TOOL([rcc])

diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index af1bd5973c10..900e5e53ce79 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -9,7 +9,6 @@
   Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for solving linear and nonlinear problems numerically, and for performing other numerical experiments. It may also be used as a batch-oriented language.
   </longdescription>
   <use>
-    <flag name="fltk">Use <pkg>x11-libs/fltk</pkg> as the backend for the OpenGL renderer in the absence of the Qt GUI</flag>
     <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
     <flag name="gnuplot">Use <pkg>sci-visualization/gnuplot</pkg> to render plots if OpenGL is unavailable</flag>
     <flag name="imagemagick">Use <pkg>media-gfx/graphicsmagick</pkg> to read and write images</flag>

diff --git a/sci-mathematics/octave/octave-8.3.0-r2.ebuild b/sci-mathematics/octave/octave-8.3.0-r2.ebuild
deleted file mode 100644
index c6a00868c4b6..000000000000
--- a/sci-mathematics/octave/octave-8.3.0-r2.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2024 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:=[qt5(+)]
-	)
-	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/fig2dev-3.2.9-r1
-	)
-	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
-}