gentoo Easter resync : 12.04.2020

3 files changed, 206 insertions, 3 deletions

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 1282a3642906..63563bf553ac 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -15,8 +15,10 @@ DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648
 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
-EBUILD octave-4.2.2.ebuild 5102 BLAKE2B 08512a3fd0d084a5e56cc0de1c6c22c171efe525a64a48e712261911d188f0a2d879b9d5b233d14bd6a69a937fa9370f50432dcabdee21f547c94823ce3f19e0 SHA512 56d2c1b5cb19657801bf47cb8eb1d9ea519da2631e113b7750fbd8d57a8a192b8903085ec361ac8af8aaef2f8fa624bbee6be7a3022e071e5d78102c339dc0a3
+DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
+EBUILD octave-4.2.2.ebuild 5103 BLAKE2B 690f0a397a887a26d0ad7dc31af6893af0ccafed623013d02f2f79e9683a558827e313f2c3a46b035eef754662ed26691c8b56be5cf05a5b79b41604f37635b1 SHA512 7534b737c7e9c9b56ac768b00f46c3ff79ec5362c9f73f3deda6e41776f2e4d254189c22ccae32d723481fb1c675f8bc1cd7af8783bfd6dc6c51e4ebb8e99f7f
 EBUILD octave-4.4.0.ebuild 5082 BLAKE2B 8736fa239d93b6847d413e50cf75427bf16407814d5d32f55f2d8688b57fbeacb471afd2a86ec8c1f6a1c1da11882a40dd221e5eea9fdd0ad59e224c0f1e5d65 SHA512 b71030ab908c404a3672d1df9f85e2cf3aa99f4e6e968ae90a95af228912e4615e869d58efaa018a7cb1300d4630111af82bc306b3d1e56340df5dbd1065bd32
 EBUILD octave-4.4.1.ebuild 5180 BLAKE2B 495f7aa6fc5508fbe2285e5fbc8eb7a4055d84e538384487c3f535f9d5cb90bb3c0d896455d05a02878d786a0a338373380f8e955415673a625db17cc80a14fe SHA512 b26dd91d325a55a94da6eb4bba15f279f3d8c80dcecc19c53ff3d8c43c664aea45769b0f3310a38addab326bf6bc59aa6b88b2b07981d731803d82865989250d
 EBUILD octave-5.1.0.ebuild 5076 BLAKE2B 6f843fc6ff0157c6e4f80aaa2f2cc056c4215483e0b62b809821e8f81234caf8be57bb9232fd305fb2bf8d4266de452b7efa20c208a23f4aa7ca4e038785adb3 SHA512 41f83b3a3431a103b10a654573a8d7cb5eb1f45b79125e15818d8f2850faccd5266ee24ee102e4bed0452ba17a3d8999ca755830fea353ada4dd973282a5b0d1
+EBUILD octave-5.2.0.ebuild 5462 BLAKE2B 9b76e5654e712b254cf2151bd3cad205a63bb064ce0b58d717c73097a8f7ffa2ed1e2abfafd1d30f6e6e7a2913a0159b8c27f069dc6640471302c34d5d77b615 SHA512 77d4843fb0499f145a3ac77f166c8f5eb92f236acbd48154c70c94e02a2bcb74175a0e28384686e7a4ab42210892a47d3578d26b25947d0a0f41b611da0f132a
 MISC metadata.xml 1137 BLAKE2B 69a3d32e58fcf2f855b54664e1fb4e0f2eec69bd8522218957320a0d0f8bf67fb8d5e28f7f108d3baf7992454adef3a416d4bdae9d7b4fd2bfe77225de17a69e SHA512 7351fa4b9a696406543cda7246378e4b4df4dad3033f9a87e4c5036663fc32965c7db45d8ff32959904a9bf71cff88484b542bc3e20ea0ee946a0025c091a345
diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild
index ec97d6fd7401..8600b40098fd 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/bzip2
diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild b/sci-mathematics/octave/octave-5.2.0.ebuild
new file mode 100644
index 000000000000..5d9b11ef5c5e
--- /dev/null
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -0,0 +1,201 @@
+# 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 gui hdf5 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= )
+	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 )"
+
+# Removed "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
+# because I think Z_LIBS are added to LIBOCTINTERP_LINK_DEPS
+# in the top-level configure.ac now.
+#
+# Both "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
+# and "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch were removed
+# because this support has been broken upstream for a long time,
+# and a fix that involves "using namespace Magick;" was rejected
+# as far as I can tell. Moreover, the configure.ac patch no longer
+# applies. In the meantime, I've remove support for USE=imagemagick
+# and USE=graphicsmagick.
+#
+# Removed "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch because it was fixed
+# in https://hg.savannah.gnu.org/hgweb/octave/rev/cdaa884568b1
+#
+# The texi patch is upstream as https://savannah.gnu.org/bugs/?58057
+# and should be in a future release.
+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}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.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 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
+}