gentoo resync : 20.10.2021

14 files changed, 19 insertions, 58 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 983853cfc069..b544b159a811 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 2d46909459a8..28efeb1c68cf 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -3,12 +3,12 @@ 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 gimps-30.6.4.linux64.tar.gz 7282669 BLAKE2B 7621ebd8f55660dcdb9f7b892c1963b3de1af72b186053386c4847fdf4ce9b2d7fc9e113bca99d9afccb9574b935ade4a66c485c97f67224def284b0a16ad601 SHA512 20268be0b94b86d62fc2b46f7add1a4353188638fcf9e647b294484bd049ddcaa046fbe284d48c3a263389366ff9edda024ef122faf33d0e78c6f20820f8cf0a
+DIST gimps-30.7.5.linux64.tar.gz 7101084 BLAKE2B 3096cd8aaedca34e3056a5ee9202c7d012c7d60e718dcfa06b2c3d9f43597f634c7bdec3c3e3ae8ca3ef36c86a06df404bb37b5a1d0cc8aa6355665cd0f1cf4f SHA512 a26da7886521d935f3599295411159b805ee0b38b9359791a6d9158cbf26407e4bdeae6c63f629315730d716d62abc1aba896c9942dbcc58a09666d60bc0a382
 DIST p95v303b6.linux32.tar.gz 5702312 BLAKE2B 728c8b8e7e2b5187dc8126bccc5e2c165fbfbc0900d6c35517cd21b78e5292df143641e3766cc0146918062039b1eecab568f9b278f64b1b9197ee2f775603b9 SHA512 3e06fb77be07334949ece3ae152bdf5491f0b7f8e33e0e8ed2af3c34332841975a9514d1993ed2355abfa4e09f93e42093d02f96dc30c3471ae9f974cc2de11a
 DIST p95v303b6.linux64.tar.gz 7046127 BLAKE2B 9cde9c2670203071cfc463434a47c8123064cb232bfeb25d8767cad2c25ea75b395e2ec135b7b4a6dc9616e9d6b05ead371e1083274a82468f62a0e1de93c98f SHA512 6d6ded9a1724993d42adee28d400b0337835c52a4ce42271e62efb37134adfc6f017f55475860fbc1224e377a227ef8547b8852a35c082c37e996f4a1c1b570c
 DIST p95v305b2.linux32.tar.gz 5695951 BLAKE2B d97f5b553e0a0563d51a08049c08fe31231e2689cfe6ec979b832603bace334755e947be2d7a106d4f4b807070568746f2cdabf869c5c4c6e125155c332b10bf SHA512 b5caa642e742438f10b5ee89d27213834755051679fe0d4d452e446b2f7628c8a874227971473d4319b8841f47a0bb32e7de9731d8b45e808356efb11922716e
 DIST p95v305b2.linux64.tar.gz 7165963 BLAKE2B 3ae20e8e29273650e94ff8774f973240c6b57d7a54e1674e7f741a9d366d3fdad98bb91b8e2abfcf7e1df6319476aa116e921171f2b585a568ee7d5038635531 SHA512 5fe250f7dcc35767fd5f4529219351095d1076f631528d80fa09498e27fa211abc621ef070548c398402143bec5e1d6e6e974155f50eb9f42af0ca179e4e03a8
 EBUILD gimps-30.3.6.ebuild 1808 BLAKE2B 3483a73734d0b0008c992a946d36558f1e8ac93872a46bf80d79bb21ae65720c5614df1e1380fb15c2db2537559bc1969fc90dba0614afef1c2f8a6419ea996d SHA512 0dd32cf22373ec922a2716afc7f60ed5af2b0f76ba8f91b94eef891b1137b1dc597f0aca3609f76cb56b3f90b973953decd946d37e02cb6a1db1df1fd81c55a4
 EBUILD gimps-30.5.2.ebuild 1884 BLAKE2B ab8a5f9fec9a8cef6bdd4284364201fd29bb7a25070170f4de072e18be7749a7e0406a37f8a5321cbeb5709f1cfb2f1d4d655914d0032d9ee2ec67c59d720b62 SHA512 d2f7e56482733997dc72872e83e0b64a47d15ff1985b61bde6be2aec8c3543a97638d625125e4b30ec4a057e748f3fb422fc06c0c8d25c22a74a221bb675fcc9
