gentoo resync : 14.12.2020

10 files changed, 207 insertions, 79 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7380b76f8abe..37cd1d890e13 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index 48d3a95257ff..b57b041d11e6 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,5 +1,5 @@
 DIST alt-ergo-1.30.tar.gz 380329 BLAKE2B fab16757ed110474cf8f9d01ab53f76b6a300eb478b32bbfd6bb79d7603b1f5c2fc5c97bf44358eb138283f3487ef90febd23865723a4721b01bd870cfdd6507 SHA512 6ac6abdc6602b0ba89ee58eb96c66ac93e8195e0b4f75595381eded86365c2dd881251de2b77e2f1137684651ddc7fd94f922509de0be2964d81f52a6fb0f2f2
 DIST alt-ergo-2.3.0.tar.gz 455577 BLAKE2B 1836782be452df5147fc3041517fd267f3ce7facd15ad460c3e1dfba2b6ea455fee79ad8264ccb12cf21622c21a54c186c9943e7bffb392daab15d046ff93863 SHA512 a2f209b62b8494bfefe84328cdc786185e0534c5e224e212b83045b078352a51d2ab02622f72c22c74c7de95c7a554cbdae2a9a8a0c41f3f26c841f8c72f6b21
 EBUILD alt-ergo-1.30.ebuild 705 BLAKE2B 2ed4bdb55ba084ae8364cf49200a61b9b4c64941817acc1a448ebb5124eaaac264c8d895e5d98e4093fca05a9b7d6db638cf89a808d95af313c49a79cc94f9b9 SHA512 aa1f48cb7fb8d99d7745d77edbc9f69f9f591029c354018243d309f6d27be7e595758ae2f46a7854e82b456afc5405205e31d5f84e974949ad6e9248dc48cd39
-EBUILD alt-ergo-2.3.0.ebuild 1206 BLAKE2B 4a87409f9bc9fa2fb3458e6be471488e40b0ee81bf96d8a28803ef5452d48d9d3e33a5be6f5e4ad9e009b4db414a8bee81a078206d9cf7deedc51f0795a765aa SHA512 1853517b8c206b339606f9b6ed787822291fe5240d59c9602d67ec606f7441bd1d1154fff96f17bf20887841d59ce131cf62188c18e0285a8ed8da52429c3b2a
+EBUILD alt-ergo-2.3.0.ebuild 1192 BLAKE2B d67021c7185ee7c260941dd90e704e707c06d45c042fb49b7e621875cde88155d01e94f32a2e9a76d72e639c6a54644b8bc57901b52ffe45e1b67ec734c9dbc1 SHA512 feec299d55489c1ee62bd30428effd73c421ee960e08621b0e3989a8f5c6690e85005b803fe934e9bd8c89ef3b97bc414d7eaea6f7ea8b09c0b012af6307f96a
 MISC metadata.xml 670 BLAKE2B 5f03c359cb298cc9a0fea6ef3a5deb092e5ccca7acfb2b7a5630303659bfd853fe86277ebbfb1fb7b6677d45dde2d5c68d55fffa8d3d8187acac3765f52df7c9 SHA512 9e514e4da2b92aa1e8e8e084450f478b51947172b689664dfe6c0fe0eb139e278e13689c8ba53825cb3bc32140cfd4cd7a68fede0d013cd065d5339d34931e8d
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
index 668708afdc77..7f950f433a25 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
@@ -14,7 +14,7 @@ IUSE="examples gtk +ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt?]
 	dev-ml/zarith
