gentoo auto-resync : 05:11:2022 - 09:17:35

3 files changed, 212 insertions, 2 deletions

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 6f21e24d3bc4..63cd7bd3b334 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -7,8 +7,10 @@ AUX octave-6.4.0-slibtool.patch 1416 BLAKE2B e4b487481490b41a4da499bb5eceff0f6a2
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23 SHA512 b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
+DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5 SHA512 1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
-EBUILD octave-6.4.0-r3.ebuild 6044 BLAKE2B a5e0e0acda2c545beb02b59ba6b11356de65bf9384c736db3b1d44d4961a2272184e451fbb37b8530a0b7bce73d07db821b5519b776a43f600cde3564ae2887d SHA512 bd08da458ea2a6a3eb5aa745b25b3c47b3eb5ff34332fd0387863e480805ff984f9872b970b0e0770edbd8adb233b8a4ac2b541218cd87eb9dbba4e8c8fedc0e
+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
diff --git a/sci-mathematics/octave/octave-6.4.0-r3.ebuild b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
index 8919fcaa9b6e..e99fbea2fc93 100644
--- a/sci-mathematics/octave/octave-6.4.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse
 	ssl static-libs sundials X zlib"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+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
diff --git a/sci-mathematics/octave/octave-7.3.0.ebuild b/sci-mathematics/octave/octave-7.3.0.ebuild
new file mode 100644
index 000000000000..ab0821420539
--- /dev/null
+++ b/sci-mathematics/octave/octave-7.3.0.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
+
+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 +glpk gnuplot gui hdf5 java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
+#
+RDEPEND="
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
+	app-text/ghostscript-gpl
+	sys-apps/texinfo
+	dev-libs/libpcre:=
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/blas
+	virtual/lapack
+	curl? ( net-misc/curl:= )
+	fftw? ( sci-libs/fftw:3.0= )
+	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:= )
+	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 )
+	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/imagemagick-tools
+	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 )
+"
+
+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
+)
+
+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
+
+	eautoreconf
+}
+
+src_configure() {
+	# Unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	# Tell autoconf where to find qt binaries, fix bug #837752
+	export MOC="$(qt5_get_bindir)/moc" \
+		UIC="$(qt5_get_bindir)/uic" \
+		RCC="$(qt5_get_bindir)/rcc" \
+		LRELEASE="$(qt5_get_bindir)/lrelease" \
+		QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
+		QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
+
+	# Some of these use_with flags are a bit mismatched. The configure
+	# script offers only --without-foo, and detects "foo" automatically
+	# unless --without-foo is specified. Passing --with-foo is not an
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	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 static-libs static) \
+		$(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 opengl) \
+		$(use_with opengl 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
+}