-EBUILD gimps-30.6.4.ebuild 1821 BLAKE2B 748341f70cbe142cfe193c48c32a1254d881a3a518621499572e7b72442c4b2e466929018789f03454068c90cd483c8848a2545d82b4ccc05a6b3b510bd7720a SHA512 5f59cfdb4b50d55ce5268f7115bdad851b78e079ad6fdc499e72e211130f25612c6c3cf6c0f5db7cf18579aac0a1dfbef12da9ad43a169f1e51d86025bcd51e6
+EBUILD gimps-30.7.5.ebuild 1821 BLAKE2B 748341f70cbe142cfe193c48c32a1254d881a3a518621499572e7b72442c4b2e466929018789f03454068c90cd483c8848a2545d82b4ccc05a6b3b510bd7720a SHA512 5f59cfdb4b50d55ce5268f7115bdad851b78e079ad6fdc499e72e211130f25612c6c3cf6c0f5db7cf18579aac0a1dfbef12da9ad43a169f1e51d86025bcd51e6
 MISC metadata.xml 560 BLAKE2B 01b265f54acd4ad1c9e1d23043d4ce2020fd41843a0efb09003046ea835989393df9935edcc3320eff43d552e47c2bb5afc688ddb96e9e6088c1e1c3a38fca64 SHA512 ba744b0b86d81acf54ed31c70e19be7ee315b6976b29cf0a40e79a7a227b8f68f4262ac2eecd696ddf051dd13de2019dae5df43706ca629bceca738e0e501175
diff --git a/sci-mathematics/gimps/gimps-30.6.4.ebuild b/sci-mathematics/gimps/gimps-30.7.5.ebuild
index f1cf70e083a8..f1cf70e083a8 100644
--- a/sci-mathematics/gimps/gimps-30.6.4.ebuild
+++ b/sci-mathematics/gimps/gimps-30.7.5.ebuild
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 979234487232..8946c63a44fc 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,7 +1,5 @@
 AUX gmp-ecm-7.0.4-execstack.patch 1568 BLAKE2B ccf8b74074bf357e74bc6126c505ebc77c389c851ee0ec35743c99270b6f36fa92d26c9df4b1f1a20e125a3b6dbd53522fa441d91fc4f8427d3b6d6ab50be07a SHA512 874924dd2f81c2e85dd4cdb0d8a14d1e22a9aca0c3883a9e16f1888f61b5af9b26a8c80469b65566a4becefce6a1d37ecdbba029648b4d62dc320f9e5a776453
 AUX gmp-ecm-7.0.4-openmp.patch 795 BLAKE2B 2a857cba5e0bc4e7dfe710c250bcb721dd2fd5e0c9c049987f8505d2efc758ff026b313bc92a2b18472bbebc320c8d1187c8506eaea6d2f1f6d51da284bca3ae SHA512 063d20e5a4cf088aaed31eb79c6b253ef4747d3d449c70936b4079c519480767f4f19dc259894422dc6d5783c9c360fc2c3a9fda4bb9b2a124a0e7bd90c08554
 DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-EBUILD gmp-ecm-7.0.4-r2.ebuild 1215 BLAKE2B c018b48131e2baeb0f373993b32c2a1e05b9669932ac54ece52ba30b8e0b63a6e59ff4506cbcd85bcb1d7e3ace665d993d4bae830ecb9f2909530fc41d3a78db SHA512 912183343a5a87f9fb27934de2e729a4eef66dec2a72ef6afbdb59eff91da2e2222647976b4304d186c40ef65a79a3536103527fbf0d9346419a46ddc3e5b476