-	gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] )
+	dev-ml/lablgtk:2[sourceview,ocamlopt?]
 	dev-ml/camlzip
 	sci-mathematics/psmt2-frontend
 	>=dev-ml/ocplib-simplex-0.4
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 45e9d5dd568e..e152a3b9a2ec 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -3,10 +3,7 @@ AUX gimps-25.6-conf.d 254 BLAKE2B 44cbf88e3bba505846396c87a68c879d03f76f7f0d0334
 AUX gimps-28.9-init.d 722 BLAKE2B 8d55dfbb4166da76e2621097c85165ef49ade916d4ac76576b2abb249d79e0dcd7e37e060a0996576993e6510c051099d6bb7bed6da4ec8800f51b964803c3a8 SHA512 8a7501d8347aa0974268c910890550a2ce5a3d11606670dd69d5e5ccb1046e2994bc5b1f04f9e9dae89174a5a69f9158757079b835fbff50fd25f983190521e9
 AUX gimps.service 283 BLAKE2B db6c0c777d514aa0216c1af087418ead25561ffa950752e237e1633a6b6414b56732b84aabd11533ea3dab34f8657358370d21c4730f551d0ff5cf03006b7ad3 SHA512 710c7d075d5542364746b837f2b62257011abb8f45862bf0a1fabd53adb182b5fd969256c7f3221506fef38e81ab1b0f4698efafc1ca7908d9e2d42dee386d8b
 AUX gimps.tmpfiles 38 BLAKE2B c306d739ed0a0cc8bb4c80c7051ad93326cf0054d3f7fd61c4ed8a7d518356d521f7d3c3202d0b8b69723b8e7178457a34c65e92732eb15e8e64c3dff468ae2a SHA512 61c5eda13289175cdf55704442ceab4d5391d24cfa49f04155799fc2798e5ad5f1e624802e1c04b99685b1560f9898d1b0fc0c15c82251d1a765dd5de93024d8
-DIST p95v298b6.linux32.tar.gz 5696871 BLAKE2B e2c68c4dac1e4cfbc2e44542665326d33a7929585928ca720569b918f5286c97b93acc45c03d0514cadb29e87e5c6ca103e69953417df8405e36998c5768896b SHA512 6f82973237c59cd548fe7bfc08c51a62cc7ac4e98a8539e5dfbc23eec21fb6f46e1534dc834852557af61fa1a6fc9b634d9117d85fce37f8f6f9189fb724518b
-DIST p95v298b6.linux64.tar.gz 7032597 BLAKE2B de4de01d68caba4530d5adca165bfaa28cdb7e276b44355b200245cac6bab80bc05885a994c06331c2f66bdcd236c8bdb6cc8206ca40fb583bce6dc98eced7b1 SHA512 cb0ea195f4167e22bfdeef02872205a40ccd4d110abc9c354a413284db9aef1dbf9888ecdc3f09262e0d1033c0e4bed1f23d4d966fb58c437673a81095252bd1
 DIST p95v303b6.linux32.tar.gz 5702312 BLAKE2B 728c8b8e7e2b5187dc8126bccc5e2c165fbfbc0900d6c35517cd21b78e5292df143641e3766cc0146918062039b1eecab568f9b278f64b1b9197ee2f775603b9 SHA512 3e06fb77be07334949ece3ae152bdf5491f0b7f8e33e0e8ed2af3c34332841975a9514d1993ed2355abfa4e09f93e42093d02f96dc30c3471ae9f974cc2de11a
 DIST p95v303b6.linux64.tar.gz 7046127 BLAKE2B 9cde9c2670203071cfc463434a47c8123064cb232bfeb25d8767cad2c25ea75b395e2ec135b7b4a6dc9616e9d6b05ead371e1083274a82468f62a0e1de93c98f SHA512 6d6ded9a1724993d42adee28d400b0337835c52a4ce42271e62efb37134adfc6f017f55475860fbc1224e377a227ef8547b8852a35c082c37e996f4a1c1b570c
-EBUILD gimps-29.8.6-r1.ebuild 1746 BLAKE2B 54a0f315c0fedf1971ed17fcb0d2e2e184c05974f43556c2433763c113a7b382dfd9e828d6f51f338ded4bd4d273e55f76207f64b28049dfd50341a935d59d91 SHA512 3cf1f72eb72634e6e5274441dd624da5c3ea760fb69ff3a78146fdcc3d06a7ab801895f51fc49abf14dc9db239504dbf2da371bc88204d6a52731c84ac247dbd
 EBUILD gimps-30.3.6.ebuild 1808 BLAKE2B 3483a73734d0b0008c992a946d36558f1e8ac93872a46bf80d79bb21ae65720c5614df1e1380fb15c2db2537559bc1969fc90dba0614afef1c2f8a6419ea996d SHA512 0dd32cf22373ec922a2716afc7f60ed5af2b0f76ba8f91b94eef891b1137b1dc597f0aca3609f76cb56b3f90b973953decd946d37e02cb6a1db1df1fd81c55a4
 MISC metadata.xml 529 BLAKE2B a6e3550d128d6c4801029726feb868aa1cd1017b8a2f6f7ebbb3743a7b2190d40db06d22eb4f8ce94e35ab5e6b1f213afdf179fe7777501ad87457be43d9af44 SHA512 a7fb9bd05f987e1d48a04b70e78cbb3906927197793870435fee8b68dd9da623a68fc30ca96d0173952414d9741674ba2cc2c3f821dfd7b302f91f09e887a362
