gentoo auto-resync : 09:11:2022 - 21:26:40

4 files changed, 40 insertions, 13 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index fd5d3ee7baf3..7ec38e5d2e7e 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 63cd7bd3b334..ae1bf5102003 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -12,5 +12,5 @@ EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c019459
 EBUILD octave-6.4.0-r3.ebuild 6043 BLAKE2B a99d2325249cbd29bcc3b00e734b28f7de4b61025f8f2133d5b7c53ad7bbb14bdbbd068ac204e3f7af80143c3797ec97688487b70361f8966dffd06569b3612d SHA512 559c07c35ecc7011e0f44a23fb2ad392a1562221f7218c0b5d89a2a9a2dd60e9f68e9cf3345b226d572d5da85d63cbe051643363bc9e1896ce4820817317f605
 EBUILD octave-6.4.0-r4.ebuild 6031 BLAKE2B 30bbe11d7ac6fea759463681cfc49a5779cec4eb99aaf5917bf9d8955bc03d63ec6e7c45b8589a54e7ca79dfe302ee60f6f20ab8a667c3a2ebb2d5d9e5e6bc56 SHA512 dcf58e44d24a894d18b2478727f970ac39f81ccd38947147dabc3f88ba8e637b6d783b136073bc2a5d4155b065d387e3f183131bc838a98c1a52bb6274c6bad1
 EBUILD octave-7.2.0-r1.ebuild 5527 BLAKE2B 799a3175791ed82cc0f46bca34f6280a5b51b0e42381e627b748f195fa965a84fda6f562d8c6e6a20b3074a225d87a9b5ab1f8ba41b8978d3187d14df569ba0e SHA512 cfa3e263ce589e39b47b5c9240c63fe006a8751b81bf03850dc91848965fb46bc67db069550e86db5a4f3bc653ae7ab7744930753bbfbcfbcbde3efa91b4e5a0
-EBUILD octave-7.3.0.ebuild 5527 BLAKE2B f0acb19cbbb64bc67b3856fa2fe49bb9c4e5929f29796c33f94b7965a78aa049fc86ac947788c80ed3d95bebeb1179476f3ef63d5a58252df87c5748a2fbf4ef SHA512 f3c023de7ef09f2b26b6f5e019c171b04ccbc3fe40904b7348d83c18feb5cfbe82823f7f64adbf5f672be5adc613598004818b680ad2bee08214a0b2d3746657
-MISC metadata.xml 1362 BLAKE2B c81ec8cf01a65ebec3ae6138fb9003d409ae8ac0369e67abf6bd8f62522587d7092d6479b4dd08593857526778cbb4ef0c7c937a0aaef8d8f9e7c3d761514d78 SHA512 ff5ea648f9f473222d38590bebb030a1e4189650753f1654d39fe7f8dd396530ea32346a6d0033844b7621b41ced143d507c2bbea28204d445eb243cf4a374b6
+EBUILD octave-7.3.0-r1.ebuild 6599 BLAKE2B 04882a116b9c33d4cd536b446205edf7c858cd5a57aa3bcc927313a81e94ba26f195b6eaca795e45f8938afec9e8392342272224075d1901611bfb217fbc574e SHA512 291902d0fbf8a1ebb099e98629a9341d0ff655c2a8efaf9f304d6c7c93c9716606985451dad7425e9b4138e20595e71136dc18b0292bab85ed47c7a171bbd62e
+MISC metadata.xml 1703 BLAKE2B 0471bc1eeaa2ce86b8eeca5c3e831eb0d9207b5fd1d3c03aba017a257b7b98b313c42a1054471c79dab1b5d2d84df8a8d3b0ee68e772cbe6970ac92f07dc3269 SHA512 3c051ff80c958af4315faa1670cc5e1d6a53397b4182304b760cf4f2e14f716e187dd76879d094e35713ac115c47ea623530c2f4b114f7bf2eae1cdf28bc46b8
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 9058f2f3596f..72d5085bcfb1 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -9,7 +9,10 @@
   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>
     <flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></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>
diff --git a/sci-mathematics/octave/octave-7.3.0.ebuild b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
index ab0821420539..05285cf1f3e5 100644
--- a/sci-mathematics/octave/octave-7.3.0.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
+inherit autotools 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/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib"
+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 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
@@ -20,6 +20,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 #
 # (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
@@ -33,6 +38,7 @@ RDEPEND="
 	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? (
@@ -46,13 +52,13 @@ RDEPEND="
 		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/fltk-1.3:1=[opengl,xft]
 		x11-libs/gl2ps:=
 	)
 	portaudio? ( media-libs/portaudio )
@@ -83,7 +89,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/gperf
-	virtual/imagemagick-tools
 	virtual/pkgconfig
 	doc? (
 		dev-texlive/texlive-fontsrecommended
@@ -97,6 +102,30 @@ BDEPEND="
 	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
@@ -107,11 +136,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-	# 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
 
@@ -147,7 +171,6 @@ src_configure() {
 		--enable-shared \
 		--with-z \
 		--with-bz2 \
-		$(use_enable static-libs static) \
 		$(use_enable doc docs) \
 		$(use_enable java) \
 		$(use_enable json rapidjson) \
@@ -158,8 +181,9 @@ src_configure() {
 		$(use_enable fftw fftw-threads) \
 		$(use_with glpk) \
 		$(use_with hdf5) \
+		$(use_with imagemagick magick GraphicsMagick++) \
 		$(use_with opengl) \
-		$(use_with opengl fltk) \
+		$(use_with fltk) \
 		$(use_with ssl openssl) \
 		$(use_with portaudio) \
 		$(use_with qhull qhull_r) \