-EBUILD gmp-ecm-7.0.4-r4.ebuild 2006 BLAKE2B 103f94466d63669a880d9b883799e2fbefb4f3d887eef3711569bf6e55aca319599c91b2b1b1979f922d9633e9491df3276037ff7f7100e85ed091001dc54b3b SHA512 c66648073d3097233010fccbcf55c16437910833cf521d8aad0cd22f272a0b65ea008809750abfecb1fe96d88828041382b3541a1740e6e35757593dd8003c40
+EBUILD gmp-ecm-7.0.4-r4.ebuild 2004 BLAKE2B 60f412108fdab2ca5ba1d06218e29311fad9899d5ad12cb7e50c39b4194dafc70b9c6e73d68b07cf2dc1f938744b37320e91d2d025b60d868397c26407dacc27 SHA512 b23a5852c8f28b9b8c857572ea6e864b8ae3fd91b07748636a3e575a6eb274f80051daaae981c1159829dcc5fd21874b9c4087f686f88d4ccaaddb9ca13768dd
 MISC metadata.xml 643 BLAKE2B 90da8b09f30dd8bd8d4df3dcc388663e52d57ea7b2974becede9ed0c592eaacb33958d202cee33988b79364e058ef84676e995b9d8467beb1f7d89ad8b177136 SHA512 e2f0d6f286440543ed15531183671b30f0044c38685e58617d004286b596ba1b898c470dc39e2ebe95db10c83be9430f1a010539ba2b0231883fe6bf4b0b97a8
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
deleted file mode 100644
index ee5812002ccf..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
-IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
-
-DEPEND="dev-libs/gmp:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/ecm-${PV}"
-
-pkg_pretend() {
-	use openmp && tc-check-openmp
-}
-
-src_compile() {
-	default
-	if use custom-tune; then
-		# One "emake" was needed to build the library. Now we can find
-		# the best set of parameters, and then run "emake" one more time
-		# to rebuild the library with the custom parameters. See the
-		# project's README or INSTALL-ecm. The build targets don't depend
-		# on ecm-params.h, so we need to "make clean" to force a rebuild.
-		emake ecm-params && emake clean && emake
-	fi
-}
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable openmp) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable custom-tune asm-redc)
-}
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index 800fcf6b3584..d090e6592b6d 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 35e497b3539e..b8e03b538908 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -7,5 +7,5 @@ DIST octave-6.2.0.tar.gz 32620419 BLAKE2B 55fd06336263b43f921ef30cac4fb82951a6be
 DIST octave-6.3.0.tar.gz 32859335 BLAKE2B 032f0e74b2fcd41358db1adc7f7274f6c8e327f5f86a32739864078bf236af26544f5988e774ebdd2ed28a6906e86556ce44ecd4bc5d3e710d839ecf5dcad9d9 SHA512 9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b7aaaa40519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
 EBUILD octave-6.2.0.ebuild 5384 BLAKE2B 2069e4642fdbfc3f9fc8f1f32cc7f8158f8b19b895078649e2c7d6b3a8a3a4a90974416acf4d63d8d3eddeffcdaa6c0fea19adc41d45746b24dbaade8f425ab7 SHA512 3bcf79a1f9836a8a24e94e4b637030bd573e4c90f090a76807e0dbd1dc53b5417c6669bf760852f628b6836f96b0ae452d81596ff6ee42aada95c6d04f85eda3