diff --git a/sci-mathematics/gimps/gimps-29.8.6-r1.ebuild b/sci-mathematics/gimps/gimps-29.8.6-r1.ebuild
deleted file mode 100644
index 5c5aef85e201..000000000000
--- a/sci-mathematics/gimps/gimps-29.8.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils systemd readme.gentoo-r1
-
-DESCRIPTION="The Great Internet Mersenne Prime Search"
-HOMEPAGE="https://www.mersenne.org/"
-
-# The author has finally caved in to the pressure of putting the build
-# number in the package name. Some dark magic necessary to get to the
-# package name
-
-MY_PV=$(ver_rs 2 'b' )
-
-SRC_URI="
-	amd64? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux64.tar.gz )
-	x86? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux32.tar.gz )"
-
-SLOT="0"
-LICENSE="GIMPS"
-RESTRICT="mirror bindist"
-KEYWORDS="-* amd64 x86"
-
-# Since there are no statically linked binaries for this version of mprime,
-# and no static binaries for amd64 in general, we use the dynamically linked
-# ones and try to cover the .so deps with the packages listed in RDEPEND.
-# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
-
-DEPEND=""
-RDEPEND="net-misc/curl
-	>=dev-libs/gmp-6.1.2"
-
-S="${WORKDIR}"
-I="/opt/gimps"
-
-QA_PREBUILT="opt/gimps/mprime"
-
-DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
-
-src_install() {
-	dodir ${I}
-	keepdir /var/lib/gimps
-	pax-mark m mprime
-	cp mprime "${D}/${I}" || die
-	fperms a-w "${I}/mprime"
-	fowners root:0 "${I}"
-	fowners root:0 "${I}/mprime"
-
-	einstalldocs
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
-	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	echo
-	einfo "GIMPS data files were not removed."
-	einfo "Remove them manually from /var/lib/gimps/"
-	echo
-}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 520f273a4cac..56cdb241bb37 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -3,5 +3,7 @@ AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
+DIST octave-6.1.0.tar.gz 32592405 BLAKE2B e39d7e8726b1aad8e378c8578e3d019b735ee82aa00230c9c35b36238848aa4c557da11707203c1ff845c26a117852c40ad9a42138812dcb5eba9b77a583a117 SHA512 34abe6fa489aea94bfeb08027653cd83a73611c6032c8b3ddc4b59223f316ee275f74490048a45aebf178858494f6920593565e612f6e77351102494cb9f49f7
 EBUILD octave-5.2.0.ebuild 5465 BLAKE2B 4334c91112a379067fb32b5e0a3ceb78400752711d32c9bcd1c7367f14663d26303f2102890596fbb000b0e9167c2a8d2e63fae9d57d2392991cab4221748dd1 SHA512 afd895fc8d2cad63ad70a637ecc3d68acf2c12627b2f50fe33713ad6286a023e09acdeaa6689477dbe8e58817619bbacc9714fa857d8115daf1366c7b3537cec
-MISC metadata.xml 1046 BLAKE2B 1f3b62ee1553ab0cfd1a176b5e79a49e86341cb379ee7ef95e9d0b6efc0d621c68f0f8fd2cf1ec85a351d14964d5038e373a88a713a3078e782e8e8392a6ee7f SHA512 2debc123655a81c380f212467820e464eb1e2184d542a183e07633d82fa410cc802a2a49f7071df1ae5df1a16e73b867975edb44c9cda94484732cd66454798b
+EBUILD octave-6.1.0-r1.ebuild 5446 BLAKE2B 2553aa591bf9508b5af433faef266fcee808f185a6e59bec92515504fae255c3a0a93109ca9fff7adc6905eb34c3a2f3b17fa6ef09943cb84cfc7eb3283182fe SHA512 754a7ccab42bcc3b59f87798d17a844a100fc139d0457935d8024ea2d925b0d1ae46992cf5f96122191d3b705d2f4128a6cd264ee0103f42f60b584e8c96c563
+MISC metadata.xml 1153 BLAKE2B 66d7908c8b90f850ac9c83075ffde66d32235e43cb6a23ae16aad8227f02733d8db8e37e8d23ebf7fd0af92c1af0de6fe47b65713dda94d6000e43d02e168733 SHA512 0131cf603beefbc01be92a7b2cfdebc7bc8e68419aa8432ac5aaedf1ac18581f3b50b4f98f543585dba4d830ccb394f9e288aaac2e36c763e8ed800775c459a1
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 619b5f255ad1..7c8e7d9ad55f 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -13,5 +13,6 @@
 		<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>
 		<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