-EBUILD octave-6.3.0.ebuild 5134 BLAKE2B fd44f94ae9fbfb79d14454a226f125e4d80a0f266f2f36ac3339870a995258780edfe16077dfec8719a5222989ca1adbd7f469afc3bac207b870a48e487da423 SHA512 a0ed121465799575865f4a5227b34f0626c5c92954cdfed3f1daa7a2f72422be2fcfde43f449a13d34f16760d5af7a7068db54932b893ed7d5b5157ffeabc7e2
+EBUILD octave-6.3.0.ebuild 5141 BLAKE2B b71e881edee3c2870506b3f671c2164257ab0eaa6b89088f7b150cfb1785d754b1c54426a725013f7330570e6db6f709c430663bb6c90e601224444d949bfd5b SHA512 7357f59c466707efa991eee029e140d283e03c6576ca02078b0483002e3b3d21044acb12ba50d2be1e86753558ac7840e2fc3f33f85c9cf7af1b705e2604809c
 MISC metadata.xml 1154 BLAKE2B 34f491369b5ef047f0540be74994b9d6507310db475dc25868e2320e5c4474ebeaba2f80ba90759df53c15294c71ad9631e5f98ad81d2098d3e86e308d5c9eaf SHA512 9f73af69e5318693db98720836f0df25518c4bc3ac9ff72071aa04aaca1147e2c21d14a299b199689e926bff059c33c20f39b9f85062d1e1227e466b2b8b3446
diff --git a/sci-mathematics/octave/octave-6.3.0.ebuild b/sci-mathematics/octave/octave-6.3.0.ebuild
index 0b1370942764..5c1ff358633d 100644
--- a/sci-mathematics/octave/octave-6.3.0.ebuild
+++ b/sci-mathematics/octave/octave-6.3.0.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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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
diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest
index 2c3a35771c34..3425c368f176 100644
--- a/sci-mathematics/petsc/Manifest
+++ b/sci-mathematics/petsc/Manifest
@@ -7,5 +7,5 @@ DIST petsc-3.14.6.tar.gz 39719179 BLAKE2B d3047baf87c67eb64ef02c0c54d6313ea06f09
 DIST petsc-3.15.0.tar.gz 15976488 BLAKE2B babfbeb05321c9cb2f7d70ef8ffca974a016eae73ca1a3359d9a8d38aa5aa90ff34571169a5711627d738b93f89fdee3d0a0ff1bd0e51cb7300bbb9b0a8675cb SHA512 d1565823d8a5ce5e1c2c576bbe1b4ebf467cef20bbd8e0cf6c303c6c2af2bf902b66c79468f4e125496f9242be4bd6ac162535ee30252cfb902c0d906a6f27c0
 EBUILD petsc-3.13.1.ebuild 5441 BLAKE2B 4667cec337591f42d271ec0560e7552e770fac5f0763840086bbe7c29b03c68f6668bfda76c4541e21b55be5ef5b9f9a6ff8e636b190b0db967c1a222e9a6a44 SHA512 81440b0d64bef9334378d30956e9d9b509a67724f3c3b45d94ef3ca74daae1c87d2653df34083e6f6e337be164d8dd75d89f8f2e8268db1d29c83e65973b9317
 EBUILD petsc-3.14.6.ebuild 5333 BLAKE2B 8e831ca2e5196debbdbc15cdb67c492fdf23842450e46f1b9b8d6213614bbff4eba784b5ce7e64bc298752db63d3fb32aad0cedfcd966be4070dd5a672a6e6ce SHA512 a3f5e32ac5399b0a037381e7a649326eb6a0baf4a85b3865a2f449a38d379f2f176a3a596336bf9e62b812612c09407c1fc59824f9a4f0fcb48832bdca06a55a