+		<flag name="sundials">Enable the ode15i and ode15s ODE solvers using <pkg>sci-libs/sundials</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-mathematics/octave/octave-6.1.0-r1.ebuild b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
new file mode 100644
index 000000000000..291afd256768
--- /dev/null
+++ b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
@@ -0,0 +1,199 @@
+# 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 sundials X zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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).
+RDEPEND="
+	app-arch/bzip2
+	app-text/ghostscript-gpl
+	sys-apps/texinfo
+	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=
+	)
+	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=
+	)
+	ssl? (
+		 !libressl? ( dev-libs/openssl:0= )
+		 libressl? ( dev-libs/libressl:0= )
+	)
+	sundials? ( >=sci-libs/sundials-4:0= )
+	X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	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 )"
+
+# I'm not sure what the getcwd patch is intended to fix. That macro is
+# part of gnulib, though, so if it's a serious problem then we should
+# consult upstream about it.
+PATCHES=(
+	"${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
+
+	# 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 \
+		--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 sundials sundials_ida) \
+		$(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
+}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 3c880a7fb5c3..0fe23437e4d0 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,3 @@
 DIST z3-4.8.9.tar.gz 4624159 BLAKE2B ff97a688ef3f977cd1204ddafaf6b4ef5824fc8f9f38f0ce9a31657b99b8cb08ee5834893ac67056eb4d7f7df67585933029292eed41d140a93c10b9daa8e100 SHA512 a50da5c3f9e27d3e804c1b71f648a3dbd5a55223b7344d66f191a1b34a4d787810abd976840d3ab3878aaf5c96d89f5a517cac0781b82aa927a9d8d54836d54f
-EBUILD z3-4.8.9.ebuild 2413 BLAKE2B 0c8dc765d4de1af2418f5bc85a445f367663b87162759cf8d9f5a4d368b90176a1c813fc9676d5d4573357a56d0052bca9917a9b9b7e1fcd231a679d3e93a7b9 SHA512 c4be47b21f3ae4b333d0413140f1dc4fd43f82210f67f835808faec1eb7b9e0da291f5a3b58dd641127fa2818a8c549e6e8b65f49cfc213383b0ee1501bb997e
+EBUILD z3-4.8.9.ebuild 2420 BLAKE2B ab0d58d6e1066bda6a5bdf8314f9bc30912ed2b8f7c194589b0d0eb27772d5bac1cedee90c9d2bab4cd9ca863179404e6cbb652adc9382ae2e662e91dde87ade SHA512 763792bb4fad6b14e8b629103a5ba026bc0fdde49a6cdaa05de9c05448a40aedab7039de0ec1909457dc615e391674eacfdc621f184e4ec312e5584797e57bb8
 MISC metadata.xml 616 BLAKE2B aeef1be6d9c4a94062310c6e2c3ac7fb1efe39bb608d96c143a01e9a01585f11ee25aa56d8f67d0a96d880b543882f2cb781247c034eda75e7f6f030767bf660 SHA512 aed4bbc517cc4f9e78ad3f5d50af5837757efa2985aa61a3faf40e39203179d356830a1d6fd4712422257eb244a67ae5eb5c4b2db76ab75769f5fe5e6d045a0c
diff --git a/sci-mathematics/z3/z3-4.8.9.ebuild b/sci-mathematics/z3/z3-4.8.9.ebuild
index b4a56e60b2bc..2c71ac1da260 100644
--- a/sci-mathematics/z3/z3-4.8.9.ebuild
+++ b/sci-mathematics/z3/z3-4.8.9.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"