-EBUILD petsc-3.15.0.ebuild 5253 BLAKE2B 6516dbec2cc2ea7adb05bc0b5d7feef770ea9d24ad3e9680e84a8d04117434e7555b22b760d69c74a247b48282532955dab71314e5939de4406e25ebb2322363 SHA512 49aa26b5019f9f992dec1bd4c6ff5c97ff9a0c6f5e05bef492c41e99831979791704adb21b8e11ab0cd61e60a74e1bed25e35128d320ce2d1518f831e396188e
+EBUILD petsc-3.15.0.ebuild 5255 BLAKE2B 41d04984205966ed4a05d5ea222ca4cfba15694ec4beeaec2fffe3963063a022257b06a2705ae1b101e86a45a037b6e2eec1678004c24f5bb5dbac422ae0a48c SHA512 715207f30704835e5c868d005d6acf6e769eba6037cd1bdaf61d7cca5bc889d8179721cd89168484737591b574c5d831e1ad50f83125fa9120b002589aa9ead9
 MISC metadata.xml 1132 BLAKE2B 97f06bc09680f9133b4c693b4d564dcf0e45a839114be1d49bda6a2adc5521b7b4236af50fab81603212456a428406a7eb78f9266be1f28367f032ce6f526cb1 SHA512 1ea1407782022a64ee166b9cb1b9408ca1c30f13fc94c3da1f2484a8ea3ae79ebe109f4c3cacaef3152360fd8eb8a2e6d9383d307b35d0e36dd193f5ec10478d
diff --git a/sci-mathematics/petsc/petsc-3.15.0.ebuild b/sci-mathematics/petsc/petsc-3.15.0.ebuild
index f1f095b8b2cc..b728a0178015 100644
--- a/sci-mathematics/petsc/petsc-3.15.0.ebuild
+++ b/sci-mathematics/petsc/petsc-3.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
diff --git a/sci-mathematics/slepc/Manifest b/sci-mathematics/slepc/Manifest
index a5e824208036..2b7c9b42733f 100644
--- a/sci-mathematics/slepc/Manifest
+++ b/sci-mathematics/slepc/Manifest
@@ -3,5 +3,5 @@ DIST slepc-3.14.2.tar.gz 4865497 BLAKE2B d6fd0b45368383fad03b17f9d7f0ef26215b745
 DIST slepc-3.15.0.tar.gz 5191730 BLAKE2B 2fcdfbe25f59a80390478059ef0a8b066ac39b57e99fe65ab4fe4814507fdc78d1feb245df5f7542f08c151d20f2e2a6168c4bc2624f78ab5058627816bb6696 SHA512 f815f0805db3f3e329324778c172ba301ebb5d2fc8f8f4c5dd17e574a2cbed5c0f8015715bc908dfcbd4050fade8dab7ae3b312bae746c41d84c57bc5d101929
 EBUILD slepc-3.13.1.ebuild 1581 BLAKE2B 291e731de8209dfb55923816e77edd14017ffec77db4cc96c51fb4d9af14fb273141e424059d77cd123ccaf1d29d436eaa17d8b8e0e5b09eceaa580b52711d7f SHA512 2b59fb26a733c4f1ccb9bdc894cf0534dc0a9d6e150b70a22dd456082d6db7961704be5dade2fc4761930931aa845f486d66db72b0eedae63b21bb9e69054aa2
 EBUILD slepc-3.14.2.ebuild 1581 BLAKE2B 291e731de8209dfb55923816e77edd14017ffec77db4cc96c51fb4d9af14fb273141e424059d77cd123ccaf1d29d436eaa17d8b8e0e5b09eceaa580b52711d7f SHA512 2b59fb26a733c4f1ccb9bdc894cf0534dc0a9d6e150b70a22dd456082d6db7961704be5dade2fc4761930931aa845f486d66db72b0eedae63b21bb9e69054aa2
-EBUILD slepc-3.15.0.ebuild 1581 BLAKE2B 291e731de8209dfb55923816e77edd14017ffec77db4cc96c51fb4d9af14fb273141e424059d77cd123ccaf1d29d436eaa17d8b8e0e5b09eceaa580b52711d7f SHA512 2b59fb26a733c4f1ccb9bdc894cf0534dc0a9d6e150b70a22dd456082d6db7961704be5dade2fc4761930931aa845f486d66db72b0eedae63b21bb9e69054aa2
+EBUILD slepc-3.15.0.ebuild 1583 BLAKE2B 1897d8420f72f8732d604981f73fc00770749195cc8310b3ca4c464a2e07793b0445549dd68f14bb48973f686b39f95639388478cd0b2189251f4c1952d2272c SHA512 e9cec56f0df9015ddadd844392f50d0cc8faaf2929c717f07089af0b2dc73a43ed9d3fdffa23c49a254e445dfec034d62026242780392404b49ae79e7a0508dd
 MISC metadata.xml 452 BLAKE2B 88f38d59fe707307721dce331ce359fb394e246e86c9acffe2bca8dcbd08f02f843ecb1c3812ed15af022edb2ccb4132e16067da9ac58129dfdef4119cc00738 SHA512 37974d7da3a3b4ae085ac3430c85ff74d4fafe453b9ef32cccebf893cdcc3074d89f4560056e7e54145ed24fa4f76a2126baf9a01b6a5477babd4fcb412f792c
diff --git a/sci-mathematics/slepc/slepc-3.15.0.ebuild b/sci-mathematics/slepc/slepc-3.15.0.ebuild
index b30b13af2da9..0cd112cb1f08 100644
--- a/sci-mathematics/slepc/slepc-3.15.0.ebuild
+++ b/sci-mathematics/slepc/slepc-3.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index de8c4942f1aa..bd5a04b1bcea 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,3 @@
 DIST z3-4.8.11b.tar.gz 4801435 BLAKE2B 903a04246fe4dedc96fda653fa9e3a57a80b951d20b992306bd07bc778cf0a94cf36fe4ed3f178bb26196a1ca294834c784a117fe906d52b82f874a43869d110 SHA512 dfcfc85209dd00aa5f07de0a7e7186a33442b72b94b05c01f53350b9281551be2a2c21ad5e7814bc2c52a3329be8df578e6be8c387cbfdc3a9d3bef0611d6613
-EBUILD z3-4.8.11b.ebuild 2429 BLAKE2B 68983cb9280cf7f92358c76088b5bb8986fdb1e18bc8168353588aa3dce5ae730f85ac5a5edd74d5bf08e3f71fdc53a56a40b606cf0cbc9279f4590cdb810c34 SHA512 ac16f7be8563ab8d98be87f8aa9788e4674742f79475a03d1083b8a538d96d68ba018c441c6a07b694177bdab8de7627632387998688f2a5230a27f49d76b350
+EBUILD z3-4.8.11b.ebuild 2610 BLAKE2B 62e0920d9e4ba69c65fff37bdc74c70f7177853f3b8ff61b2f4a50dd09d72d0f42ffcf71da152e2c5b80d1ff4e26b96d683f10a439c8a8270cc8f6dc50fb3faf SHA512 457a93cfee6bb224e5d1987a7ecaeba18f3f478ac26a222ed4c93e249225c46834d07800e9049931833e01d8ce1e5fadca09ab24df261fbc4b1165e1290845f9
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/z3-4.8.11b.ebuild b/sci-mathematics/z3/z3-4.8.11b.ebuild
index d4386c546aac..aec3b57fd997 100644
--- a/sci-mathematics/z3/z3-4.8.11b.ebuild
+++ b/sci-mathematics/z3/z3-4.8.11b.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake-multilib python-single-r1 toolchain-funcs
+inherit cmake-multilib java-pkg-opt-2 python-single-r1 toolchain-funcs
 
 DESCRIPTION="An efficient theorem prover"
 HOMEPAGE="https://github.com/Z3Prover/z3/"
@@ -28,6 +28,11 @@ BDEPEND="
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
@@ -40,6 +45,8 @@ multilib_src_configure() {
 		-DZ3_INCLUDE_GIT_HASH=OFF
 	)
 
+	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
+
 	cmake_src_configure
 }