gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /sci-mathematics
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
85 files changed, 1573 insertions, 666 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 08c87a5277a0..6784e5197834 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index 8cb19dc91767..eddab6a7bd73 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -2,6 +2,8 @@ AUX arb-2.18.0-build_type.patch 866 BLAKE2B c127152e03d8dd532558a7dc95e4dd2cc107
 AUX arb-2.18.0-multilib-strict.patch 590 BLAKE2B 7f438139ff5f0a19db074ea3bfab064da968424520bc81af242b58675657a7cacce0921076cb5525e00e2d6c33f2b75ed898ffdba7ce730855b09f2b7f8863a1 SHA512 ec9de9a642dd4cb859460132ed597474df4eb2b3f28cdf3ebcb5109fedc2866eda91b0d301149d94f71dd67c105a1dda3d0aed94dcfe34c9ff9fc4083ee6817c
 DIST arb-2.17.0.tar.gz 1589083 BLAKE2B 68d5b04dca24129ceaec4e05124e35b474157cf1efbb6505121a03058e014cd4eb67b99497dbbafcf62e9e31f9d11c92f749f6e047e6b1513b6c0cc5ef8f22da SHA512 201e0cebbd1c4857d194e5531c76c6e45a478cf6965b836818919adf0fc04f0fe25e16ecd49c62a438876b67f009b872c4f3c774fe35620be0b22c5e08bdb824
 DIST arb-2.18.1.tar.gz 1595831 BLAKE2B 010ae7a17a9cc1c11ded5806ff761115f3e78c48a5d8fc058eae0715b1e00e40345d4e6445a84c71c37627879648f445663dcc3bbcebdeaac8439a993ade38ee SHA512 07afb45829119bc695926dab4221051b221c2cc3952e42c9928efc74570b05fc01c97ea86b1b67c16d7a19a55b4e32dce97e08c9b72f36b33dd62bfccd19bb05
+DIST arb-2.19.0.tar.gz 1606463 BLAKE2B 85d832113ae42737a460198cbf485f825a9435963a888c0d0ab87b7ed7277d158480b573fd8ace42484dd4767bf4f1a372f637cfff01f18c105fd2b62d0d019e SHA512 199d1a26edd01e3b30f7aef69a9ae29456e3db384037744a1e073007ddb93a248873dfe83f3e48f9de58a9d17ebd7dc9a22a058f4adf766599d01d7eb17db204
 EBUILD arb-2.17.0.ebuild 2024 BLAKE2B 2f2f914247a7d094219271914125633fcb40df6aebd1d721de8cff1580b4bd7ba03eabb9f6ced6c36f50008e7f138b8064fb7aa4dca35ff312f7058a7d70ca68 SHA512 0a16600bf1f11d6976c244a03c2844137b06612e7a860447835d5056c68f04a91478db041dcf1fb82a75528e91b68160a8c43d3332cd40ed90bd002a706decb7
-EBUILD arb-2.18.1.ebuild 790 BLAKE2B 504d3e8095e7ece23fe9863218452c09f412f2eb5497e83ab609db21455f1f72b6b618ed290ad777fa7bd39d2f446e1064b0c019cf8e60b5139daa4dcacbaa94 SHA512 7f5bc91dc8d39e2d5f919f61d90ad29e41f609dbffe7a2513846b54ec7bb810ee030ed358e9edf0b3b4fab74b570bb058666ee95961f286f09bea37d2f940589
+EBUILD arb-2.18.1.ebuild 778 BLAKE2B a8b078451c6ae4907242d87c08a39814bf1c4e77648ed20ccecdc0a93810e3553b03e01aea9a194de9d8c853f871ce016717c95a5cc3dcc53604d1fb77a5067c SHA512 edd48a1e3724defd85700a5c6ec6b98ea9c12cae5f060c540be4610c7e7c8cf266d76ce7522bb482f868e8bede4430d2fd88996d985b6ea294ee79cb4713b938
+EBUILD arb-2.19.0.ebuild 751 BLAKE2B 84cdad6036faaf1a78268921ce0398addc31c6ac4e70681af10794f1c14c50545998870d31c28d8d59f0479ea7b9de395b8e9668daab66e0f2b2f894476d4978 SHA512 c484d59ebfb19fd9a9e05f69c9b7a246bc2e2d6802bb3c938afd3fefc82d984c7545c9b4314b61e949dc05ede11d222e377a66e50eb3123e385d643e983db125
 MISC metadata.xml 1107 BLAKE2B f9d008fa5d063c0c184aa8f4b6b8588b56d417936a19c350fb252adfc0e95e14e2ea81e3f9bd1d56d1c5b978e5964b4cc3d37603cedda9c55c0a111d0987485f SHA512 7bb01ca2427e92d6ed0c65c495922cb80d241b988bd73741f132c522cac3f3c45a796a042f7ace440eb8eecfc483a1f7c01928519b8999cff52e78b111ac1296
diff --git a/sci-mathematics/arb/arb-2.18.1.ebuild b/sci-mathematics/arb/arb-2.18.1.ebuild
index 61990112221f..ec1bac182a3a 100644
--- a/sci-mathematics/arb/arb-2.18.1.ebuild
+++ b/sci-mathematics/arb/arb-2.18.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C library for arbitrary-precision interval arithmetic"
 HOMEPAGE="https://fredrikj.net/arb/"
@@ -33,5 +33,5 @@ src_configure() {
 		-DBUILD_TESTING="$(usex test)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sci-mathematics/arb/arb-2.19.0.ebuild b/sci-mathematics/arb/arb-2.19.0.ebuild
new file mode 100644
index 000000000000..7a20eee66908
--- /dev/null
+++ b/sci-mathematics/arb/arb-2.19.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake
+
+DESCRIPTION="C library for arbitrary-precision interval arithmetic"
+HOMEPAGE="https://fredrikj.net/arb/"
+SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-2+"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	sci-mathematics/flint:="
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.18.0-multilib-strict.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index aa44db3e56ac..c8286cba3daf 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -1,4 +1,4 @@
 AUX calc-2.12.5.4-as-needed.patch 6226 BLAKE2B cb75c4ffbc5fd916e6d94d00bd32f8170be6eb82f47f1fde3d2d5968853ac7c7719883844563df6b545aa7226b178f9f54f7adb89a843fdd9ab7b92701193276 SHA512 fd65cdc727b9859d8d1a55e4140bb74301dc1941f647f5d52026818a1da56f90d21eea26a578bfd4fb0988cb3c516985239e8a06a3de15a9109fbe77b9536466
 DIST calc-2.12.5.4.tar.bz2 956258 BLAKE2B 47c2ab46c47baf0d1f1d202a36e0d42cf0b25f7eecf61815814081b2f76aa65dc8cc4e970078a5176266ce1332751169424d1c6d2c16ff148a1b014986b56d47 SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f
-EBUILD calc-2.12.5.4.ebuild 1313 BLAKE2B 5add771307505fdf9715f931306a7d2787e12650d0a2e934d9a7965ca7324ae3a6d90cca2b391f63985337afe48d3d9df9b9bea823fcecbca0ecebc8027f99c8 SHA512 ccbb388e68777c4a674504324e1dfaf0ca67c4a3125350a3ebe06c8f0f75989c6edae559475b0152e6a8200f74b04ce29eb50dad383a7a6c2eb17ee335cdfc43
+EBUILD calc-2.12.5.4.ebuild 1307 BLAKE2B 10710094c959e3fddcebadfe9930d502f2eb9066f328f334cf1aa07f68c1904b615a3c78d0780f14805a79065beadc6d155f1ea5aeb6d0273f1218eebae134f6 SHA512 d7946e90939b06292bae693aefdd3a7e86055f0f10de03d71d339873d43e1fba93949fb52011ca98b70767b948b2a1d81c0ce9737798dcbe0d68412a9c4cdd4f
 MISC metadata.xml 711 BLAKE2B 6c2e8e29413c40ccc3226b0e90f181b0ef4dea5d26bed5acc054c05576ca3c339ea433b4aaa45e940515346e83fffaf93d210a0eaecd55a64b822b425b54798f SHA512 8d88980b122ab65162de6d7038f4fc3744f741dabaf543d3edb6a013b61c3c6b53e30643174064c14fadc6d85d08c141aae0336f347b95caa78019c4e6fa8290
diff --git a/sci-mathematics/calc/calc-2.12.5.4.ebuild b/sci-mathematics/calc/calc-2.12.5.4.ebuild
index c8ebd6a8570c..d2a43a0ad77a 100644
--- a/sci-mathematics/calc/calc-2.12.5.4.ebuild
+++ b/sci-mathematics/calc/calc-2.12.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,8 +13,6 @@ SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE=""
-
 RDEPEND="
 	sys-libs/ncurses:0=
 	sys-libs/readline:0="
@@ -39,7 +37,7 @@ src_compile() {
 		LDFLAGS="${LDFLAGS}" \
 		CALCPAGER="${PAGER}" \
 		USE_READLINE="-DUSE_READLINE" \
-		READLINE_LIB="-lreadline -lhistory $(pkg-config --libs ncurses) -L\"${S}\"/custom -lcustcalc" \
+		READLINE_LIB="-lreadline -lhistory $(tc-getPKG_CONFIG --libs ncurses) -L\"${S}\"/custom -lcustcalc" \
 		all
 }
 
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index e8bc753d85c7..9296dc727de8 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -2,6 +2,6 @@ DIST coq-8.11.2.tar.gz 6564523 BLAKE2B 37ae7a1f899b8ce662d5c21542b2bec0e2e8f25e9
 DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
 DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252afc05e046267cae4265c1be71f89d0345f9e40ab3a93f5063080fd0224502cc0de808c7a0ddbb0edacab5fca SHA512 c355f0a9183f3669debd5f8f4ab96786215d0cccc37d1c2ac95a2d3c6115c8b0ee7ff7e23464b18444e2648ef3f8c221f0f3a28acf91199751cea2b74ee3fe8e
 EBUILD coq-8.11.2.ebuild 1828 BLAKE2B d07bc2a17b827c6e063e45b8f025b492405d30ce6e1a5e8e297bdc4395da7a3d2f7bf8f5ad25e6258aad3a386f5cbf22bae5a75c442539ba88845e52b151f3f1 SHA512 f1b63d03e3e0a22c6491171ea481f44bbb178783ad7d8dff90e96dca6aa3b28392e4d05366f6bbfd6fcc7417f4a01349f206a994c5eef3b07adb64b3deb43184
-EBUILD coq-8.12.0-r1.ebuild 1826 BLAKE2B a19aefc94ef90a5bbefad421a64ce70d67f4300f565b3a3bc26ecee6388a753f3e711ab738effdc9a9afa26b65fa608a2e938b8299d1ce10502fc9275caa84d9 SHA512 6f25da4262d515986f1f1c8535e8cd0b4b4d539bc4ce1d8afc4dd43710b15db8ce7db8b59a6699c0d816356f3a2ca87ac91eb57ae57bc709a545403fb6868158
-EBUILD coq-8.13.0.ebuild 1800 BLAKE2B 62589bd54d8387dd7b6edc0a04708c2288b35c470dbffdb97046eee76d5e1c870616c6695179b3c5aef83da39eb125886e3645a51ad9124afe5ccc527f6de577 SHA512 e02446464e6d91f599168329238e9f51e79c0b3400864e8e2a64fff90616c2df44f490a2b3a7a3d12d9b2394397614fdf36ce52158c1ed5a5e4e85eed894b9ae
+EBUILD coq-8.12.0-r1.ebuild 1830 BLAKE2B 8a1608893ea50abad518fdfbebbacb01967896d4850700be4952adac3118d76246d0e7484d7fe88c79de873d959779152c2e7ca7a628b1d618652e20e9f0a987 SHA512 f9e0119093fcba4a17bf26fa8df67c88c25e60fa4e49e39dd981bb21b3e399fffa7fdf555cd4e1ac159c88807cb7c807ade22fd35d9d68a633807dadd2906a1a
+EBUILD coq-8.13.0.ebuild 1804 BLAKE2B 6b443acfa491ea6185cd5fda18337b4a1608a17e56794ec84ef20aff4fae1a941ea0d2b4060f3f5c66f64c580957742c7bb6d9bdbc88f01302da5a7fad234e59 SHA512 52dadb822e75899e0c7abb8b0c4fc4f0c241b9b4c52e254d9660d3df459d551d6b2db9ed57dc797864fede37e8b533023e90b6e003d04dd4d16f1a97a5198fc9
 MISC metadata.xml 938 BLAKE2B ddeb43293328ab548a13f28c10bf9c0980f88a8f3652002c85171b0e9671873f820eebf6802cc55561cfc032f067555a9d7bb249780015f1786030e6cb4e52d4 SHA512 940564ff79f4165412e85cb2eeb3bfeb86447de012c1d4d78d01c1a52bd4272a78253bd4fe2208ed2ba62cf2141758a9411c9d81a4122bb9457b7091ba3e4ae8
diff --git a/sci-mathematics/coq/coq-8.12.0-r1.ebuild b/sci-mathematics/coq/coq-8.12.0-r1.ebuild
index b1c11d4f6633..3efa55afdcd4 100644
--- a/sci-mathematics/coq/coq-8.12.0-r1.ebuild
+++ b/sci-mathematics/coq/coq-8.12.0-r1.ebuild
@@ -83,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install -j1 VERBOSE=1
 	dodoc README.md CREDITS
 
 	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
diff --git a/sci-mathematics/coq/coq-8.13.0.ebuild b/sci-mathematics/coq/coq-8.13.0.ebuild
index 0bb383826cd3..88e7292b5a63 100644
--- a/sci-mathematics/coq/coq-8.13.0.ebuild
+++ b/sci-mathematics/coq/coq-8.13.0.ebuild
@@ -81,7 +81,7 @@ src_test() {
 }
 
 src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install -j1 VERBOSE=1
 	dodoc README.md CREDITS
 
 	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 7c431b2fdb63..49486bb48265 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,4 +1,4 @@
 AUX cvc4-1.7-gentoo.patch 1665 BLAKE2B db98e67fb3b152e0c78019b21b32c99d06377f1b1c1cc6a3ac2edea5e27d6f8ba082fc209c3694e1144a94d9d3b1897418af250252ff40a26e521bbf72d7da0f SHA512 b6b7af8c48c0398375343c8fa72f3e15d8f9031848cf94e6e2880f04b5e8d695691dcf67b84daa1706464289f7db0300046af4c93adcf278f7951eccc734af89
 DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
-EBUILD cvc4-1.7-r1.ebuild 1416 BLAKE2B a5eea60a34ee3f52b1328631a805d54e88a1b112e1fca5c03ede60b2a1bc75f12193df482a72d3ce3aa059aaa78f0c32d7406310aeaea59e6300a56f4aee1c6f SHA512 a1f43f58c979a7d302f41075dada1fe313a4862c4fd9c01c4b634fea9946d3dde5fbc126fc895e9752dfb3886908795f0945e395a05524810bde9fdd37ef7b7a
+EBUILD cvc4-1.7-r1.ebuild 1379 BLAKE2B c806041f0941649a8108f6148ad2226647721a9396e5d8d889649e3185ba229aaa405ab1a22409aa4d1b7a21142213646df734e24bcec26b5899bbd114d92aff SHA512 d4ad9b8b61f48feb744d3ea5f6964112e63e9beba1f156b997bcde57a2aed295a54e3e93444d9570d997979a81b3fd74cae5f4fd335df201b504ba2ab9b67469
 MISC metadata.xml 801 BLAKE2B a8dffba2bb9a740412d4193911d1ab118336993d12d6d7e42c758af438d297baf6798e2ce9c6aa9be4282678e366087d54b8d3f8c46b43be6d73bcf421ee318a SHA512 d90e35c93e5defc5599f5e9d9b88a757a4a845574684270f1aab0cb8194c50b31fa3135ea221f63d0d71f867619c039f32cfb46b63fa370289e8eb5205d3b25d
diff --git a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
index e50bae6113f6..36e9f4689a67 100644
--- a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+CMAKE_MAKEFILE_GENERATOR=emake
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake python-any-r1
 
-inherit python-any-r1 cmake-utils
-
-DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems"
-HOMEPAGE="http://cvc4.cs.stanford.edu/web/"
+DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems"
+HOMEPAGE="https://cvc4.github.io/"
 SRC_URI="https://github.com/CVC4/CVC4/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -25,12 +25,11 @@ RDEPEND="dev-libs/antlr-c
 DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
-S="${WORKDIR}"/CVC4-${PV}
+S="${WORKDIR}"/${P^^}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
-	CMAKE_MAKEFILE_GENERATOR=emake
 	local mycmakeargs=(
 		-DANTLR_BINARY=/usr/bin/antlr3
 		-DENABLE_GPL=ON
@@ -41,7 +40,7 @@ src_configure() {
 		-DENABLE_PROOFS="$(usex proofs ON OFF)"
 		-DENABLE_REPLAY="$(usex replay ON OFF)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -54,10 +53,10 @@ src_test() {
 		smt2_compliance \
 		two_smt_engines \
 		statistics
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${D}"/usr/{lib,$(get_libdir)}
 }
diff --git a/sci-mathematics/dsfmt/Manifest b/sci-mathematics/dsfmt/Manifest
new file mode 100644
index 000000000000..31d6b57486e1
--- /dev/null
+++ b/sci-mathematics/dsfmt/Manifest
@@ -0,0 +1,3 @@
+DIST dsfmt-2.2.4.tar.gz 4984255 BLAKE2B 6119445d93cb45faab28dfb52a18c07cd5703b243b3cddde35fff7a5e948fa8788dfe8428ae8e0a52604f91ac07fe7b3bb0f6c438ef93b5257b42baee9dfdec5 SHA512 fe84e986cbf198172340adfac0436b08f087643eca3f1ceccacde146cbfd8c41e3eb0dfbb062f7ca5f462db13c386abd7c269bc0cbefc9a0ecf97a8a8870a2e4
+EBUILD dsfmt-2.2.4.ebuild 827 BLAKE2B 77b57fff30b2f5683925b10f9c28459e35529be12cdd450ab0cb3ea84e568ae2d41364e18193a035b31f48f77363aaa6eae57ed4bb8b6c1faada28808430dd37 SHA512 e5b0cd957e026cbd37ecdb168f73a86da3c6929b2a83f8fff5ca28630af9c6e224ce9a630d940c1c80a2096aed112c84e60f7d122a402eba0975a84759f2a2ac
+MISC metadata.xml 1021 BLAKE2B 8d0c65e23ff53a99a6df4e2bc3c43c9289cc6e4ac979a03f03ab6d80c44c8cf0eefd40e7d8fb91410ee5a41c774a48f34e533b477ab34a5ee07cda1fbff2828a SHA512 e2e66fd22d2374db3cb4bb8c48978acd02d15ef9a760c93ca5e2f4c1b530f4d7d7ac08759830d9a4f53d1d359bcc316328e6283ab0c317e34a3ef8280539c4c1
diff --git a/sci-mathematics/dsfmt/dsfmt-2.2.4.ebuild b/sci-mathematics/dsfmt/dsfmt-2.2.4.ebuild
new file mode 100644
index 000000000000..5de399e78f8a
--- /dev/null
+++ b/sci-mathematics/dsfmt/dsfmt-2.2.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MYPN=dSFMT
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Double precision SIMD-oriented Fast Mersenne Twister library"
+HOMEPAGE="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT"
+SRC_URI="https://github.com/MersenneTwister-Lab/dSFMT/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${MYP}"
+
+soname="lib${MYPN}.so"
+
+src_compile() {
+	emake CCFLAGS="${CFLAGS}"
+	$(tc-getCC) -fPIC -shared -DDSFMT_SHLIB -DDSFMT_DO_NOT_USE_OLD_NAMES ${LDFLAGS} ${CFLAGS} -Wl,-soname=${soname} -o ${soname} ${MYPN}.c || die
+}
+
+src_test() {
+	emake std-check
+}
+
+src_install() {
+	doheader dSFMT.c d*.h
+	dodoc README*txt CHANGE*
+	dolib.so ${soname}
+}
diff --git a/sci-mathematics/dsfmt/metadata.xml b/sci-mathematics/dsfmt/metadata.xml
new file mode 100644
index 000000000000..2a2a3a3027f6
--- /dev/null
+++ b/sci-mathematics/dsfmt/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>jeffrey@icurse.nl</email>
+		<name>Jeffrey Lin</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<longdescription lang="en">
+		The purpose of Double precision SIMD-oriented Fast Mersenne Twister (dSFMT)
+		is to speed up the generation by avoiding the expensive conversion
+		of integer to double (floating point). dSFMT directly generates
+		double precision floating point pseudorandom numbers which have the
+		IEEE Standard for Binary Floating-Point Arithmetic (ANSI/IEEE Std
+		754-1985) format. dSFMT is only available on the CPUs which use IEEE
+		754 format double precision floating point numbers.
+	</longdescription>
+</pkgmetadata>
diff --git a/sci-mathematics/ent/Manifest b/sci-mathematics/ent/Manifest
index 19412ef93a8a..e130d7cc6d3d 100644
--- a/sci-mathematics/ent/Manifest
+++ b/sci-mathematics/ent/Manifest
@@ -1,4 +1,4 @@
 AUX 101202-gentoo.patch 448 BLAKE2B dd9f87431c8a1b39826afe6d349543889932a4ea77f03ac2f7dbc7b6375ce471de928bfc055d12b84798e95fbcc5e1f721e2caa5886609648930ee9760282638 SHA512 5655516ffa53d65da36c7607c972592cb63d675293eb5163578db539db95b5172019832d50f9f5a641b94b0cbff78af6641d56a86619303ecc6533772460161a
 DIST random-101202.zip 76200 BLAKE2B fec032543e2b5721f558c641f9668544579db022e018ad025fad16b7402f9279a0b66c70465a6cae1cae81afecc04fccd02edc80f213d167cd513c18c876eda3 SHA512 f74cfae8cd8b9f405b7459a350571d3ef438bdba42508da59ca214f6e7f6372d253a4c1a30685aa7dfc1cf14dde9796ea54bf42aa103a63bae09a5bb3fd3d3d8
-EBUILD ent-101202.ebuild 562 BLAKE2B f24027fd59dedc2e05037329dfd0dfd410c4f449f63f0486a0328b1db99e3fdd621eb9a1ebfbcd2621931b88ad6dbfe170ea31685141f81f686514dbd525842c SHA512 64be67110edc53dc9901e3158c81922a74b8d12bf3e10f6d35d95d70cda4f7915f8055ee492b043e41f09782ce4802366e4afb177d28bfa65062eec42f9a5537
+EBUILD ent-101202.ebuild 559 BLAKE2B bfa6b02c2411ddfc5627278c453ff6d0c828f37914401e9f9afb5f85c9bf3884dfd5c9a79daf4a0be5f04504dfec91c8f890ebcdbc46e8bc8c4e8bbdc69e16e7 SHA512 4b71817f71e68b296fd1abff8320271212ef5284fde0046edb6554e8d485ea71242ac268b6031aaac9e85f70b928a80fe2edd7ab1a7390141d45c8efdd818ea2
 MISC metadata.xml 275 BLAKE2B aaeef273b6352edaadf69ef76545573fbe0d22a6062f9567bcb34b1fdea4e2fb140b9aa0b4d8f44a3c3e31108f34eb555dded6f5808fac84fd29a83ef184da88 SHA512 e7e449f8bf039a1fc4707c0b12706d27b237fb3e7bee5e457bc79e032a04d7b9eb2901059b007350cc3617689638b76f97fbbd672e2d0101e2071448642415a7
diff --git a/sci-mathematics/ent/ent-101202.ebuild b/sci-mathematics/ent/ent-101202.ebuild
index ca734a7d70d9..2c0a24c73daa 100644
--- a/sci-mathematics/ent/ent-101202.ebuild
+++ b/sci-mathematics/ent/ent-101202.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="Pseudorandom number sequence test"
 HOMEPAGE="http://www.fourmilab.ch/random/"
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index c7089d589e86..e5035955746f 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -2,11 +2,12 @@ AUX flint-2.5.2-memory_message.patch 504 BLAKE2B ff8ddc685c973f75a133f36eb1284d8
 AUX flint-2.5.2-pie.patch 3126 BLAKE2B 730b11cd1a47c476e7e12003a6a493fd019cd9fab7dcd5c691212bf23243378821b52c39bb0c1d0526e912aa6ae6b0d10939a155947932e6ba3df631df4cbf6c SHA512 58e11ac02c861f570887dcf61b1014fcb35e1b47104099a30511ad0ceab9340e4866b72b83f753421d8f33b611b59dbbe3156438789df69e0b3237320884d687
 AUX flint-2.5.2-utf8.patch 625 BLAKE2B ab76e01125f0f483b09c22a30656019963a98629c36e24f85c96800fe587dafaf2dbd2d26d4e319a97a29a6618ce9caa3078da5101a3ac6613f380596855a08d SHA512 cb0bdddd3de1077c01d118b0c9e7052d8510c1be976c44be0465bcaae41e02d6da80f78854e1bbff9ef47584c604b39181a2066dc0630e5effc7c77282d2352a
 AUX flint-2.6.0-multilib-strict.patch 622 BLAKE2B d383ce45fb82fabd62530cc15a8bda65f1b088a115985469cd5bfd13d96d0bb9a21d9a073d78aa7ee98f08bd3f75f81445f274777562bca8f317b553cb8483cd SHA512 d360d3d57427d66dedb2f12b2dad03dbbe8530b0bec4184829eed7d8ba534eb8d6e24b302b149dfb852e0415d2612ec9e6312f8f2ac6f0f6a264b8a1f0a66a78
+AUX flint-2.7.1-fix-cmake-findgmp.patch 5711 BLAKE2B c8191a307f8d6fb545cdee06acc1d84f4a8eb43ff96dc32be9f28dd0336e4f4130e0d59b2b446638c7f29f0b9da9407d675b9bf223addf9d584eb6177aef3b36 SHA512 825ce6f102ab3e4506ad691cbe0cf596176dd6262746d053181ed54afbcd980b8cdfd33fda7e690cd4c764a0a6df60af0cec58cd82baaeb60d9c381333bedd11
 AUX flintxx-include.patch 507 BLAKE2B 250e54de1ab5b70cffdac7348b78db543cbdb366efa419dea62ffed2b0b5f95b787019e96fb95b9253b5289d58a2322b41f660f1719516e410e4245b09accb7b SHA512 144dc23d8706e22c6ac5d50bc2ce6c9e2eb8016155bec48a809bceec435d07781105c073b669302132963f063ab1c311e7381f78cc29a0141ca78eceb25aa0dc
 DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
 DIST flint-2.6.3.tar.gz 4526340 BLAKE2B d663b44166cd857f83c2752eb4d4f6dc45eb8de535089e5dbe9939ac1464f1d69f66b62184644fff1ecd1d171f389d5ab874873def670c702733a0eba17bfd13 SHA512 8e71570364c789b1d4eaaa5f5adf10212cab47bf1a9f45c333211035ed021a86bb7b1de1feec51e83b2e113e8168853e370f127d2d2b1e941a12aec71fe8ae9e
 DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
 EBUILD flint-2.5.2-r1.ebuild 1714 BLAKE2B e1e6770c375f95ac1bb5d4284ffc205ba4a95d9933799718862ab31a12c87c3da9ed0c46509b808856a3663eef1d4bbd0c7334d9b1f76a192d66e196a2eb1683 SHA512 4ee441362d871807a93a9e9ab8d5a4d261f1c87ae0802525a780855ceb93666f3ca721a0fcbfc7d341522a0c8d81e3b28765ba6a1246a3535881e35e20ec24dd
 EBUILD flint-2.6.3-r1.ebuild 1170 BLAKE2B 48d562711cbc2dc0fb758b9f24679a9529e912ccf0008fbeb46d639f099798f69189266e2bda1a6b4c7337dd6dbd82f6fddd9db6a4b1cf7639c4e0d1b5ae3372 SHA512 891e482a3182179ffad15aeced9d8232c8b85b8ff399c3f396c7c36a053746a9e5cdbfb7633d60aa0f6935f41434f1001eb19445ea9dbd9740b8d5a1a901998e
-EBUILD flint-2.7.1.ebuild 1319 BLAKE2B 0e271b4fd9653f99dd6943f68cf8b994659aa48475f09030121b3effa0b049f9b2fd63151af61c0c683215e068beb202bb81cd6b12163744d3605c3692ab81b4 SHA512 91855546b21c7ab90ac22f1923524e964fc1ba6b1485274ad2219c8ce09ced3ef32618dab426874d62253e9652d6312968dbff2521d94286eb87199f50b7dd7f
+EBUILD flint-2.7.1-r1.ebuild 1374 BLAKE2B ff8a236d2cbf6b916636aa34a6ccf05373b84e36ad59eb3188214ab55b91fbdc12be435c742e4b7d34545f6eff1e0bfe26c1a092604ff3ede46cfd0006ada66b SHA512 9e2a7aa019698d4fc2e72f251cb3377c159b75ce73144feb8131ce1f065dd0ed6ae1d9f88bd2e094f5c64580e02f6aa98a176405019c3adf4fd3c43bd64c88f7
 MISC metadata.xml 852 BLAKE2B 9d4e42cbf30d12f45eee522daebfa264095ecc7da2a031a0c7676066f2dadb18e71d7c53fd1f5c7220c78276029532999e44ccacad31903fb174ce2bf36ae3d0 SHA512 f05df1daaf10afa63535a1db4bf5a75185e9523aced9329d90df59e5ca5d1eeee23b30dfe3fab6a11bdcc95b1b5e9a8b1012a19457c66e3dccbdab5a6e303e4d
diff --git a/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch b/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch
new file mode 100644
index 000000000000..d94d65c08d7e
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch
@@ -0,0 +1,152 @@
+From 9f1ef23f34a7ceca1063606cfc749e4d32bef81c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 19 Apr 2021 16:56:54 -0400
+Subject: [PATCH 1/1] CMake/FindGMP.cmake: compile a test program to check the
+ gmp version.
+
+The existing GMP version check consists of grepping the contents of
+the gmp.h header to parse out a few constants. This test fails, at
+least, on Gentoo, where the usual header file is a wrapper that
+includes the true header (to allow for simultaneous 32/64-bit
+support).
+
+This commit updates the FindGMP check to compile a test program
+against gmp.h that compares the version bounds within C, and reports
+success or failure as the return value from main().
+---
+ CMake/FindGMP.cmake | 97 +++++++++++++++++++++++++--------------------
+ 1 file changed, 53 insertions(+), 44 deletions(-)
+
+diff --git a/CMake/FindGMP.cmake b/CMake/FindGMP.cmake
+index ce4df70f5..bd2871ca3 100644
+--- a/CMake/FindGMP.cmake
++++ b/CMake/FindGMP.cmake
+@@ -2,28 +2,23 @@
+ # https://gmplib.org/
+ #
+ # This module supports requiring a minimum version, e.g. you can do
+-#   find_package(GMP 6.0.0)
+-# to require version 6.0.0 to newer of GMP.
++#   find_package(GMP 6.2.1)
++# to require version 6.2.1 to newer of GMP.
+ #
+ # Once done this will define
+ #
+ #  GMP_FOUND - system has GMP lib with correct version
+ #  GMP_INCLUDE_DIRS - the GMP include directory
+ #  GMP_LIBRARIES - the GMP library
+-#  GMP_VERSION - GMP version
+ #
+-# Copyright (c) 2016 Jack Poulson, <jack.poulson@gmail.com>
+-# Redistribution and use is allowed according to the terms of the BSD license.
+ 
+-find_path(GMP_INCLUDE_DIRS NAMES gmp.h PATHS $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR})
+-
+-# Set GMP_FIND_VERSION to 5.1.0 if no minimum version is specified
++# Set GMP_FIND_VERSION to 6.0.0 if no minimum version is specified
+ if(NOT GMP_FIND_VERSION)
+   if(NOT GMP_FIND_VERSION_MAJOR)
+-    set(GMP_FIND_VERSION_MAJOR 5)
++    set(GMP_FIND_VERSION_MAJOR 6)
+   endif()
+   if(NOT GMP_FIND_VERSION_MINOR)
+-    set(GMP_FIND_VERSION_MINOR 1)
++    set(GMP_FIND_VERSION_MINOR 0)
+   endif()
+   if(NOT GMP_FIND_VERSION_PATCH)
+     set(GMP_FIND_VERSION_PATCH 0)
+@@ -32,43 +27,57 @@ if(NOT GMP_FIND_VERSION)
+     "${GMP_FIND_VERSION_MAJOR}.${GMP_FIND_VERSION_MINOR}.${GMP_FIND_VERSION_PATCH}")
+ endif()
+ 
+-if(GMP_INCLUDE_DIRS)
+-  # Since the GMP version macros may be in a file included by gmp.h of the form
+-  # gmp-.*[_]?.*.h (e.g., gmp-x86_64.h), we search each of them.
+-  file(GLOB GMP_HEADERS "${GMP_INCLUDE_DIRS}/gmp.h" "${GMP_INCLUDE_DIRS}/gmp-*.h"
+-	  "${GMP_INCLUDE_DIRS}/x86*/gmp.h")
+-  foreach(gmp_header_filename ${GMP_HEADERS})
+-    file(READ "${gmp_header_filename}" _gmp_version_header)
+-    string(REGEX MATCH
+-      "define[ \t]+__GNU_MP_VERSION[ \t]+([0-9]+)" _gmp_major_version_match
+-      "${_gmp_version_header}")
+-    if(_gmp_major_version_match)
+-      set(GMP_MAJOR_VERSION "${CMAKE_MATCH_1}")
+-      string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_MINOR[ \t]+([0-9]+)"
+-        _gmp_minor_version_match "${_gmp_version_header}")
+-      set(GMP_MINOR_VERSION "${CMAKE_MATCH_1}")
+-      string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_PATCHLEVEL[ \t]+([0-9]+)"
+-        _gmp_patchlevel_version_match "${_gmp_version_header}")
+-      set(GMP_PATCHLEVEL_VERSION "${CMAKE_MATCH_1}")
+-      set(GMP_VERSION
+-        ${GMP_MAJOR_VERSION}.${GMP_MINOR_VERSION}.${GMP_PATCHLEVEL_VERSION})
+-    endif()
+-  endforeach()
++find_path(GMP_INCLUDE_DIRS
++          NAMES gmp.h
++          PATHS $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR})
+ 
+-  # Check whether found version exists and exceeds the minimum requirement
+-  if(NOT GMP_VERSION)
+-    set(GMP_VERSION_OK FALSE)
+-    message(STATUS "GMP version was not detected")
+-  elseif(${GMP_VERSION} VERSION_LESS ${GMP_FIND_VERSION})
+-    set(GMP_VERSION_OK FALSE)
+-    message(STATUS "GMP version ${GMP_VERSION} found in ${GMP_INCLUDE_DIRS}, "
+-                   "but at least version ${GMP_FIND_VERSION} is required")
+-  else()
+-    set(GMP_VERSION_OK TRUE)
+-  endif()
++find_library(GMP_LIBRARIES
++             gmp
++             PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR})
++
++if(GMP_INCLUDE_DIRS AND GMP_LIBRARIES)
++
++  # Return "1" if the version is OK, or "0" otherwise.  This is
++  # opposite the usual C program conventions, but makes the purpose of
++  # the result variable semantically clear. We create an integer using
++  # a few basic GMP functions to ensure that we can actually link against
++  # the GMP library.
++  file(WRITE ${PROJECT_BINARY_DIR}/gmp-version-check.c ""
++  "#include <gmp.h>\n"
++  "\n"
++  "int main(int argc, char **argv) {\n"
++  "  mpz_t x;\n"
++  "  mpz_init_set_str(x, \"7612058254738945\", 10);\n"
++  "  mpz_clear(x);\n"
++  "  if (__GNU_MP_VERSION < ${GMP_FIND_VERSION_MAJOR}) {\n"
++  "    return 0;\n"
++  "  }\n"
++  "  else {\n"
++  "    if (__GNU_MP_VERSION_MINOR < ${GMP_FIND_VERSION_MINOR}) {\n"
++  "      return 0;\n"
++  "    }\n"
++  "    else {\n"
++  "      if (__GNU_MP_VERSION_PATCHLEVEL < ${GMP_FIND_VERSION_PATCH}) {\n"
++  "        return 0;\n"
++  "      }\n"
++  "    }\n"
++  "  }\n"
++  "  return 1;\n"
++  "}\n")
++
++  # Try to run the test program above with the appropriate version
++  # strings substituted in.
++  try_run(GMP_VERSION_OK
++          GMP_VERSION_COMPILE_OK
++          "${PROJECT_BINARY_DIR}"
++          "${PROJECT_BINARY_DIR}/gmp-version-check.c"
++          CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${GMP_INCLUDE_DIRS}"
++          LINK_LIBRARIES "${GMP_LIBRARIES}")
+ endif()
+ 
+-find_library(GMP_LIBRARIES gmp PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR})
++if(NOT GMP_VERSION_OK)
++  message(STATUS "No sufficient GMP version detected")
++endif()
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(GMP DEFAULT_MSG
+-- 
+2.26.3
+
diff --git a/sci-mathematics/flint/flint-2.7.1.ebuild b/sci-mathematics/flint/flint-2.7.1-r1.ebuild
index 6557576cf7d8..912adc940b12 100644
--- a/sci-mathematics/flint/flint-2.7.1.ebuild
+++ b/sci-mathematics/flint/flint-2.7.1-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+# ninja doesn't like "-lcblas" so using make.
+CMAKE_MAKEFILE_GENERATOR="emake"
 PYTHON_COMPAT=( python3_{7..9} )
 inherit cmake python-any-r1
 
@@ -34,8 +36,7 @@ DEPEND="dev-libs/gmp:=
 	virtual/cblas"
 RDEPEND="${DEPEND}"
 
-# ninja doesn't like "-lcblas" so using make.
-CMAKE_MAKEFILE_GENERATOR="emake"
+PATCHES=( "${FILESDIR}/${P}-fix-cmake-findgmp.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/sci-mathematics/ggnfs/Manifest b/sci-mathematics/ggnfs/Manifest
deleted file mode 100644
index 5e2cec0c9da1..000000000000
--- a/sci-mathematics/ggnfs/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ggnfs-0.77.1-gentoo.patch 5074 BLAKE2B 34383c2303f5203b44dedb9944a291e7ee31e4ad0962d0f5aa938893869ff192d762cf3c5b8466600e9792e033c3d4001783ffbea4719c49f3dbff8115c91e42 SHA512 bc2dc58784aa5c78b79f5021f57f7974dbb475e2489d8864549134dbf002aefd7546d2eadca03d04daa89638de02494052583e91b4b79628b500a1c584dd3f0a
-DIST def-nm-params.txt 3495 BLAKE2B b3128f209a7849ab377b7faad65e7ee8b70c316e72530ad27d4bbdef447104d8af2249ebf7bb5d0036e41c61b61e309ca862c3c9f3d67285eba85fe8ce69e69b SHA512 b924292bc5354f87a3f88f2c35b767b9183704ced61c0e709cdd0974a2e1f34a4c170c6d12524b10162f63306f74001ad30e82ac7997d98db823006086772460
-DIST def-par.txt 4957 BLAKE2B 5e59798d257e96b3908163877b46919ca9e48cb72e678c3794b4e20425863c35cce57c8dadca99a670d46ed341b9d1a229b1277b60e5055646df267823bbd873 SHA512 fc0851513b1170e0a43e7458e24da4274146272018b7fefbe35280005ebeba20458756c4d4715b2a98780354dd1c5bcf31d98dd1388f1d352fb718062141c434
-DIST ggnfs-0.77.1.zip 2279013 BLAKE2B 25b825e0fa200ba64f450ccb6cda0fb6633e215210cf3dda6a3f8d8cf53601f4631f5deb81047347a927b9c9b7ef2bbf4de4e370d7c5d9a911cfcc11a75762ff SHA512 77f5050d1310df5de45e80a25c8421cc9240ce11776fc4af596ce19d8b064b926dcc7e6dd7b2ef12d86056f7af0b67db2f746fc261cba24bbcf1efef06287513
-DIST ggnfs-doc.pdf 252344 BLAKE2B 11851d276db415e07457106538833b9ff0d579f9a0312098067a297924114e2700bb8fa6ba5f86d6f64818fdf7a4608bc49dd4ce730abc2c99a1e9f195242fe4 SHA512 60f4153dbd31d7484b37a4f805eb71c9a785af884f228039136cd92e64ef145593dc0fde9e6f1c58a11d2d5124760d08d66566134f764e65f7dce86a36a11f01
-EBUILD ggnfs-0.77.1-r2.ebuild 2427 BLAKE2B 79d89f8a07ed4d21cb79e208ef84372b6f4fee1d86757ca85cc786cda94ce398eabb9bbf4348a4061794ca17699f972ebcdafbaf27904f1ddfb61bf572089a9c SHA512 ccccc36886db4f8c6c68fbcaf31304076409817d2ca13b31fc6a1eeacaf8032d548c601e08cb70c597e2cba3562bdcd883b912f9ddbae54c87dc9172db6cf811
-MISC metadata.xml 333 BLAKE2B 09d4676b1359a343d0f7fdaea4eedbc3c6923c26b4b5e9ab7387263ef4a67ddba5266ee4fd9953e280c70a0123d6dabd7bd9fdee43b78483b81444855d015f4a SHA512 9a14587ab135233970b6569cee5d7123a6a3f9fc86a4eed4ba47369f176b726321148ea705fed87b840d41558a1a73dad95af10098e4b721d51cc50d781f6610
diff --git a/sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch b/sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch
deleted file mode 100644
index ac7516034147..000000000000
--- a/sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch
+++ /dev/null
@@ -1,158 +0,0 @@
- src/Makefile          | 34 +++++++++++++++++-----------------
- src/lasieve4/Makefile |  6 +++---
- src/pol5/Makefile     |  8 ++++----
- 3 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 01f66be..59b433f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,15 +1,15 @@
- # Workaround for PPC
- # Due to unknown reason -march isn't supported there
- ifeq ($(ARCH),970)
--    ALLOPT=-mcpu=$(ARCH) -m64 -pipe
-+    ALLOPT=
- else
--    ALLOPT=-march=$(ARCH) -pipe
-+    ALLOPT=
- endif
- 
- INC=-I. -I.. -I../include $(LOCALINC)
- LIBS=-lgmp -lm
- BINDIR=../bin
--LIBFLAGS=$(LOCALLIB)
-+LDFLAGS+=$(LOCALLIB)
- 
- MATBUILD_TPIE=0
- TPIE_DIR=../../tpie
-@@ -17,7 +17,7 @@ TPIE_DIR=../../tpie
- # Turn on\off workaround for GMP 4.2 bug
- # Consult http://swox.com/list-archives/gmp-bugs/2006-May/000475.html
- # for more info
--GMP_BUG=1
-+GMP_BUG=0
- 
- ifeq ($(HOST),generic)
-     ALLOPT+= -DGGNFS_HOST_GENERIC
-@@ -32,10 +32,10 @@ ifeq ($(ARCH),prescott)
-     ALLOPT+= -DL2_CACHE_SIZE=1024
- endif
- 
--DEBUGOPT=-W -Wall -g -pg
-+DEBUGOPT=-W -Wall
- 
--CFLAGS=-DNDEBUG -O3 -funroll-loops -finline-functions \
--       -ftracer -fomit-frame-pointer -W -Wall $(ALLOPT)
-+CFLAGS+=-DNDEBUG \
-+       -W -Wall $(ALLOPT)
- # CFLAGS=$(DEBUGOPT) $(ALLOPT)
- # -ffast-math removed since -funsafe-math-optimizations seems to cause occasional problems, especially in sqrt
- 
-@@ -71,7 +71,7 @@ endif
- ifeq ($(MATBUILD_TPIE),1)
-   BINS+= $(BINDIR)/matbuild-tpie
-   INC+= -I$(TPIE_DIR)/include
--  LIBFLAGS+= -L$(TPIE_DIR)/lib
-+  LDFLAGS+= -L$(TPIE_DIR)/lib
-   LIBS+=-ltpie
- endif
- 
-@@ -97,35 +97,35 @@ bins : $(BINS)
- 	$(CC) $(CFLAGS) -o $@ -c $*.S
- 
- $(BINDIR)/sieve : sieve.c clsieve.c $(OBJS) makefb.o
--	$(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- $(BINDIR)/makefb : makefb.c $(OBJS)
--	$(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -D_MAKEFB_STANDALONE -o $@ \
-+	$(CC) $(INC) $(CFLAGS) $(LDFLAGS) -D_MAKEFB_STANDALONE -o $@ \
- 	makefb.c $(OBJS) $(LIBS)
- 
- $(BINDIR)/procrels : procrels.c $(OBJS)
--	$(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ procrels.c $(OBJS) $(LIBS)
-+	$(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ procrels.c $(OBJS) $(LIBS)
- 
- $(BINDIR)/matbuild : matbuild.c $(OBJS)
--	$(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ matbuild.c combparts.c \
-+	$(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ matbuild.c combparts.c \
- 	  $(OBJS) $(LIBS)
- 
- $(BINDIR)/matbuild-tpie : matbuild.c $(OBJS)
--	$(CPP) $(INC) $(CFLAGS) $(LIBFLAGS) -DGGNFS_TPIE -o $@ matbuild.c \
-+	$(CPP) $(INC) $(CFLAGS) $(LDFLAGS) -DGGNFS_TPIE -o $@ matbuild.c \
- 	  experimental/combparts_tpie.cpp experimental/llist_tpie.cpp \
- 	  $(OBJS) $(LIBS)
- 
- $(BINDIR)/matprune : matprune.c $(OBJS)
--	$(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ matprune.c $(OBJS) $(LIBS)
-+	$(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ matprune.c $(OBJS) $(LIBS)
- 
- $(BINDIR)/matsolve : matsolve.c $(OBJS)
--	$(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ matsolve.c $(OBJS) $(LIBS)
-+	$(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ matsolve.c $(OBJS) $(LIBS)
- 
- $(BINDIR)/sqrt : sqrt.c $(OBJS)
--	$(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ sqrt.c $(OBJS) $(LIBS)
-+	$(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ sqrt.c $(OBJS) $(LIBS)
- 
- $(BINDIR)/polyselect : polyselect.c $(OBJS)
--	$(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ polyselect.c $(OBJS) $(LIBS)
-+	$(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ polyselect.c $(OBJS) $(LIBS)
- 
- latsiever :
- 	$(MAKE) -C lasieve4
-diff --git a/src/lasieve4/Makefile b/src/lasieve4/Makefile
-index 31e05a9..6886b16 100644
---- a/src/lasieve4/Makefile
-+++ b/src/lasieve4/Makefile
-@@ -10,8 +10,8 @@
- # 6/13/04: Hacked up for use in GGNFS by Chris Monico.
- 
- INC=-I.. -I../../include $(LOCALINC)
--LIBFLAGS=-L. $(LOCALLIB)
--CFLAGS+=-Os
-+LDFLAGS+=-L. $(LOCALLIB)
-+CFLAGS+=
- 
- BINDIR=../../bin
- FACT=prho.o
-@@ -58,7 +58,7 @@ gnfs-lasieve4eI%.o: gnfs-lasieve4e.c lasieve.h asm/siever-config.h
- 
- $(BINDIR)/gnfs-lasieve4I%e: gnfs-lasieve4eI%.o $(OBJS) libgmp-aux.a \
-                              asm/liblasieve.a asm/liblasieveI%.a $(FACT)
--	$(CC) $(CFLAGS) $(INC) $(LIBFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- asm/lib%.a:
- 	$(MAKE) -C asm
-diff --git a/src/pol5/Makefile b/src/pol5/Makefile
-index 44b08be..e474ffb 100644
---- a/src/pol5/Makefile
-+++ b/src/pol5/Makefile
-@@ -1,6 +1,6 @@
- BINDIR=../../bin
- INC=-I.. -I../../include $(LOCALINC)
--LIBFLAGS=$(LOCALLIB)
-+LDFLAGS+=$(LOCALLIB)
- LIBS=-lm -lgmp
- CFLAGS2=
- 
-@@ -46,13 +46,13 @@ all: $(BINS)
- 	$(CC) $(INC) -c $(CFLAGS) $(CFLAGS2) $^
- 
- $(BINDIR)/pol51m0b: pol51m0b.o $(OBJS) $(OBJS2)
--	$(CC) $(INC) -o $@ $(CFLAGS) $(CFLAGS2) $^ $(LIBFLAGS) $(LIBS)
-+	$(CC) $(INC) $(LDFLAGS) -o $@ $(CFLAGS) $(CFLAGS2) $^ $(LIBS)
- 
- $(BINDIR)/pol51m0n: pol51m0n.o $(OBJS) $(OBJS3)
--	$(CC) $(INC) $(CFLAGS) $(CFLAGS2) -o $@ $^ $(LIBFLAGS) $(LIBS)
-+	$(CC) $(INC) $(CFLAGS) $(CFLAGS2) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- $(BINDIR)/pol51opt: pol51opt.o $(OBJS) $(OBJS4)
--	$(CC) $(INC) $(CFLAGS) $(CFLAGS2) -o $@ $^ $(LIBFLAGS) $(LIBS)
-+	$(CC) $(INC) $(CFLAGS) $(CFLAGS2) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- clean : ;
- 	rm -f $(BINS) *.o core
diff --git a/sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild b/sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild
deleted file mode 100644
index c110cabe74c1..000000000000
--- a/sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A suite of algorithms to help factoring large integers"
-# inactive old homepage exists, this is a fork
-HOMEPAGE="https://github.com/radii/ggnfs"
-# snapshot because github makes people stupid
-SRC_URI="
-	http://dev.gentooexperimental.org/~dreeevil/${P}.zip
-	http://stuff.mit.edu/afs/sipb/project/pari-gp/ggnfs/Linux/src/def-par.txt
-	http://stuff.mit.edu/afs/sipb/project/pari-gp/ggnfs/Linux/src/def-nm-params.txt
-	http://gentooexperimental.org/~patrick/ggnfs-doc.pdf"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/gmp-4.3:0
-	app-arch/unzip"
-RDEPEND="${DEPEND}
-	!sci-mathematics/cado-nfs" # file collisions, fixable
-
-S=${WORKDIR}/${PN}-master
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	echo "#define GGNFS_VERSION \"0.77.1-$ARCH\"" > include/version.h || die
-	# fix directory symlink, add missing targets, rewrite variable used by portage internally
-	cd src/lasieve4 && rm -f -r asm && ln -s ppc32 asm || die
-	sed -i -e 's/all: liblasieve.a/all: liblasieve.a liblasieveI11.a liblasieveI15.a liblasieveI16.a/' asm/Makefile || die
-	cd "${S}"
-	sed -i -e 's/ARCH/MARCH/g' Makefile src/Makefile || die
-	sed -i -e 's/$(LSBINS) strip/$(LSBINS)/' src/Makefile || die #No stripping!
-	sed -i -e 's/SVN \$Revision\$/0.77.1 snapshot/' src/experimental/lasieve4_64/gnfs-lasieve4e.c src/lasieve4/gnfs-lasieve4e.c || die
-	tc-export CC
-}
-
-src_configure() { :; }
-
-src_compile() {
-	# setting MARCH like this is fugly, but it uses -march=$ARCH - better fix welcome
-	# it also assumes a recent-ish compiler
-	cd src
-	HOST="generic" MARCH="${ARCH}" emake -j1
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin/"
-	for i in gnfs-lasieve4I11e gnfs-lasieve4I12e gnfs-lasieve4I13e gnfs-lasieve4I14e \
-		gnfs-lasieve4I15e gnfs-lasieve4I16e makefb matbuild matprune matsolve pol51m0b pol51m0n \
-		pol51opt polyselect procrels sieve sqrt; do
-		cp "${S}/bin/${i}" "${D}/usr/bin/" || die
-	done
-	mkdir -p "${D}/usr/share/doc/${PN}"
-	cp "${DISTDIR}/def-par.txt" "${D}/usr/share/doc/${PN}" || die
-	cp "${DISTDIR}/def-nm-params.txt" "${D}/usr/share/doc/${PN}" || die
-	docompress -x "/usr/share/doc/${PN}/def-par.txt"
-	docompress -x "/usr/share/doc/${PN}/def-nm-params.txt"
-	# TODO: docs? File collisions?
-	cp ${DISTDIR}/ggnfs-doc.pdf "${D}/usr/share/doc/${PN}" || die
-}
diff --git a/sci-mathematics/ggnfs/metadata.xml b/sci-mathematics/ggnfs/metadata.xml
deleted file mode 100644
index b75f4bc2a9eb..000000000000
--- a/sci-mathematics/ggnfs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">radii/ggnfs</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
new file mode 100644
index 000000000000..b28327c84cd4
--- /dev/null
+++ b/sci-mathematics/giac/Manifest
@@ -0,0 +1,5 @@
+AUX giac-1.6.0-pari-2.11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b05151b126cf74a5bccf5036e1fd3aa97f12fd91808fab7fe23a3194e6a4a7a9f12be5b69a5dfda5aedec8a0117c SHA512 56102439f05f0e27bda49f1e9803bbba7921c87eab383fc2f068ccca6ef598f11e35d00f5a737076a6a41df08ef9065e567cb84030ba6ea928520f371d51b9ed
+AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88ecbc71dc450ef714f6da323128d9c945ada9d658c73647987f84638498aa4d3bbef49062424ab63b53c76defc127902 SHA512 14bfcb04e5a23933cfa4635789bf02f6d6e6a528c167504678b3d2ecb38f135d0c05583712005fe53afd7696cc9ebee5dc3ab90cac056d75bd43be786075b011
+DIST giac_1.7.0-1.tar.gz 82118267 BLAKE2B a9bb4cb260bfc7ba187907d054c737aa8f5de7baf132913dac2a054e886ec632d9077a52fb1e837a1db623223199592407734857725ee4b22c775f928893bb9d SHA512 05565ee22f4d81a4149935df9a32dc78ac07d06db1555a3d951169d184c746c61cd4d57407eabeb982fb8cb5b4a82726b5a553e6a9e689517a241eb0a8726929
+EBUILD giac-1.7.0.1.ebuild 4148 BLAKE2B 92bbb495a0b62c8a0e341cd6670fac2cf1203cb5561537b0f44e461b0470d3a60aed2f060ca98695c83cc56d4a32146994643d2d84878045aaec98c4714e2874 SHA512 0cb2124906eac884461a2b7628506b8782ab92d0b7852b741796eae9576f9b7f8fb9f6c1d34edd3974f5b427c21e0f4666c0dc1b922ca788daa02a8dfca2c855
+MISC metadata.xml 1314 BLAKE2B c38eadb22de3e64b39e144c8dd2e2c359b88ea7910390ea6044af9f8f83a6db08cb4f0142d1217ddd0f4ff051f2bb94f846a789adc521d02d4c704763da1c50a SHA512 7554640bd7ab2b2c1cb77d492d044d419b178497f8b5a6165168f4c3ab0c421121e98b0f0f25d3d10479a8fcd6635f28cfdae4562d6e0b5143b541155f697077
diff --git a/sci-mathematics/giac/files/giac-1.6.0-pari-2.11.patch b/sci-mathematics/giac/files/giac-1.6.0-pari-2.11.patch
new file mode 100644
index 000000000000..24142257a340
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.6.0-pari-2.11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- a/check/TP11-sol.cas.out1	2014-10-21 10:51:48.000000000 +0200
++++ b/check/TP11-sol.cas.out1	2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/sci-mathematics/giac/files/giac-1.7.0.1-gsl_lapack.patch b/sci-mathematics/giac/files/giac-1.7.0.1-gsl_lapack.patch
new file mode 100644
index 000000000000..073762ec6a47
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.7.0.1-gsl_lapack.patch
@@ -0,0 +1,84 @@
+diff --git a/configure.ac b/configure.ac
+index 44fd519..0a6bad7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,7 @@ AC_LANG([C++])
+ AC_PROG_LIBTOOL
+ AC_PROG_YACC
+ AM_PROG_LEX
++PKG_PROG_PKG_CONFIG
+ AC_C_BIGENDIAN
+ 
+ dnl Check for standard C+headers
+@@ -225,47 +226,17 @@ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(long long)
+   
+ dnl Checking for Gnu Sci Lib
+-CONFIG_GSL="yes"
+-AC_ARG_ENABLE([gsl],[
+-	AS_HELP_STRING([--enable-gsl], [Use GNU scientific library [[default=yes]]])],
+-	[ if test "x$enableval" = "xno"; then CONFIG_GSL="no"; fi], [])
+-
+-if test "$CONFIG_GSL" = "yes"; then
+-	AC_CHECK_HEADERS(gsl/gsl_blas.h)
+-	AC_CHECK_HEADERS(gsl/gsl_eigen.h)
+-	if test "$ac_cv_header_gsl_gsl_blas_h" != "yes" -o "$ac_cv_header_gsl_gsl_eigen_h" != "yes"; then
+-		CONFIG_GSL="no"
+-	fi
+-fi
+-if test "$CONFIG_GSL" = "yes"; then
+-	save_LIBS="$LIBS"
+-	AC_CHECK_LIB(gslcblas, main, [], [CONFIG_GSL="no"])
+-	AC_CHECK_LIB(gsl, gsl_sf_gamma, [], [CONFIG_GSL="no"])
+-	LIBS="$save_LIBS"
+-  fi
+-GSL_LIBS=""
+-if test "$CONFIG_GSL" = "yes"; then
+-	GSL_LIBS="-lgsl -lgslcblas"
+-  fi
+-AC_SUBST(CONFIG_GSL)
+-AC_SUBST(GSL_LIBS)
+-AM_CONDITIONAL(CONFIG_GSL, [test "$CONFIG_GSL" = "yes"])
+-  
+-CONFIG_LAPACK="yes"
+-AC_ARG_ENABLE([lapack],
+-	[AS_HELP_STRING([--enable-lapack], [Use LAPACK [[default=yes]]])],
+-	[ if test "$enableval" = "no"; then CONFIG_LAPACK="no"; fi], [])
+-  
+-if test "$CONFIG_LAPACK" = "yes"; then
+-#	AC_CHECK_LIB(f2c, main, [], [CONFIG_LAPACK="no"])
+-#	AC_CHECK_LIB(blas, main, [], [CONFIG_LAPACK="no"])
+-#	AC_CHECK_LIB(tmglib, main, [], [CONFIG_LAPACK="no"])
+-	AC_CHECK_LIB(gfortran, main)
+-	AC_CHECK_LIB(blas, main)
+-	AC_CHECK_LIB(lapack, main, [], [CONFIG_LAPACK="no"])
+-#        AX_BLAS([have_blas=yes],[have_blas=no])
+-#        AX_LAPACK([have_lapack=yes],[have_lapack=no])
+-fi
++PKG_CHECK_MODULES([GSL], [gsl],[
++    AC_DEFINE(HAVE_LIBGSL,1, [Define if gsl is installed])
++    AC_SUBST(GSL_LIBS)])
++
++PKG_CHECK_MODULES([LAPACK], [lapack],[
++    AC_DEFINE(HAVE_LIBLAPACK,1,[Define if LAPACK is installed])
++    AC_SUBST(LAPACK_LIBS)])
++
++PKG_CHECK_MODULES([BLAS], [blas],[
++    AC_DEFINE(HAVE_BLAS,1,[Define if BLAS is installed])
++    AC_SUBST(BLAS_LIBS)])
+   
+ dnl if test "$CONFIG_PARI" = "yes"; then
+ dnl                      AC_MSG_CHECKING([whether PARI is configured with pthreads])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bb77986..d385fd0 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -16,7 +16,7 @@ libgiac_la_SOURCES = input_lexer.ll sym2poly.cc gausspol.cc threaded.cc \
+   caseval.c cutils.c graphic.c libbf.c libregexp.c libunicode.c \
+   qjsgiac.c quickjs.c quickjs-libc.c js.c
+ 
+-libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS) 
++libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
+ 
+ giacincludedir = $(includedir)/giac
+ giacinclude_HEADERS = dispatch.h fraction.h gen.h desolve.h misc.h ti89.h \
diff --git a/sci-mathematics/giac/giac-1.7.0.1.ebuild b/sci-mathematics/giac/giac-1.7.0.1.ebuild
new file mode 100644
index 000000000000..78894fa8a1e7
--- /dev/null
+++ b/sci-mathematics/giac/giac-1.7.0.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic xdg-utils
+
+FETCH_P="${PN}_"$(ver_rs  3 '-')
+MY_PV=$(ver_cut 1-3)
+DESCRIPTION="A free C++ Computer Algebra System library and its interfaces"
+HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS="el en es pt"
+IUSE="ao doc +ecm examples gc +glpk gui static-libs test"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+# nauty and cliquer are automagical dependencies
+RDEPEND="dev-libs/gmp:=[cxx]
+	sys-libs/readline:=
+	gui? ( x11-libs/fltk
+		media-libs/libpng:= )
+	ao? ( media-libs/libao )
+	dev-libs/mpfr:=
+	sci-libs/mpfi
+	sci-libs/gsl:=
+	sci-mathematics/pari:=[threads]
+	dev-libs/ntl:=
+	virtual/lapack
+	virtual/blas
+	net-misc/curl
+	sci-mathematics/cliquer
+	sci-mathematics/nauty
+	ecm? ( sci-mathematics/gmp-ecm )
+	glpk? ( sci-mathematics/glpk )
+	gc? ( dev-libs/boehm-gc )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-tex/hevea
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
+	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
+)
+
+REQUIRED_USE="test? ( gui )"
+
+# The mirror restriction is due to the French documentation for which
+# "Other kind of redistributions require the consent of the copyright
+# holder."
+RESTRICT="!test? ( test ) mirror"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_configure(){
+	if use gui; then
+		append-cppflags -I$(fltk-config --includedir)
+		append-lfs-flags
+
+		# Get the big-L flags from fltk's LDFLAGS.
+		append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
+	fi
+
+	# Using libsamplerate is currently broken
+	#
+	# The giac build system supports --docdir, but the path /usr/share/giac/doc
+	# is hard-coded throughout the source code, so passing anything else to
+	# ./configure --docdir just causes problems. Later, we'll put things right.
+	#
+	# micropython is for specific use in an upstream project
+	econf \
+		--enable-gmpxx \
+		--disable-samplerate \
+		--disable-micropy \
+		--docdir=/usr/share/giac/doc \
+		$(use_enable static-libs static) \
+		$(use_enable gui)  \
+		$(use_enable gui png)  \
+		$(use_enable ao) \
+		$(use_enable ecm) \
+		$(use_enable glpk) \
+		$(use_enable gc)
+
+}
+
+src_install() {
+	docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples}
+	emake install DESTDIR="${D}"
+
+	# Move all of /usr/share/giac (which contains only documentation) to
+	# its /usr/share/doc/${PF} counterpart.
+	dodir /usr/share/doc
+	mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die
+
+	# and create a symlink from the original location to the new one
+	dosym "./doc/${PF}" /usr/share/giac
+
+	# This is duplicated in ${ED}/usr/share/doc/${PF}/examples
+	rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die
+
+	# These aren't supposed to be installed at all.
+	find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die
+
+	# The French docs are not freely licensed according to the README.
+	rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES
+	if ! use gui; then
+		rm -rf \
+			"${ED}"/usr/bin/x* \
+			"${ED}"/usr/share/application-registry \
+			"${ED}"/usr/share/applications \
+			"${ED}"/usr/share/icons \
+			|| die "failed to clean up fltk files"
+	fi
+
+	if ! use doc; then
+		rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory"
+	else
+		for lang in ${LANGS}; do
+			if use l10n_$lang; then
+				dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas"
+			else
+				rm -r "${ED}/usr/share/giac/doc/${lang}" \
+					|| die "failed to remove ${lang} documentation"
+			fi
+		done
+	fi
+
+	if ! use examples; then
+		rm -r "${ED}/usr/share/doc/${PF}/examples" \
+		   || die "failed to remove examples"
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst(){
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm(){
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/sci-mathematics/giac/metadata.xml b/sci-mathematics/giac/metadata.xml
new file mode 100644
index 000000000000..3fadb3c53b01
--- /dev/null
+++ b/sci-mathematics/giac/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+
+  <maintainer type="person" proxied="yes">
+    <email>frp.bissey@gmail.com</email>
+    <name>Francois Bissey</name>
+  </maintainer>
+
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+
+  <longdescription>
+    Giac is a free computer algebra system that can be used to perform
+    computer algebra, function graphs, interactive geometry (2-d and
+    3-d), spreadsheet and statistics, programmation. It may be used as
+    a replacement for high end graphic calculators for example on
+    netbooks (for about the same price as a calculator but with much
+    more performances).
+  </longdescription>
+
+  <use>
+    <flag name="glpk">Enable the use of <pkg>sci-mathematics/glpk</pkg></flag>
+    <flag name="ecm">Enable the use of <pkg>sci-mathematics/gmp-ecm</pkg></flag>
+    <flag name="gc">Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag>
+  </use>
+
+</pkgmetadata>
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 60f3ff4beb61..cd18f8668205 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -4,5 +4,5 @@ AUX glpk-4.65-longstep_verbosity.patch 844 BLAKE2B c1d14e6dfd596694bf1da06012971
 DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
 DIST glpk-5.0.tar.gz 4132649 BLAKE2B f8204f66a97af950c13ee72ee9541f305745741d1231325670ede14663cb6c28ec6fbc44b3625973f1924ca078183d1d43f494ad43a7b48b45be131882b00001 SHA512 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d
 EBUILD glpk-4.65.ebuild 1821 BLAKE2B 47fa4cb29950a15f1293571e82a5780b64d486b5cb3fef2ff7f1cf948122282bba52dc123287eb8e6e12e9d3bf48f4addd1063d92f9d0e3372141a5adba82f98 SHA512 159df1be098e9fee4297e150a7656ff1b129145fe7aa744fb6627863ce2628077cde4e5442dd7266f4abfc342303872e50d7c69d19d1c5758fa2cb922f2fab35
-EBUILD glpk-5.0.ebuild 1777 BLAKE2B fd7ba55232ce43c35629ceec7e94ec1d4341011645413ece49a2b14d3ba7a2b33bc1deaab856dc5f4a26c3a52d8c0aa5506616d97381aa5ae542e5d843b034b4 SHA512 1aa39abacb43a26277fd782078cdece8e95d56144432679adb66fb0ed09e26a9d0419043cd504d2b25b65876028523a304ca63239cee1cd9365aadd8c77977eb
+EBUILD glpk-5.0-r1.ebuild 2329 BLAKE2B ba339c80c007b8880a0b9f2ace42aa1639acee1aee03d4c9f9c35cda190d6fc1b94c7a34d75dc240770143faeb15f3e4f6b4653da45eea19e20d863cb1087097 SHA512 a5cc73dac8f85f90d3b246ce73b41a5afb56cb6e83bd0ec1152f8e109fbd1683c007ee475b82452260abf85f4acb1af14346874fd58be2b8e99fac43a9cf9b33
 MISC metadata.xml 1028 BLAKE2B 01e42a8b9c7ec521837e6a21d212ce7c747d47fcdaa47b58ac0bf411c158155caefc316f71f2f495244f559cb77de428954d293efde12cbd4418c9dfad3893a9 SHA512 1c7e827666da76204db3894e0d5bdc7ba253152935fe214445ada4f1d6876cff44b3092fc736c8da9fb915d80479a600175e579e71cfcd817e5e52065ae6446c
diff --git a/sci-mathematics/glpk/glpk-5.0.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild
index c91cdf6a34ae..8bf55ceb4aa2 100644
--- a/sci-mathematics/glpk/glpk-5.0.ebuild
+++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild
@@ -44,6 +44,7 @@ src_prepare() {
 		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
 
 	default
+
 	eautoreconf
 }
 
@@ -64,11 +65,26 @@ src_configure() {
 
 src_install() {
 	default
+
 	if use examples; then
+		# The top-level Makefile descends into the "examples" directory
+		# unconditionally, building a program and excreting build
+		# artifacts that we don't want to install. Note: this still
+		# leaves the example program /usr/bin/glpsol installed. An
+		# additional "emake ... uninstall" could probably take care
+		# of that if desired.
+		emake -C examples clean
+
+		# Installing the Makefiles for the examples does the user no
+		# good without the top-level Makefile.
+		rm examples/Makefile{.in,.am,} \
+			|| die "failed to remove example Makefiles"
+
 		insinto "/usr/share/doc/${PF}"
 		doins -r examples
 		docompress -x "/usr/share/doc/${PF}/examples"
 	fi
+
 	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
 
 	# no static archives
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 799b67fe099f..34605f7595db 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -3,5 +3,4 @@ DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de003
 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-r3.ebuild 1430 BLAKE2B eb29cc60000a5348eb82b90d8a3167877b9703fa68332accf175766786066587dc3a228e7a34f711ceeef2b1d5c2e6cd25ca81c6b1d60a4b0fdcca785f52ba03 SHA512 ba4fdcaf9b304114619669f6e6af012bc5845d301a0734131abaf76663ea489766c2690545d4f97008ecacca60c3205a5e7caa0d1ad230989539dbf42fcbbd7b
-EBUILD gmp-ecm-9999.ebuild 1053 BLAKE2B eab97fcb27a1ac30898000ea06ba6d8e5279e979b2b85141ce86494fabf3fb6066c8449292620816ee17822b12564c248705bbbe6ecb4f64a622d8c84b25c4a5 SHA512 2d5f6ebbb57d8cf98e479021d9b345ca00d41dbffef357d0ddfdc40ef6c9f4bf159527ad0b1a37e18deb33051796408456f72ebb2b0bc3c47651a6a374f4ebe4
 MISC metadata.xml 384 BLAKE2B 168807abd87bddc88522015f01126d5ec0bde8716aa38b6e619054d39e9bb12a6ffdaa3082328ecb56c0398b498c964c8e28c818d3887919fbe3065a28673f2a SHA512 a8a7aa64869c88ac293347281a80158cbd3cc84fc9f5ca56531d3d53b33601f9baa5c4f66c93508d6763dc54779a563faa09c4a473c670a9b217610efecca25c
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
deleted file mode 100644
index 2856746b2ef3..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/"
-#SRC_URI="https://gforge.inria.fr/frs/download.php/30965/${P}.tar.gz"
-ESVN_REPO_URI="svn://scm.gforge.inria.fr/svnroot/ecm/trunk"
-
-inherit autotools eutils flag-o-matic subversion
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="blas -openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	blas? ( sci-libs/gsl )
-	openmp? ( sys-devel/gcc:*[openmp] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/ecm-${PV}
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-shellcmd is broken
-	econf $(use_enable openmp) $myconf
-}
-
-src_compile() {
-	append-ldflags "-Wl,-z,noexecstack"
-	# the custom-tune bits are obsoleted with sane defaults
-	default
-}
-
-src_install() {
-	default
-	mkdir -p "${D}/usr/include/${PN}/"
-	cp "${S}"/*.h "${D}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
-}
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index 02d077aa1428..08ba9f4a63de 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -1,4 +1,4 @@
 AUX 50gretl-gentoo.el 473 BLAKE2B 4c855e4b79629828ba9f3c187550c64d26b93b6547ed8505d8485ade63d0963d04bf7f3de4b8a0b0d679657e93d2d08ff036d9a2ef1b02ec85936f872cc3aa86 SHA512 dff2fd680e295ba8cd722092d5ffe8cb36cd9b79f2ed2be69c8adaa5e414a456abb40c0ec70a6fc0d6b9fb09bf936e3c6ef6804f87bde62d86d3692c34ec595e
 DIST gretl-1.9.90.tar.xz 7764820 BLAKE2B 1a47c31a62aad662ed3cfb4ad2057000eef14daf1f8cac4125f511f0229e29c1a7f43bc2e6014ec5b971173d9698e842c13e36b0f12faaa2f4fa996e26d984cb SHA512 35ec45fb2ad2dec490567411c1a5d909dc7fc8f0c4a6ca142e6e92b2d95a9efc9581f154a7806cf3f5178b530cdca9508b7c215bca29e1bcaebfa874d476667a
-EBUILD gretl-1.9.90.ebuild 2710 BLAKE2B a976524c5217aa442f0edecff26a947386ef807397bb9350f1f11ce9764559dc15ee963d711718709dc9c7f7484c3be961a40fb7d7d36556a91fa281df259f53 SHA512 7233cd31b2c03f9779774db1057ca4ff5206c524815794ea85365f1d918fd45cdcbd6b5b310258d04e0632a2051572949728a227b37f20748287a5466e4d8dfe
+EBUILD gretl-1.9.90.ebuild 2703 BLAKE2B ec19a3cfd5b3bf7b760a15fd4e329aa68c8240532639b055d59dafb3d3120e6ddd5bb296501efd95fedc179c8e6845a7a76bc6db4a5b5d1c911ccf3e83c28308 SHA512 287f33f86f1f175b64eb595e607a64e3ca5b1cff134bb9e3a44e592b92929e00d21d447d5e96a0ebc8d707062dd53cb644ff65128da821b99edc5b6e23424d20
 MISC metadata.xml 1122 BLAKE2B d9d243f2c1ff81869186aa07ad9ced3d6f8e90f0e5747ac745ff3e17c848ddb04281fc01bd6cdbcc756150db6ad28f1c69a4ce1b53f950e8b4d46fb8b9e4f457 SHA512 d5f169c5b22c7991efb2080425f682d51b9c5acd472d3f3155f64a45044c1a9a449ca5d34be9f792d7ce62be41584926c35896ffaf82c07fd6aeca17d0da423d
diff --git a/sci-mathematics/gretl/gretl-1.9.90.ebuild b/sci-mathematics/gretl/gretl-1.9.90.ebuild
index b59ae725d308..57ea0d58c2b7 100644
--- a/sci-mathematics/gretl/gretl-1.9.90.ebuild
+++ b/sci-mathematics/gretl/gretl-1.9.90.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 USE_EINSTALL=true
 
-inherit eutils elisp-common toolchain-funcs
+inherit elisp-common toolchain-funcs
 
 DESCRIPTION="Regression, econometrics and time-series library"
 HOMEPAGE="http://gretl.sourceforge.net/"
diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index 85498286ce6e..b8f5cbb3610f 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1,9 +1,9 @@
-AUX gsl-shell-2.2.0-pkg-config.patch 1030 BLAKE2B cee8545adbfb584404e476e38d46dc411b929e3d8e9a6c27bbf11c1b068a1411ff07a88c32817822668fc887d34a2217c3917aa1a44e4f06d1e47777df006788 SHA512 94fc8e8ea69ed5a6ec492958dbe32fccc6b668a7864c972e98d86909f2425b589388fe91f397fae441ad2f70b27148ae911d7dc7210be223284597bdbe562ea3
+AUX gsl-shell-2.2.0-pkg-config.patch 873 BLAKE2B 8c4dd1c126938d478965ce896209d2d1ea44a3b7a88b13ea0b080e0aa49d74fa21ef8421c8c18b6ff050e09dee65a1f0ffdc1af82e3adb17636859d49970a696 SHA512 949adbea8ed65a1b6e40cea7f9074135e30fb8b7bd2207e2bbd94f51cb30aadcdbad2a780dff0d271ab97ecc30a01bed6f7fc02c9079ad4f65a1200176e99715
 AUX gsl-shell-2.3.0-gdt-cflags.patch 551 BLAKE2B da5a266ed248ce50ded647dbf5eba443d72977522d768bb912e27530f87e71056abe30ba4613c14cc414214fafbb9c821419530695a9418008d843a6540980c1 SHA512 00260e88352c2502aaf8a05243b9dbcf204c639c8fa14777ffd05d69e185409ccae80d86cd592b85fa2815e20ee97bfd711e02302b6bc0e5ee28265d8ddab7c6
 AUX gsl-shell-font.patch 643 BLAKE2B a3dd51932ed9c5b6d4457764cf5b7838ab5af704740419a1aba89ce58ca892ca51601521af182c292cc3823be3dca8573a7539f7668c87fb9ad7687b96390417 SHA512 feeb151ff96c02b523f284acbaf214480b92cac42af497f6210726ff2a3b837c6792733ad5c2ac4be58fea68c18c5d10bf7db711336e32c9998c1456bfa3cbff
 AUX gsl-shell-nogui.patch 809 BLAKE2B 47f242696886a87179c91efd17b783dd81a74fbfbcc35a96cc5a72da453bef71dad7b2710b5248a221e53af5e956eaa842b4e9edf0da7e0afba94ad656cf5fd9 SHA512 b43d8009fef20ef847e098d4279b415ab26643970157b4fd49be1e255e1e8f59862159c2cb6054726d988c2d8b3bd6935673a509c803f486388a333040cde409
 AUX gsl-shell-strip.patch 361 BLAKE2B 7152b2fde2ac264cc9a78eb9f5b3a440e84a907e666b27361ad4a94d9e380bc9d3873066da959af8f1e67b5e165c90fb74e33425e8a83e2501cc3b07a8464330 SHA512 ecb78c52f34d678ecec5ca5f6ee9c85cf954866347501aaf2fd31133357d8085bbbaf3d6118ae2cd20e8375927ae9c1958732bfab09bf308bde7fc3255fa35bf
 AUX gsl-shell-usr.patch 250 BLAKE2B 6678c7fdd9f656be498025fc3d00b4d757c29e6aa451a95d71b78d81db9426ecd4fcc83ccd36352283a5c62c8084dae56d53feb85c144b7b725b5604141b4bc5 SHA512 e10df17a16969ad700e7f16c8fcf694e9c5f2d346e6db7ad5d616122c5160d9ea3d894354aef4214e48233a17e101b20b51c939fdbcb29b25169a4c6c07bc0c3
 DIST gsl-shell-2.3.0-beta1.tar.gz 3380519 BLAKE2B 3f63c74d48f01d1cd181a275facd979d31a06089004ac0db3b060d77cdcf4fb195ad064a76c64a7a13a6641102864cb79845b8f15573bc1481365952835f1fd7 SHA512 627c0b6bb35bc1a33bab16d0bb2b193b5a005a1d97a96e6a9038fbe7144936427131197983a2ef347ed91c655a82a4d477430a610d9e36453a2669ef0baae231
-EBUILD gsl-shell-2.3.0_beta1.ebuild 1582 BLAKE2B 3d1b0e5a676966ea434768d33cb61719f30bb719b69b5562e2e65f8d1764c8d40334e6f765d4476f7f434f2430bbd1de3edda9bc189db70bffc2681bc1dccd4f SHA512 163c279d16cea566c05ff1807f11d0a90020dd86fcfdf12ec2a9d0374a29a5baa84b412c694d8fcda61577a5ef8b67624f649d2acee161ac2ea48bdaa5ca43d8
+EBUILD gsl-shell-2.3.0_beta1.ebuild 1580 BLAKE2B 9c38a701c95ee4f23d260609ccc685f374e0f3c3dd8115ebf3bbe97badba7f6b74d887ca9acb237195140e493afdedb0b172ca5905e4918fb10f133560bcaf9b SHA512 0ea48b4301d2150b1f6df5fe9fbaf8d5e8511a1754614ebedd9fb6145d77fba7e21099d35a34806237cceeefb95ee6cf8df1da4da2439851c23771f8975b4520
 MISC metadata.xml 849 BLAKE2B 8e574c5c621b89222cbf6c4b50abc7f54a84fa0f91cda62b924b9439ef19cc13e2d2a112b83c56514daa404acaca0bfd4bc4db27d8d39e6189726bbf467dd663 SHA512 27284450a3bfe41bdf8af180d9d51675ae4e7008990c73522d199bee926da0e434a74d5e6dffbecb22934f5f968fce44a97a4acd10792ac5d325bb7509947de7
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch
index 8bb28635df2b..dc4b05bc3bec 100644
--- a/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch
@@ -1,8 +1,3 @@
- makepackages | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/makepackages b/makepackages
-index afeef79..a724e82 100644
 --- a/makepackages
 +++ b/makepackages
 @@ -52,17 +52,17 @@ else
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild
index 739ce56d681c..f182d5168c48 100644
--- a/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild
+++ b/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
 	sys-libs/readline:0=
 	|| ( media-fonts/ubuntu-font-family media-fonts/freefont media-fonts/dejavu )
 	fox? ( x11-libs/fox:1.6 )"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx[latex] )"
 
diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest
index cdb193f2688d..fdef73f6d030 100644
--- a/sci-mathematics/jags/Manifest
+++ b/sci-mathematics/jags/Manifest
@@ -1,3 +1,3 @@
 DIST JAGS-4.2.0.tar.gz 1875538 BLAKE2B 039cefdb546ec28b905f22a4ec3dfe6d85c64064701283fe38be59f53da971b523d8bb5b7c5efe3e9da81a255b064cb8b66cac2fd4e844883b7fcf89cdabdbb1 SHA512 316483cd1a879c70c9b8ad6f23665196b95b9745da3924a47e14f4b0fd7c1abf9237575561cb31044623594360b6e991de68e1d9746baedeb285c65b77baada8
-EBUILD jags-4.2.0.ebuild 888 BLAKE2B ef6d3421456ae16d300cf0d235ccf296d43d0067bdea04c7a2a0ed0b8f9d1118f70aa25cafe6e6d0ed049bafa0e57a39e7d6f069de4bc96241c1061e9e2216a4 SHA512 20bfcb7248b6612271864c8217fbe74e0ae8b36237a20bbb0cea693e777149238708c5761adc509d9edd4d1017d3270a2dccf3eb000528be9c05cab27e4ecad5
+EBUILD jags-4.2.0.ebuild 881 BLAKE2B 93add171452876ca06c2d6efc6b2665c73eebde57e02c2f1354b98a19ff6d689bab77f6ad08ab5d8d11db29a5c56bb32fd5eaf5ed9ad57e7feba50a745391032 SHA512 d669aa5cdf592d0517df6f2ee7012418b78db47e0d61bfc5f2a635fb1228587fdc45f4075e1ca9d5ac2480e1b9a88f9b04f16fc55f0f49c19fa657f98e6e9255
 MISC metadata.xml 862 BLAKE2B 4e1fc4e399dfcdbfc828dc577661e28255c94004bb1f16734994d82b34279300b136217effbf545d1c0cdf3bfb9d1510b2549f1edcbe51f036924e7d4bab1416 SHA512 86f27a081286b51ba645006d3c65ec43d69aa4e15218bac97730295e2ebd1cab67c592f1c7fefdbdd9b959b68e54eaf358173f7d599cb1ab5ff13dea7eef3705
diff --git a/sci-mathematics/jags/jags-4.2.0.ebuild b/sci-mathematics/jags/jags-4.2.0.ebuild
index b0b04cd9acfa..6eaa6ccff4a7 100644
--- a/sci-mathematics/jags/jags-4.2.0.ebuild
+++ b/sci-mathematics/jags/jags-4.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils ltprune toolchain-funcs
+inherit ltprune toolchain-funcs
 
 MYP="JAGS-${PV}"
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 1dbaad4eddca..b9adb1edc4be 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -16,4 +16,5 @@ DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a
 DIST maxima-5.44.0.tar.gz 34976354 BLAKE2B d6870b6fb0581d9e60d6ed97c7daed8ce12b8b1ae49d0edb7b8d31dd723f9b879eb70440659ff958f53cee16d8d2a92f80dcaa3898d9f6dbabd79a5059073a65 SHA512 1e043bebb7c6d002c113d8de20a98d58d1a8e7bedfc9bcf52819e7c7554655991dc2f42f0333889706574249736db833a237b3e59b967e7e42ede28262e31f2f
 EBUILD maxima-5.42.1.ebuild 4895 BLAKE2B dd388cfe14cef36137a91ff71912c23390e176d796ce02c36f59cbb1e8993a03b16ee32b4e6d792e59d95bad3bcd90e3e9ded23abb1e3c371f466bd53f44502c SHA512 64c8a759525fff99c99831be56ea268b213392c65b1ef2e9db133addfaefead39710264c6a599eee7c53262ef16f75fbdbb35a9516a7054f0934d6fd46303520
 EBUILD maxima-5.44.0-r4.ebuild 6278 BLAKE2B 9da7f0e09a3b6f370b20ce11915e4d9e893c1e1ea499ebfcf22d81ee2a0c17053b1e38450551855ac62356e3d4b8201f9a067ff94e169a00eb6c5a42ed73d82d SHA512 03083941bd72b72341edd0d5b35501b309a62d14bde6be6555d670e6a21b85ed800c35810dec1a713d6ffc59e0b8279a4daa4fb85385676412d0bff877d94dd4
-MISC metadata.xml 1607 BLAKE2B 04e6a57fb68b1c61027a4cd5b1605347c48e989c246e6f5a8c3587d17778d7c55b6cb5a6ab81dee7c21d0597953d2e90211f6d16b565dae602cfe22021a8f89b SHA512 bab36eab986e0a8619e9409d63af9103bce52bb08d75bde6c6d7a92cf1c856ad7c4d462dcb65bbde141a4d62ee024414186533db1e0e5f0bebb62f0623de55e3
+EBUILD maxima-5.44.0-r8.ebuild 6352 BLAKE2B e74faa47dd0ba27775e386b81c04e57cc94e992a7b2d0aa78aa24002bfa8256f9baaab8aab6414971d035f57a1bdcc522240975b523fe45c00d588e48af46684 SHA512 5ef06927b60d9c4071cd0a696ab9e3c66ebfc4ea0e8f48ee53675345804de996385da1f65666df4f6583a523c90493705485aa4c809daa7db58b24bd7639f5e4
+MISC metadata.xml 1733 BLAKE2B 30e06c199d4c4919ea90aa5a0b3091b124b4b43fc7791d758afdb0d94069edfafe386ddd7ddbeb9aa2589a5ec3866ecabd9d71c1b41380db6212529ad376c846 SHA512 2a9ccad0ef037a65f7dae3ac3769ab0bdf54ac8789387d3bcab0e022f9dfb77b019d14dc03bd7777937076e822c837511c12fd8198e7b9bd7eb6e621e46c0be4
diff --git a/sci-mathematics/maxima/maxima-5.44.0-r8.ebuild b/sci-mathematics/maxima/maxima-5.44.0-r8.ebuild
new file mode 100644
index 000000000000..1ef1c4f672a8
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.44.0-r8.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit autotools elisp-common flag-o-matic python-single-r1 xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test"
+RESTRICT="!test? ( test )"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+	IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+LISP_DEPEND="
+	clisp? ( dev-lisp/clisp )
+	clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
+	clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
+	cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
+	ecls? ( dev-lisp/ecls app-misc/rlwrap )
+	gcl? ( dev-lisp/gcl[ansi,readline] )
+	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
+"
+
+# Python is used in e.g. doc/info/build_html.sh to build the docs.
+# LISP_DEPEND is included in both BDEPEND and DEPEND because the various
+# lisp engines are used to both compile and run maxima. It's possible
+# that they don't (all?) need to be listed in DEPEND; who knows.
+BDEPEND="
+	${PYTHON_DEPS}
+	${LISP_DEPEND}
+	test? ( sci-visualization/gnuplot )
+	sys-apps/texinfo
+"
+
+DEPEND="
+	${LISP_DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gui? ( dev-lang/tk:0 )
+"
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+#
+# VTK is an optional plotting backend that can be enabled by
+# running "draw_renderer: 'vtk;" within maxima.
+#
+# It's NON-optional for the scene() command, but that command is
+# currently useless since Tcl/Tk support was dropped in sci-libs/vtk.
+# Thus we include VTK only as an optional dependency.
+#
+# We require app-misc/rlwrap for any lisps that don't support readline
+# themselves.
+RDEPEND="
+	${DEPEND}
+	X? (
+		x11-misc/xdg-utils
+		sci-visualization/gnuplot[gd]
+		vtk? (
+			${PYTHON_DEPS}
+			sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}]
+		)
+	)
+	emacs? (
+		virtual/latex-base
+		app-emacs/auctex
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latexrecommended
+	)"
+
+# Maxima can make use of X features like plotting (and launching a PNG
+# viewer) from the console, but you can't use the xmaxima GUI without X.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
+	gui? ( X )"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+	# Set the PYTHON variable to whatever it should be.
+	python-single-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}/support-new-vtk.patch"
+	"${FILESDIR}/dont-hardcode-python.patch"
+	"${FILESDIR}/xdg-utils-1.patch"
+	"${FILESDIR}/wish-2.patch"
+	"${FILESDIR}/rmaxima-0.patch"
+	"${FILESDIR}/emacs-0.patch"
+	"${FILESDIR}/clisp-1.patch"
+	"${FILESDIR}/clozurecl-3.patch"
+	"${FILESDIR}/ecls-4.patch"
+	"${FILESDIR}/cmucl-1.patch"
+	"${FILESDIR}/sbcl-2.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #343331
+	rm share/Makefile.in || die
+	rm src/Makefile.in || die
+	touch src/*.mk
+	touch src/Makefile.am
+
+	eautoreconf
+}
+
+src_configure() {
+	local CONFS=""
+
+	# enable existing translated doc
+	if use nls; then
+		for lang in ${LANGS}; do
+			if use "l10n_${lang/_/-}"; then
+				CONFS="${CONFS} --enable-lang-${lang}"
+				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+			fi
+		done
+	fi
+
+	# Using raw-ldflags fixes the error,
+	#
+	#   x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option
+	#   value (expected an integer): 1 -Wl
+	#
+	# when building the maxima.fas library for ECL. See upstream bugs:
+	#
+	#   * https://sourceforge.net/p/maxima/bugs/3759/
+	#   * https://gitlab.com/embeddable-common-lisp/ecl/-/issues/636
+	#
+	# The 32-bit and 64-bit version of the clozurecl executable
+	# are both called "ccl" on Gentoo, so we need the additional
+	# use_with for clozurecl64. See bugs 665364 and 715278....
+	#
+	# The usex works around https://sourceforge.net/p/maxima/bugs/3757/
+	#
+	econf ${CONFS} \
+		LDFLAGS="$(raw-ldflags)" \
+		$(use_enable clisp) \
+		$(use_enable clozurecl ccl) \
+		$(use_enable clozurecl64 ccl64) \
+		$(usex clozurecl64 "--with-ccl64=ccl" "") \
+		$(use_enable cmucl) \
+		$(use_enable ecls ecl) \
+		$(use_enable emacs) \
+		$(use_enable gcl) \
+		$(use_with gui wish) \
+		$(use_enable sbcl) \
+		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+	# The variable PYTHONBIN is used in one place while building the
+	# German documentation. Some day that script should be converted
+	# to use the value of @PYTHON@ obtained during ./configure.
+	emake PYTHONBIN="${PYTHON}"
+	if use emacs; then
+		pushd interfaces/emacs/emaxima > /dev/null
+		elisp-compile *.el
+		popd > /dev/null
+		pushd interfaces/emacs/imaxima > /dev/null
+		BYTECOMPFLAGS="-L . -L ../emaxima"
+		elisp-compile *.el
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	docompress -x /usr/share/info
+	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+	# do not use dodoc because interfaces can't read compressed files
+	# read COPYING before attempt to remove it from dodoc
+	insinto /usr/share/${PN}/${PV}/doc
+	doins AUTHORS COPYING README README.lisps
+	dodir /usr/share/doc
+	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+	if use emacs; then
+		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+		insinto ${TEXMF}/tex/latex/emaxima
+		doins interfaces/emacs/emaxima/emaxima.sty
+
+		insinto /usr/share/${PN}/${PV}/doc/imaxima
+		doins interfaces/emacs/imaxima/README
+		doins -r interfaces/emacs/imaxima/imath-example
+
+		if ! use gcl; then
+			# This emacs package is used to run gcl, maxima, gdb, etc.
+			# all at once and possibly in the same buffer. As such, it's
+			# no use without gcl (more to the point: it requires gcl.el).
+			find "${ED}" -name 'dbl.el' -type f -delete || die
+		fi
+	fi
+
+	if use ecls; then
+		# Use ECL to find the path where it expects to load packages from.
+		ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
+		insinto "${ECLLIB#${EPREFIX}}"
+		doins src/binary-ecl/maxima.fas
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
diff --git a/sci-mathematics/maxima/metadata.xml b/sci-mathematics/maxima/metadata.xml
index d87f8aea9f05..154d5891d70c 100644
--- a/sci-mathematics/maxima/metadata.xml
+++ b/sci-mathematics/maxima/metadata.xml
@@ -18,7 +18,9 @@
   <use>
     <flag name="clisp">Compile maxima with GNU CLISP
     (<pkg>dev-lisp/clisp</pkg>)</flag>
-    <flag name="clozurecl">Compile maxima with Clozure Common Lisp
+    <flag name="clozurecl">Compile maxima with 32-bit Clozure Common Lisp
+    (<pkg>dev-lisp/clozurecl</pkg>)</flag>
+    <flag name="clozurecl64">Compile maxima with 64-bit Clozure Common Lisp
     (<pkg>dev-lisp/clozurecl</pkg>)</flag>
     <flag name="cmucl">Compile maxima with CMU Common Lisp
     (<pkg>dev-lisp/cmucl</pkg>)</flag>
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index d7c503e626f7..1faa570433d1 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -1,8 +1,5 @@
-AUX fix-version.patch 499 BLAKE2B e4522d29cb5eed0eaad14ba37d9575268721457d607a7e10be571c56fcb016ec58c303df5b0b5f3430acee986d381241c39a8b1bde4eb136867552620b21d0ea SHA512 9ea8b52377cf11e6dc34860d3231dee364a8018d860a25ca25901fc00e948adb11ba767106df67e5769e6328fcb703638a14178666f53f9518c0e07b15d36767
 AUX msieve-1.51-reduce-printf.patch 1598 BLAKE2B 3cce6aab49b9c66fb4f0feede9a56a70ad62f63fdaad76116948133dd1a915d17c0b6887adc936692de1a91e917954a0478ea30d5db0449e3ad43b5d35835da8 SHA512 abd539239b1c289265b523f748dc0838df89d532a21c27040b6bbd0a8c7ef10641fc24a06378d48c45fe2d0156f09de06d10412d1d0ec71583c02123fa6158c6
 AUX msieve-1.53-fix-version.patch 1138 BLAKE2B 110bdba41cc622eb6edbebef641df4f5cbd9c184e87c8ee2824c7a29aa10f4615c98d4e1ef754fea960756d6afc1bf58e66c9f9d561fa3c699b462b216a9aabe SHA512 3133cd9d424328802060578fef60b7e0657b044927ac6a4e677c356f79224ec3d066764ab3ce6a06e5fc203bd8a000cbde47705277dcb6cc5f6a9004200d299d
-AUX reduce-printf.patch 2105 BLAKE2B 3ba089546e8a67100c9ab6849854c91c78a9e74b1385ab89a4c83586a4b774f9bd65f1fa007df32b5c57c80af6c58425742f8611c80746a361fe6d6ec5eb8aeb SHA512 c0ee9ddbbb41a25a48ec4b6cc80cf6a8afee35a723aee74eb7d7bfa01b545eff1713eaf2077ace7d2a9aca97f00aa42bc36e6d23d7d229f339de1f152316af98
 DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12
-EBUILD msieve-1.53-r1.ebuild 1457 BLAKE2B f8536704a0fcce0cdc2fc8e66f663cbf981b346ba2b4b91a1ac2e7462fe32eb35f2ba30a1391fd2e3e02124a9a95dbf1dcd0825770d5cf4fcf45ae06c3e37666 SHA512 88fb3b5fbc5357746bc37f4f5bd85d164fa6b54b7aa6b609868492d2c4c8acf8ca4d1befd5cae4460d97b404c0d685bc71b1c1c3594c868233f5edf77356c7ef
-EBUILD msieve-9999.ebuild 1317 BLAKE2B 8cd2cc6925fcecc20e3e78bffbfe2e331c53dcd32e7432be57188f5de1ab081152fc944e5ebd56e1248f9e0dfd0e421e726cf24081c61176556e9ca19bb0f8e8 SHA512 9b7cc2ea8f065e47fcda5b83f043262b59cc6705adf14187d81bd8ec6c05f3d80c08011c7613ab0b040328ba8c5a2f3b6d651916d487fed9c6195f15f8428507
+EBUILD msieve-1.53-r1.ebuild 1232 BLAKE2B 2552549e4c0ced96b57a7643f4febcbb109a40885521d23408e48d265084345e2063b2bf9acea6007f254d287bf3b49be8b5e3b4fb3ab3d5c3cae7480952e120 SHA512 cdbca923a6d310ebade396846afd725a00b837fce68a422fc706d43a30135c581ee83db290b57571dcea60f3bad0add79bcc4e691f5bef46741b9e0f388d8b91
 MISC metadata.xml 417 BLAKE2B ac5b4847814369f3126102ccf20421069b3b7edace1b95951729507d84bd37966d5f02cefff41857d32661fba8353dd29bef4de63097d276018acbf8ace456dd SHA512 a8c43840089c4516cd31bfd2a9fee4202bdb5a264cb28b22dcd7d17cd40669056cdc4a5c7a437b092bc71b1ec9c1bf6d1bc7f0f8f61858818749fad3e93eaf1d
diff --git a/sci-mathematics/msieve/files/fix-version.patch b/sci-mathematics/msieve/files/fix-version.patch
deleted file mode 100644
index 748a7ae8c68c..000000000000
--- a/sci-mathematics/msieve/files/fix-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- common/driver.c	2011-05-02 09:10:50.000000000 +0800
-+++ common/driver.c.new	2012-11-30 16:43:59.067925006 +0800
-@@ -191,10 +191,9 @@
- 
- 	logprintf(obj, "\n");
- 	logprintf(obj, "\n");
--	logprintf(obj, "Msieve v. %d.%02d (SVN %s)\n", 
-+	logprintf(obj, "Msieve v. %d.%02d\n", 
- 				MSIEVE_MAJOR_VERSION, 
--				MSIEVE_MINOR_VERSION,
--				MSIEVE_SVN_VERSION);
-+				MSIEVE_MINOR_VERSION);
- 	start_time = time(NULL);
- 	if (obj->flags & MSIEVE_FLAG_LOG_TO_STDOUT) {
- 		printf("%s", ctime(&start_time));
diff --git a/sci-mathematics/msieve/files/reduce-printf.patch b/sci-mathematics/msieve/files/reduce-printf.patch
deleted file mode 100644
index dad1dc7db8f3..000000000000
--- a/sci-mathematics/msieve/files/reduce-printf.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur msieve-1.50/common/minimize.c msieve-copy/common/minimize.c
---- msieve-1.50/common/minimize.c	2011-07-04 23:32:33.000000000 +0800
-+++ msieve-copy/common/minimize.c	2012-11-26 23:09:22.889240528 +0800
-@@ -210,7 +210,7 @@
- 		}
- 	}
- 
--	printf("too many line iterations\n");
-+	//printf("too many line iterations\n");
- 	*min_out = x;
- 	*status = 1;
- 	return fx;
-diff -Naur msieve-1.50/gnfs/poly/stage2/optimize.c msieve-copy/gnfs/poly/stage2/optimize.c
---- msieve-1.50/gnfs/poly/stage2/optimize.c	2011-10-15 23:03:39.000000000 +0800
-+++ msieve-copy/gnfs/poly/stage2/optimize.c	2012-11-26 23:14:36.243232414 +0800
-@@ -390,7 +390,7 @@
- 			score = minimize(best, num_vars, tol, 40, 
- 					objective, &opt_data);
- 
--			printf("i %u score %le\n", i, score);
-+			//printf("i %u score %le\n", i, score);
- 			for (j = 0; j <= rotate_dim; j++) {
- 				double cj = floor(best[ROTATE0 + j] + 0.5);
- 				mpz_set_d(c->gmp_help1, cj);
-@@ -422,7 +422,7 @@
- 			tol = 1e-5;
- 			score = ifs_rectangular(apoly.coeff, apoly.degree,
- 						best[SKEWNESS]);
--			printf("transition score %le\n", score);
-+			//printf("transition score %le\n", score);
- 		}
- 	}
- 
-@@ -430,9 +430,9 @@
- #if 0
- 	printf("norm %.7e skew %lf\n", *pol_norm, best[SKEWNESS]);
- 	for (i = 0; i < 2; i++)
--		gmp_printf("%+Zd\n", c->gmp_lina[i]);
-+		//gmp_printf("%+Zd\n", c->gmp_lina[i]);
- 	for (i = 0; i <= deg; i++)
--		gmp_printf("%+Zd\n", c->gmp_a[i]);
-+		//gmp_printf("%+Zd\n", c->gmp_a[i]);
- #endif
- }
- 
-diff -Naur msieve-1.50/gnfs/poly/stage2/stage2.c msieve-copy/gnfs/poly/stage2/stage2.c
---- msieve-1.50/gnfs/poly/stage2/stage2.c	2011-10-09 09:32:49.000000000 +0800
-+++ msieve-copy/gnfs/poly/stage2/stage2.c	2012-11-26 23:14:30.894232552 +0800
-@@ -122,10 +122,10 @@
- 	}
- 
- #if 0
--	gmp_printf("%+Zd\n", c->gmp_lina[0]);
--	gmp_printf("%+Zd\n", c->gmp_lina[1]);
-+	//gmp_printf("%+Zd\n", c->gmp_lina[0]);
-+	//gmp_printf("%+Zd\n", c->gmp_lina[1]);
- 	for (i = 0; i <= degree; i++)
--		gmp_printf("%+Zd\n", c->gmp_a[i]);
-+		//gmp_printf("%+Zd\n", c->gmp_a[i]);
- 
- 	printf("coeff ratio = %.5lf\n",
- 		fabs(mpz_get_d(c->gmp_a[degree-2])) / coeff_bound);
diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
index 5df9a95f4e7e..4cf9b2d6dce3 100644
--- a/sci-mathematics/msieve/msieve-1.53-r1.ebuild
+++ b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -14,30 +14,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zlib +ecm mpi"
 
-DEPEND="
+RDEPEND="
 	ecm? ( sci-mathematics/gmp-ecm )
 	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib:= )"
-RDEPEND="${DEPEND}"
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# TODO: Integrate ggnfs properly
+	"${FILESDIR}"/${PN}-1.51-reduce-printf.patch
+	"${FILESDIR}"/${PN}-1.53-fix-version.patch
+)
 
 src_prepare() {
 	default
 
-	# TODO: Integrate ggnfs properly
-	eapply \
-		"${FILESDIR}"/${PN}-1.51-reduce-printf.patch \
-		"${FILESDIR}"/${PN}-1.53-fix-version.patch
-
-	sed -i -e 's/-march=k8//' Makefile 		|| die
-	sed -i -e 's/CC =/#CC =/' Makefile 		|| die
-	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile 	|| die
+	sed -i -e 's/-march=k8//' Makefile || die
+	sed -i -e 's/CC =/#CC =/' Makefile || die
+	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile || die
 	sed -i -e 's/LIBS += -lecm/LIBS += -lecm -lgomp/' Makefile || die
 }
 
 src_compile() {
-	use ecm && export "ECM=1"
-	use mpi && export "MPI=1"
-	use zlib && export "ZLIB=1"
+	use ecm && export ECM=1
+	use mpi && export MPI=1
+	use zlib && export ZLIB=1
 	emake \
 		CC=$(tc-getCC) \
 		AR=$(tc-getAR) \
@@ -46,11 +47,12 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${ED}/usr/include/msieve"
-	mkdir -p "${ED}/usr/lib/"
-	mkdir -p "${ED}/usr/share/doc/${P}/"
-	cp include/* "${ED}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${ED}/usr/lib/" || die "Failed to install"
 	dobin msieve
-	cp Readme* "${ED}/usr/share/doc/${P}/" || die "Failed to install"
+
+	insinto /usr/include/msieve
+	doins -r include/.
+
+	dolib.a libmsieve.a
+
+	dodoc Readme*
 }
diff --git a/sci-mathematics/msieve/msieve-9999.ebuild b/sci-mathematics/msieve/msieve-9999.ebuild
deleted file mode 100644
index 72fa0aaf997f..000000000000
--- a/sci-mathematics/msieve/msieve-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils subversion toolchain-funcs
-
-DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
-HOMEPAGE="https://sourceforge.net/projects/msieve/"
-#SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}src.tar.gz"
-ESVN_REPO_URI="https://svn.code.sf.net/p/msieve/code/trunk"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS=""
-IUSE="zlib +ecm mpi"
-
-DEPEND="
-	ecm? ( sci-mathematics/gmp-ecm )
-	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# TODO: Integrate ggnfs properly
-	sed -i -e 's/-march=k8//' Makefile 		|| die
-	sed -i -e 's/CC =/#CC =/' Makefile 		|| die
-	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile 	|| die
-}
-
-src_compile() {
-	use ecm && export "ECM=1"
-	use mpi && export "MPI=1"
-	use zlib && export "ZLIB=1"
-	emake \
-		CC=$(tc-getCC) \
-		AR=$(tc-getAR) \
-		OPT_FLAGS="${CFLAGS}" \
-		all
-}
-
-src_install() {
-	mkdir -p "${D}/usr/include/msieve"
-	mkdir -p "${D}/usr/lib/"
-	mkdir -p "${D}/usr/share/doc/${P}/"
-	cp include/* "${D}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${D}/usr/lib/" || die "Failed to install"
-	dobin msieve
-	cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install"
-}
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index 701ce1e222be..6ebc0f57fdea 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,5 +1,5 @@
 DIST normaliz-3.1.3.tar.gz 3075453 BLAKE2B 0860b466dfa5335a58a496c21f7567e7e4682b07c73e36dbbd947eb65500e03758577d32355adb02fa4e271ca2f49bc5cb0449e26f1bdd11eab2dd5dbafd8f17 SHA512 c7fb1620e758dc59de88f0d7c55f50db0f67be772a00af27205e478f30c3836b7cf012a16a8adfdee3f0367d3adb4e3f887dc7d03793a7ca1601968ddb1946ce
 DIST normaliz-3.3.0.tar.gz 4243027 BLAKE2B 4785c47a2d815518e98b012dcbfe3cb70aac0ea8e06ad8f15ad6ba73120589e24f82050c25368775299974a43fce42052ffdf49379cd2b14ef4e415f6bb2d8f9 SHA512 3e09be1a265746c2cedf24c6a38de2f3801a906a66a0fa73a98b05916a5e6f412d84f5e38276781b5d99ff779a2db3fc420acdadd036e9822cae41b2ed539be5
 EBUILD normaliz-3.1.3.ebuild 1659 BLAKE2B d50183eef102f41a0db131c387a4a03aa0cf85fc4b076bbafa07969a63d331e0ef71205f3683e174a3b78f4d4bb8b8cd529423a4fba4669670818f7a99b6b2a8 SHA512 01a49bb35e3aa5fec13193d67244396e31e295e3904f4c1e3dbd96ce78a4c6c3aef05d35d3e305b4b055accee30d8cfa67d1fcfbc3c564e64f9493a67ef01880
-EBUILD normaliz-3.3.0.ebuild 1179 BLAKE2B 6171fe91431d006f3db01d4abd2ec3a1957b737101626c1ad247f887c7640e27eff9fd2afb538ae5375d3fb69e9f39c9bf77cdfd79bd20be29fe8e4b37fb1e60 SHA512 cf4d08b810de4167e834aa8f0bf6b2cdd0c478b255f797041f3b82753f69d7aee7f1da4e0f7a7457de89dcb7993a4ab51f7163e6a2fdef70281607a3c42f870b
+EBUILD normaliz-3.3.0.ebuild 1172 BLAKE2B 31a37d8153d01416c0022053bd61c9b5fb2ea68d26afde3f1eddd213c61566bf424e97832b56ad192cb627b97921b97ad41009df634abe4e08e3ebe00591a3d5 SHA512 980d246ab87765f2e9d9ecfa0c8555a83d7cc929a8462795b5e56e314ce4a3eba25cdf748e112d541991ee80e005918dbd72c5d784bf62623bc6b33153e56665
 MISC metadata.xml 694 BLAKE2B d14ea00cecc15244599561d12a957d298904851ca82ebfd728696344e5252cd42c05b6f1c06fa6b85ec70a9b4f75b188164fc4a87dbf2bf3e4d4151dd232c5de SHA512 f6407f218dead7d90fa4dde54fd4c77f075c2ad544371c1556e052fd719e58aec5c380dd6c9fc542ad581ab46609011e11ff255f41c06a7189ad83670d44f9fe
diff --git a/sci-mathematics/normaliz/normaliz-3.3.0.ebuild b/sci-mathematics/normaliz/normaliz-3.3.0.ebuild
index 39f9429c0f6a..0f6a3edf3801 100644
--- a/sci-mathematics/normaliz/normaliz-3.3.0.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools toolchain-funcs eutils ltprune
+inherit autotools toolchain-funcs ltprune
 
 MYP="Normaliz-${PV}"
 
diff --git a/sci-mathematics/octave-epstk/Manifest b/sci-mathematics/octave-epstk/Manifest
index fca6a05d687f..695737732f80 100644
--- a/sci-mathematics/octave-epstk/Manifest
+++ b/sci-mathematics/octave-epstk/Manifest
@@ -1,4 +1,4 @@
 DIST octave-epstk_2.4-1.debian.tar.gz 10905 BLAKE2B 79290d650a3a9e485c2b45fabcf5aa6c68585656f5f1c81ac3412ea123986bb51ed18b7f093bcec954964e260907594d5fda0f28915ef951fe59c6d238092278 SHA512 93ce2bdb04b2be36bc73d2c13a1bdd909b30597a76bc80db0abb1b4f53467742086559ed1f5ce265cea70f84c9b33d07a514b4fc1c8afc46640d0031907e6dea
 DIST octave-epstk_2.4.orig.tar.bz2 1072111 BLAKE2B 25694cb80fe66efb15508f6654218a2fcfd66997258e590626caf4daeafdc68b92dba5c9b0066c25777af609606d9b6e15ebea45c8fabcca17c962a1d664172c SHA512 64de7c23e2a79f03a6aeaa9e8a73c6d95e59cf616fc601bd8c6ad18d3870b1c60752f95cdc174cc31b3095e8b6e3858111c7d72b3b6df8effee4393791282112
-EBUILD octave-epstk-2.4.ebuild 904 BLAKE2B 0927c10cc250061ec3976be2b36f58c597df17324c665add5c38aeb56c7a5180385a94f44c11198cf758c640b871a2d4468a9a8ca1d3d7170c4d19bbfbb5874b SHA512 1c42dd57632b5817cce59215f1a86c2b52ec094ae52fe3e433ddabea116bb0e05f28c61ef3d4399eb62a67d6a4907b268cdd179ea7aaa3e3fdb95d037076f500
+EBUILD octave-epstk-2.4.ebuild 888 BLAKE2B 841df3019c6dacfe57780ab6846bca2c1be0f9cf90df04052bfb899838f4b4334fe5e19fb18fcc78b6bed9a49d403d26f76747a33c9f279ab9157a80252ba363 SHA512 c33f7b100bbf908df0442f438454c808e98e13582f38fa82d589a036d44182be83b0bea69556018daece65e12af3bce665e656e4b1a3eaf0f444acfe48fb6e52
 MISC metadata.xml 614 BLAKE2B 7e4e57a0aa9b57d55fe747609630d9ec2b037595f88ba1d3352a3702c85de6695c43035d75780189bc7293b581766b5305ff37c005de2843a6e9033000540d0c SHA512 d3ff3c6669d6fb6dac67df09c9eb7245e5cbf91d9bdd0d0ae47f66fcf3e11a2f769bdc9f934a35189792364a902518ae6d906963859eabfdc65579f6253e1061
diff --git a/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild b/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
index 84af6b0bbb00..beaa8dc5478f 100644
--- a/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
+++ b/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils
-
 DEB_PR=1
 DESCRIPTION="Graphical output functions for Matlab and Octave"
 HOMEPAGE="http://www.epstk.de/"
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 645074acb29b..cdb0559ab8bc 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,11 +1,11 @@
 AUX pari-2.11.2-Makefile-LDFLAGS.patch 394 BLAKE2B 534fcd325397a388545acbce5d96bd5417c31005512ee8f256283921fb64ec4a9ec27fb7e721648b117d3be1000816d1e9bc5ae5adc5df63afe1b0490db020c6 SHA512 de3283be39cff0bba916b314eb9e112324626513f30b5c0e0340617535d8e66ee93fdd9613839633bf7e85244caff6fa1379cc5d0c0a7f9484d028a650eb8845
 AUX pari-2.11.2-Makefile-docinstall.patch 867 BLAKE2B e8b83357ef42ebcb00abfe7bb5adc30414d1975fbde128ffe84c42898374969c608cd6f3b8b0061023681f6416e86552c80552ac51aa884e260d716f79b750c1 SHA512 089ab09532b2e888a272495606f5c0eeb6e12f764f3605c268a3e4e20e707d87c33feea2a745f7441e2cff6e7402df64f17f7b118350a8d4a0972ad8a5a82c69
-AUX pari-2.11.2-no-automagic.patch 2626 BLAKE2B 3be495852655cf47cab2ebfc544477707ab9274329a4fc7f380bd683236968e0bafd9f91b9c45289912b2a634aa9ba38f3130e0192cacfb6dc383765803eb5ad SHA512 ff8c00f028da9e782256ad9f6af87a194286cf198e8639bd737663db9b4898903993a9ef01f9084bcd658913f3d639509f89cca9b77963790ede9bb998845821
+AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eedbbfc08e5b40bce3f045309cef936f88356324b6d721c5cdb458a2343fb4ee6473238571dd779b74506e7e2b7d835e0c7 SHA512 549acaeaa393b0b42818e3648c21fdba3162abfefef147a1429d0e39f58ece0a46e94a6ee953435549c23d62b115b2dab0ee261eda2eb7fd0a2b430223f5f59c
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.11.4.tar.gz 4445000 BLAKE2B e910783186eeb71e74a369681c113b77271abd7f87d7a9f366aea83f36ab984f02e312cd451fad7ee6efb2fa285780e8fa78540bb1fd4b135a62d265176c80e0 SHA512 1312f452244cd1d814a1e43e108378c956669b614845f21199b7039fe6462881168983d4badb8a80bb1bac202cd82d92788a2b4f3c23d16f993cae6e251c4fe1
 DIST pari-2.13.0.tar.gz 4758091 BLAKE2B 21a008fbca9af60c7298daf2db5c596cf881fbf4748899f417e317b2e2c0a951d152ffdab061a5f7da73db65345134a90d91e57069d9f0d0ac6eb2ad470a7a98 SHA512 671bed101be0ba0eef2c4aa4d9580477f2492f2cd354f04773df00c2fa1456d1d6d8e568d617675dc4adce3e6d1f8cbaafae45452891ceb10eba60cd669b529f
-EBUILD pari-2.11.4.ebuild 3294 BLAKE2B 8656b6ec3b21763250c075f024c27786756a693c4ba365aa216547134734f91103c5ad38a03cf1ee0ee34c6564823d3f8deb2f75b1c3dd35aed1bf33ced1ee2b SHA512 fcc513c16a48d2d8cdc4b47f7f5d8799fe59b03fe593379b8c4b5f4ab60d9d5d6f6bd75de09cfccbd5a04783b36ef7ad93ccbfd0c8a57d0cca29ceb69db4cb07
-EBUILD pari-2.13.0.ebuild 3391 BLAKE2B 98ea133d0afa58bf2a2327d139a73567900fc52d93b98f579e34df1a879157f9559fcf2f4885401b9b50cc7555910b7dcdff9801e62650a5097de3d805e2570e SHA512 74235c32b2eb4731d62f603427aa1c031f8205a765173ae4814973b204c2a17ce343eaae4df912880497def8af75096d8cfbf7f9f9e853969819f6248aa863d2
+EBUILD pari-2.11.4.ebuild 3327 BLAKE2B 8117499dc50d8146bd3988fbaf4c18ccf719cd482372687bc58eaadec09011ec29b1324d58df2669d0fbc6dcbf3985e3dedf8bb20ad6793bfbc496913d467d6d SHA512 39034792b1b133599cba2eb89d7c459a6eb39da7db0f3ee0793b0941f5be9c992e5b4a1a0a58ad0e272fdf00b5b7e24ade75f7d2e7a2b2691d565eceefeff05a
+EBUILD pari-2.13.0.ebuild 3424 BLAKE2B 5d6bd25923c72ee36a037ca56f26fe71491ad3d2d1d98a3249291fc7ad50efdae7d9b170dd66691345f6e2c5080dc945fef06ed14174a89f3376e31faeca281e SHA512 ef976b96b5ad8600d96d9892ca24e449b1be11542ad531734fadec759b00188ac4afd9114fec76aace0f40e129e71e75acdc839b402cd31dd6bc93b6005898a9
 MISC metadata.xml 1764 BLAKE2B 8c5ad974148c99e21c30630ef1866a3ca7d34c87c214973c4025977130393a055de729bba4fda75d5e2ee288f439b1fc71e44bd3b68d09255f2ed3c81909f6fe SHA512 752c757e7b38995d44af25595da8626e773cb6083a0f9aafe7f3b6af1203b7da743b04b51bbc3f023e5e09c0620fe64fec1d44da7d84c88c4ef4619cbe347565
diff --git a/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch b/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
index d4044cc426d8..80f000c5f43e 100644
--- a/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
+++ b/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
@@ -1,5 +1,3 @@
-diff --git a/config/Makefile.SH b/config/Makefile.SH
-index 6cf5e59ee..7487941f9 100644
 --- a/config/Makefile.SH
 +++ b/config/Makefile.SH
 @@ -74,12 +74,12 @@ case "$which_graphic_lib" in
@@ -8,8 +6,8 @@ index 6cf5e59ee..7487941f9 100644
  Qt4)
 -  PLOTCFLAGS="\$(QTINC)"
 -  PLOTLIBS="\$(QTLIB) $QTLIBS"
-+  PLOTCFLAGS="`pkg-config --cflags QtGui`"
-+  PLOTLIBS="`pkg-config --libs QtGui`"
++  PLOTCFLAGS="`${PKG_CONFIG} --cflags QtGui`"
++  PLOTLIBS="`${PKG_CONFIG} --libs QtGui`"
    graph=plotQt4;;
  fltk)
 -  PLOTCFLAGS=
@@ -27,8 +25,6 @@ index 6cf5e59ee..7487941f9 100644
  QTINC      = $QTINC
  QTLIB      = $QTLIB
  PLOTCFLAGS = $PLOTCFLAGS
-diff --git a/config/get_config_options b/config/get_config_options
-index 4078d2720..5c12bd491 100644
 --- a/config/get_config_options
 +++ b/config/get_config_options
 @@ -86,6 +86,7 @@ while test $# -gt 0; do
@@ -60,8 +56,6 @@ index 4078d2720..5c12bd491 100644
  
  Miscellaneous
    --with-runtime-perl[=path-to-perl-binary] for gphelp / tex2mail
-diff --git a/config/get_graphic_lib b/config/get_graphic_lib
-index 4591f2aad..4808aab90 100644
 --- a/config/get_graphic_lib
 +++ b/config/get_graphic_lib
 @@ -7,6 +7,7 @@ FLTK_LIBS QTDIR QTLIB"
diff --git a/sci-mathematics/pari/pari-2.11.4.ebuild b/sci-mathematics/pari/pari-2.11.4.ebuild
index 83c7847848a6..ed86287930f9 100644
--- a/sci-mathematics/pari/pari-2.11.4.ebuild
+++ b/sci-mathematics/pari/pari-2.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,10 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-l
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
-BDEPEND="doc? ( virtual/latex-base )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
 DEPEND="
 	sys-libs/readline:0=
 	data? ( sci-mathematics/pari-data )
@@ -45,7 +48,7 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export CC CXX
+	tc-export CC CXX PKG_CONFIG
 
 	# Workaraound to "asm operand has impossible constraints" as
 	# suggested in bug #499996.
diff --git a/sci-mathematics/pari/pari-2.13.0.ebuild b/sci-mathematics/pari/pari-2.13.0.ebuild
index af9b5c717ca8..bc5709ab3388 100644
--- a/sci-mathematics/pari/pari-2.13.0.ebuild
+++ b/sci-mathematics/pari/pari-2.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
-BDEPEND="doc? ( virtual/latex-base )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
 DEPEND="
 	sys-libs/readline:0=
 	data? ( sci-mathematics/pari-data )
@@ -48,7 +51,7 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export CC CXX
+	tc-export CC CXX PKG_CONFIG
 
 	# Workaraound to "asm operand has impossible constraints" as
 	# suggested in bug #499996.
diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest
index a81e8a33c8a3..55979403b885 100644
--- a/sci-mathematics/petsc/Manifest
+++ b/sci-mathematics/petsc/Manifest
@@ -3,5 +3,9 @@ AUX petsc-3.13.0-fix_sandbox_violation.patch 1022 BLAKE2B 4883be2a38becba88dd1ce
 AUX petsc-3.13.0-make_hypre_configure.patch 4055 BLAKE2B e3bc831665fbe2c9a724a13420d1ce7557b7a1a6fcd7537271a6e48622f29f71f72257d649bcbef4aa4f287a804407cdb80579797eb54cfa994ef85d5bcb617f SHA512 47e4971596342c160fc54e1bc6d9fa739ae4bf6a9e3f89659992a3548de0beacdc7ac34a900117c1ee43b6bfaa81e8a58f1c45acea072be612ece3b5d18d7f86
 AUX petsc-3.7.0-disable-rpath.patch 909 BLAKE2B b9b6064886d6c10b382982778398cb7fa254242e5ed0dfb86dd4cd6c094dc51eecfd625f6de5c2779bfc5b3beda351ac44145c69ac246d814a728d7565da8086 SHA512 8241c593d903615feb175bfe8213792ace739a18ac5f4c1d1890155ccea7de30b5ef5d97e2fa3b043e9a1e520e022abedeb038d0b4db671f89045e04edc65a68
 DIST petsc-3.13.1.tar.gz 35097687 BLAKE2B fccf64fd3694deffdd0dc561069ffa7e9342fe279b5c9123edeb011df931874083839d27b7b9a0c63faea6487b104b54fd4ce68a88a074c82de91e8baaf270b0 SHA512 41c3138a6ae6c1f2d9077b464c6aeda96287e5a76849582b8f432e2ee93d2594a78ba2181eac0054a77b6165692be5f1a057049313f2be9743d4246383dfdc77
-EBUILD petsc-3.13.1.ebuild 5334 BLAKE2B dcd2393f46265da796bf26c0a59d164b4d236d8942481bb8546878ce71d979b01529cb338a57769fe0d489cd09393ab194f6e05f9142dbfa1ad86a8354bdaac7 SHA512 aa806505807ab1662eb2532672eac993740659d2438f2c2816d464bdf0c31f30be84338e85a8e80433699173e014194c66395d11a77fdc1565b01ddb20f6b56e
+DIST petsc-3.14.6.tar.gz 39719179 BLAKE2B d3047baf87c67eb64ef02c0c54d6313ea06f091b377b3cdf6dcf6d96c7d68cec5958a007ddd84b52a3ab39bfc0adf146307fa1785a10f39386393371186a3fba SHA512 9766e164446ac5a69b8bf761a0e8a235b1a2b85ed9c96a7fd59e668ae4cceb9d9559a38b175b4aa9747e78d7b44d0018a3c02748dcd3d783d28f861f8382d44c
+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
 MISC metadata.xml 1131 BLAKE2B db15101bb24374026158a0b45bab1b4b38ab6869bb13fc1df48eef96ca003cea0a8b9118033a3d53c735cefd5ca7563e074d458aee32e038a39e68a6a91b7364 SHA512 19cf1bcddd8bc1378bf85c47b090dd684474f29896c1877bfbeb53a24b1112ed4bb6e823cbc830ee40c886727c6c90d0852081488b1df63f8b4f071d3d453630
diff --git a/sci-mathematics/petsc/petsc-3.13.1.ebuild b/sci-mathematics/petsc/petsc-3.13.1.ebuild
index 11693456cfb5..dce92fc6e36a 100644
--- a/sci-mathematics/petsc/petsc-3.13.1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -102,6 +102,10 @@ src_configure() {
 	# governor rw.
 	addpredict /sys/devices/system/cpu/
 
+	# bug 771711
+	# configureMPIEXEC and  configureMPITypes access /dev/nvidiactl
+	addpredict /dev/nvidiactl
+
 	local mylang
 	local myopt
 
diff --git a/sci-mathematics/petsc/petsc-3.14.6.ebuild b/sci-mathematics/petsc/petsc-3.14.6.ebuild
new file mode 100644
index 000000000000..f9221853d5d6
--- /dev/null
+++ b/sci-mathematics/petsc/petsc-3.14.6.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
+HOMEPAGE="https://www.mcs.anl.gov/petsc/"
+SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="afterimage boost complex-scalars cxx debug doc fftw
+	fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X"
+
+# hypre and superlu curretly exclude each other due to missing linking to hypre
+# if both are enabled
+REQUIRED_USE="
+	afterimage? ( X )
+	complex-scalars? ( !hypre !superlu )
+	hdf5? ( mpi )
+	hypre? ( cxx mpi !superlu )
+	mumps? ( mpi scotch )
+	scotch? ( mpi )
+	superlu? ( !hypre )
+"
+
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	afterimage? ( media-libs/libafterimage )
+	boost? ( dev-libs/boost )
+	fftw? ( sci-libs/fftw:3.0[mpi?] )
+	hdf5? ( sci-libs/hdf5[mpi?] )
+	hypre? ( >=sci-libs/hypre-2.18.0[mpi?] )
+	metis? ( >=sci-libs/parmetis-4 )
+	mpi? ( virtual/mpi[cxx?,fortran?] )
+	mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack )
+	scotch? ( sci-libs/scotch[mpi?] )
+	sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 )
+	superlu? ( >=sci-libs/superlu-5 )
+	X? ( x11-libs/libX11 )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	dev-util/cmake
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.7.0-disable-rpath.patch
+	"${FILESDIR}"/${PN}-3.13.0-fix_sandbox_violation.patch
+)
+
+# petsc uses --with-blah=1 and --with-blah=0 to en/disable options
+petsc_enable() {
+	use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0"
+}
+# add external library:
+# petsc_with use_flag libname libdir
+# petsc_with use_flag libname include linking_libs
+petsc_with() {
+	local myuse p=${2:-${1}}
+	if use ${1}; then
+		myuse="--with-${p}=1"
+		if [[ $# -ge 4 ]]; then
+			myuse="${myuse} --with-${p}-include=${EPREFIX}${3}"
+			shift 3
+			myuse="${myuse} --with-${p}-lib=$@"
+		else
+			myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}"
+		fi
+	else
+		myuse="--with-${p}=0"
+	fi
+	echo ${myuse}
+}
+
+# select between configure options depending on use flag
+petsc_select() {
+	use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4"
+}
+
+src_configure() {
+	# bug 548498
+	# PETSc runs mpi processes during configure that result in a sandbox
+	# violation by trying to open /proc/mtrr rw. This is not easy to
+	# mitigate because it happens in libpciaccess.so called by libhwloc.so,
+	# which is used by libmpi.so.
+	addpredict /proc/mtrr
+	# if mpi is built with knem support it needs /dev/knem too
+	addpredict /dev/knem
+
+	# configureMPITypes with openmpi-2* insists on accessing the scaling
+	# governor rw.
+	addpredict /sys/devices/system/cpu/
+
+	# bug 771711
+	# configureMPIEXEC and  configureMPITypes access /dev/nvidiactl
+	addpredict /dev/nvidiactl
+
+	local mylang
+	local myopt
+
+	use cxx && mylang="cxx" || mylang="c"
+	use debug && myopt="debug" || myopt="opt"
+
+	# environmental variables expected by petsc during build
+
+	export PETSC_DIR="${S}"
+	export PETSC_ARCH="linux-gnu-${mylang}-${myopt}"
+
+	if use debug; then
+		strip-flags
+		filter-flags -O*
+	fi
+
+	# C Support on CXX builds is enabled if possible i.e. when not using
+	# complex scalars (no complex type for both available at the same time)
+
+	econf \
+		scrollOutput=1 \
+		FFLAGS="${FFLAGS} -fPIC" \
+		CFLAGS="${CFLAGS} -fPIC" \
+		CXXFLAGS="${CXXFLAGS} -fPIC" \
+		LDFLAGS="${LDFLAGS}" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \
+		--with-shared-libraries \
+		--with-single-library \
+		--with-clanguage=${mylang} \
+		$(use cxx && ! use complex-scalars && echo "with-c-support=1") \
+		--with-petsc-arch=${PETSC_ARCH} \
+		--with-precision=double \
+		--with-gnu-compilers \
+		--with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \
+		$(petsc_enable debug debugging) \
+		$(petsc_enable mpi) \
+		$(petsc_select mpi cc mpicc $(tc-getCC)) \
+		$(petsc_select mpi cxx mpicxx $(tc-getCXX)) \
+		$(petsc_enable fortran) \
+		$(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \
+		$(petsc_enable mpi mpi-compilers) \
+		$(petsc_select complex-scalars scalar-type complex real) \
+		--with-windows-graphics=0 \
+		--with-matlab=0 \
+		--with-cmake:BOOL=1 \
+		$(petsc_enable threads pthread) \
+		$(petsc_with afterimage afterimage \
+			/usr/include/libAfterImage -lAfterImage) \
+		$(use_with hdf5) \
+		$(petsc_with hypre hypre \
+			/usr/include/hypre -lHYPRE) \
+		$(use_with sparse suitesparse) \
+		$(petsc_with superlu superlu \
+			/usr/include/superlu -lsuperlu) \
+		$(use_with X x) \
+		$(use_with X x11) \
+		$(petsc_with scotch ptscotch \
+			/usr/include/scotch \
+		[-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \
+		$(petsc_with mumps scalapack \
+			/usr/include/scalapack -lscalapack) \
+		$(use_with mumps mumps \
+			/usr/include \
+			[-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \
+		--with-imagemagick=0 \
+		--with-python=0 \
+		$(use_with boost) \
+		$(use_with fftw)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	# add PETSC_DIR to environmental variables
+	cat >> 99petsc <<- EOF
+		PETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc
+		LDPATH=${EPREFIX}/usr/$(get_libdir)/petsc/lib
+	EOF
+	doenvd 99petsc
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*.html docs/changes docs/manualpages
+	fi
+}
diff --git a/sci-mathematics/petsc/petsc-3.15.0.ebuild b/sci-mathematics/petsc/petsc-3.15.0.ebuild
new file mode 100644
index 000000000000..f1f095b8b2cc
--- /dev/null
+++ b/sci-mathematics/petsc/petsc-3.15.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
+HOMEPAGE="https://www.mcs.anl.gov/petsc/"
+SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="afterimage boost complex-scalars cxx debug fftw
+	fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X"
+
+# hypre and superlu curretly exclude each other due to missing linking to hypre
+# if both are enabled
+REQUIRED_USE="
+	afterimage? ( X )
+	complex-scalars? ( !hypre !superlu )
+	hdf5? ( mpi )
+	hypre? ( cxx mpi !superlu )
+	mumps? ( mpi scotch )
+	scotch? ( mpi )
+	superlu? ( !hypre )
+"
+
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	afterimage? ( media-libs/libafterimage )
+	boost? ( dev-libs/boost )
+	fftw? ( sci-libs/fftw:3.0[mpi?] )
+	hdf5? ( sci-libs/hdf5[mpi?] )
+	hypre? ( >=sci-libs/hypre-2.18.0[mpi?] )
+	metis? ( >=sci-libs/parmetis-4 )
+	mpi? ( virtual/mpi[cxx?,fortran?] )
+	mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack )
+	scotch? ( sci-libs/scotch[mpi?] )
+	sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 )
+	superlu? ( >=sci-libs/superlu-5 )
+	X? ( x11-libs/libX11 )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	dev-util/cmake
+	sys-apps/which
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.7.0-disable-rpath.patch
+	"${FILESDIR}"/${PN}-3.13.0-fix_sandbox_violation.patch
+)
+
+# petsc uses --with-blah=1 and --with-blah=0 to en/disable options
+petsc_enable() {
+	use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0"
+}
+# add external library:
+# petsc_with use_flag libname libdir
+# petsc_with use_flag libname include linking_libs
+petsc_with() {
+	local myuse p=${2:-${1}}
+	if use ${1}; then
+		myuse="--with-${p}=1"
+		if [[ $# -ge 4 ]]; then
+			myuse="${myuse} --with-${p}-include=${EPREFIX}${3}"
+			shift 3
+			myuse="${myuse} --with-${p}-lib=$@"
+		else
+			myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}"
+		fi
+	else
+		myuse="--with-${p}=0"
+	fi
+	echo ${myuse}
+}
+
+# select between configure options depending on use flag
+petsc_select() {
+	use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4"
+}
+
+src_configure() {
+	# bug 548498
+	# PETSc runs mpi processes during configure that result in a sandbox
+	# violation by trying to open /proc/mtrr rw. This is not easy to
+	# mitigate because it happens in libpciaccess.so called by libhwloc.so,
+	# which is used by libmpi.so.
+	addpredict /proc/mtrr
+	# if mpi is built with knem support it needs /dev/knem too
+	addpredict /dev/knem
+
+	# configureMPITypes with openmpi-2* insists on accessing the scaling
+	# governor rw.
+	addpredict /sys/devices/system/cpu/
+
+	# bug 771711
+	# configureMPIEXEC and  configureMPITypes access /dev/nvidiactl
+	addpredict /dev/nvidiactl
+
+	local mylang
+	local myopt
+
+	use cxx && mylang="cxx" || mylang="c"
+	use debug && myopt="debug" || myopt="opt"
+
+	# environmental variables expected by petsc during build
+
+	export PETSC_DIR="${S}"
+	export PETSC_ARCH="linux-gnu-${mylang}-${myopt}"
+
+	if use debug; then
+		strip-flags
+		filter-flags -O*
+	fi
+
+	# C Support on CXX builds is enabled if possible i.e. when not using
+	# complex scalars (no complex type for both available at the same time)
+
+	econf \
+		scrollOutput=1 \
+		FFLAGS="${FFLAGS} -fPIC" \
+		CFLAGS="${CFLAGS} -fPIC" \
+		CXXFLAGS="${CXXFLAGS} -fPIC" \
+		LDFLAGS="${LDFLAGS}" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \
+		--with-shared-libraries \
+		--with-single-library \
+		--with-clanguage=${mylang} \
+		$(use cxx && ! use complex-scalars && echo "with-c-support=1") \
+		--with-petsc-arch=${PETSC_ARCH} \
+		--with-precision=double \
+		--with-gnu-compilers \
+		--with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \
+		$(petsc_enable debug debugging) \
+		$(petsc_enable mpi) \
+		$(petsc_select mpi cc mpicc $(tc-getCC)) \
+		$(petsc_select mpi cxx mpicxx $(tc-getCXX)) \
+		$(petsc_enable fortran) \
+		$(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \
+		$(petsc_enable mpi mpi-compilers) \
+		$(petsc_select complex-scalars scalar-type complex real) \
+		--with-windows-graphics=0 \
+		--with-matlab=0 \
+		--with-cmake:BOOL=1 \
+		$(petsc_enable threads pthread) \
+		$(petsc_with afterimage afterimage \
+			/usr/include/libAfterImage -lAfterImage) \
+		$(use_with hdf5) \
+		$(petsc_with hypre hypre \
+			/usr/include/hypre -lHYPRE) \
+		$(use_with sparse suitesparse) \
+		$(petsc_with superlu superlu \
+			/usr/include/superlu -lsuperlu) \
+		$(use_with X x) \
+		$(use_with X x11) \
+		$(petsc_with scotch ptscotch \
+			/usr/include/scotch \
+		[-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \
+		$(petsc_with mumps scalapack \
+			/usr/include/scalapack -lscalapack) \
+		$(use_with mumps mumps \
+			/usr/include \
+			[-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \
+		--with-imagemagick=0 \
+		--with-python=0 \
+		$(use_with boost) \
+		$(use_with fftw)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	# add PETSC_DIR to environmental variables
+	cat >> 99petsc <<- EOF
+		PETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc
+		LDPATH=${EPREFIX}/usr/$(get_libdir)/petsc/lib
+	EOF
+	doenvd 99petsc
+}
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 3e8139e2cbbc..3810a3a7e5a2 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,3 +1,3 @@
 DIST polymake-3.0r2.tar.bz2 37695790 BLAKE2B 101dda48128b51737b81d3dc09a8ef32d07c5f67605370c5ef0d5638ee6de427c6e8ff66094f96593ad21fa937ca5890af772f6e877fab0e31f4c98ec7c6730b SHA512 b4c22b2c6da8ef597dc05a44a30c7a55fd924a96854cde3f725095465972eabe1e24508f8e5d544f3131c82c973117b15983c38a0242fc7f1d4a4a8ecddb1d46
-EBUILD polymake-3.0_p2.ebuild 2692 BLAKE2B 7279c8799c49d2adbe0126f8a421eea1c657ccebd3283cf37ca8364b817f5efa1844e084f55c1a51183f780d32a8f71546e2b41f343c39f86856b1dfe36d3894 SHA512 236c7ee312e29daa6eaf371553d79cfd2bd8854af12bf020df639c2f459c0b5c52704c558bb49cc98f599ba09e643821c27aec802be95c1780fe1925ddf24c84
+EBUILD polymake-3.0_p2.ebuild 2685 BLAKE2B 79251d8afce025c97538108a2d754d355307ef0c78ececfde3be4f8fba3a107e86934c0984b7e5fa5decf604afc4bf0dc25535c2f6ab4ac474792111b59fd2f8 SHA512 7ab8fdd4a993ed862aa4bbf8254261aee8158f0c916a1c8e14e223a42a2a819aa546bc3556dfe854ca3737671a585e4ee565260bff171b370759f28dd27493c4
 MISC metadata.xml 1344 BLAKE2B 93e5b08dd3c8db1d542c98a62b5d1c0bbb2070773a563e843f31434b6babccc9bb49521d4dd5f40238a20dedd8296fc43b9b347dbe5b540f8a4c17bbc59f6fdf SHA512 43356916d2941afab2346ab4289ec1ab65a166523682a7831a29261c3f7391072d4fa232c324483e33d523fa80288a208f7937f559e56bb20b3a85d5058779e9
diff --git a/sci-mathematics/polymake/polymake-3.0_p2.ebuild b/sci-mathematics/polymake/polymake-3.0_p2.ebuild
index 179fb83a8924..bff44f4d9bb6 100644
--- a/sci-mathematics/polymake/polymake-3.0_p2.ebuild
+++ b/sci-mathematics/polymake/polymake-3.0_p2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="research tool for polyhedral geometry and combinatorics"
 SRC_URI="https://polymake.org/lib/exe/fetch.php/download/polymake-3.0r2.tar.bz2"
diff --git a/sci-mathematics/prover9/Manifest b/sci-mathematics/prover9/Manifest
index 71e445616dba..09c0ecf1a160 100644
--- a/sci-mathematics/prover9/Manifest
+++ b/sci-mathematics/prover9/Manifest
@@ -1,5 +1,5 @@
 AUX LADR-2009-11A-manpages.patch 13832 BLAKE2B dfd8d0ba6722d788b4e7662c0c4113cc06c32f2f45cdd32327896147435d3f730b464189ee1766a1c162a90cd730d917d8b29c3c241a94d65a3fc5833f3bbca1 SHA512 4c9f862b33d7b6b33b5e4a82b38418c6ae41b7adae565d376cc741608eb989e3846c1e98589dea62f7cadeb0b1f0f5814afe95ee6cf0da63c6961620d8b2677c
 DIST LADR-2009-11A-makefile.patch.xz 4300 BLAKE2B 3ea0860901876c43aeadcee7cf7eca02c31c88ca6670c867ef4a41b9adc2aa13edf36f45807713f7b200355f5086b43a17722071be81f58af1bc5d70327e3e41 SHA512 c1d2e27d991036af24a29deb4401fbf9687415d2a37bebabb9cfc77d8672e0804d974f92cbd7b8e16c0a0c10b75831847f7b8ddb94244d7e632de7b1be5081f1
 DIST LADR-2009-11A.tar.gz 1795750 BLAKE2B ed44b1d0f5f5f3c9846ff578af10914421c79f580db9f9002f105b87d7af49fb6f2956b70d2ebfbd17b3a230d1065aadb1cc798ef7ebdad8749e66cea41120b6 SHA512 f26d3713eb2ba809fb3d55ce179e9d91555ab9166e075aa0843bafe57ce00f153cfed178b61993d4fd471655840e4f40775d75dac9fb5242a67e5d59c970dfc7
-EBUILD prover9-2009.11a.ebuild 2521 BLAKE2B 143a0c0613f0c4b32e5bc27f5b2ba953371e3eb08eb756cc2d73cea59caee1ee92e217c6d47510b64c0e8b8238a574feedbfdc67f74e9a94359ec4c58f80d966 SHA512 5b1907e147960dd3a3419361d94d191dbce62f3c2869ab625342aa024d7d37a2f9a8962e9bfc31ce003ae5c41b7d19c732cea21f0be89b85225fbb4385868cf4
+EBUILD prover9-2009.11a.ebuild 2514 BLAKE2B 52b53007c8428c449b19c00324ddd3f84c9001bb9af2d453ea7b537348a5f6b48feb5a4ac6c000bd1a9e5b37317df4e6e0a58faa81332d440c36b48079ef4be9 SHA512 21d4294cb6ea5cbd1951751976e5872256e9e7de82e2b46f896efcbe5d5c7bc83321baaafbbefea59feabe77c2673b1a1cfed1daf0b806a498bc7ea90aa9aa9e
 MISC metadata.xml 643 BLAKE2B cdef536d25ca7d2ba991037e4423c21bde719ae18976367e5e8d232d3f4d83f46b10c135f5f0f6986ba8d1756eee5cc85e78dfc4a4b81204945a7268a6ed899a SHA512 c3160f8aadceb5f065af9c5f14e9fe904b270bba1cf7781d33c39dca4f2641d61123839b93c4d7ad38139e8fc4c221016fe444cbfd7ddc99ea224090fccd7078
diff --git a/sci-mathematics/prover9/prover9-2009.11a.ebuild b/sci-mathematics/prover9/prover9-2009.11a.ebuild
index ebcbaab1c1a9..0fa79ab74422 100644
--- a/sci-mathematics/prover9/prover9-2009.11a.ebuild
+++ b/sci-mathematics/prover9/prover9-2009.11a.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN="LADR"
 typeset -u MY_PV
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index d58fddf1017d..8546aeeeed53 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,3 +1,3 @@
 DIST rkward-0.7.2.tar.gz 6307769 BLAKE2B df72d5d03ecbb57cb08787cc27e66cfacca517a08ca10190c1bb0d627f991dab6b79e9399b0b6c38a545d370d0ecdc8fc5796c1e046a0aac20c0485405a2d72c SHA512 af872b59dea8535eb6ddc0b3db56c45114fc64b0b657e5c8373eb2f7b3a63aa13f9e3c8f6050ff3eff0126df595ed30e1d1e66b91c19b7ba950838613798cb6d
-EBUILD rkward-0.7.2.ebuild 1215 BLAKE2B 3a0fe910d159cf55895df19970c3cd2ea646270a94e72f3437db04c7898ef24621c397a1e32c79a8a8b823b7110b1f6a7069655a0ed7c855c15554c9d8d0917b SHA512 76e040fb98b5c670e62ca9659ab17de19d8cab6fe354188430b1eb69e6bf41439f520bb5ed2dc210b64c52bd2c95f02268ff3536b7fc35deb1b4939df332944a
+EBUILD rkward-0.7.2.ebuild 1184 BLAKE2B 3f8e94de58512407bdb4ae8f5ad805e0fb45f60a9919df1d7aacf8330c731bb7aedd67b6a02a34298830dae81c342d88c38acc7296cb0741d9ff6e7d6c65317f SHA512 c3f8bc8b541e6c6cdf5f8cfa93b14d1c035ae7d3d6ce4659b1c378aa61fadba2e704d7d78d9bf1f6c52cff75d60e202f1b881ce22ce8e12f9400b60d2903e029
 MISC metadata.xml 379 BLAKE2B 7121b146f3459161739381e46701bdbdcdea98aee6f77e28d4a6d1628abb6b391800991aa23db4df4355850e04aa5efd80f2ea2fc0d500f48cf0377760eab8ee SHA512 02e0755c6d71955276d5a3f1adfa69a4056820e99c0d5e815ce1966c3d474dd61573fee137056d67bc64ebfc01297223a2f8f523c9c6d9b5eb9755104fc0915a
diff --git a/sci-mathematics/rkward/rkward-0.7.2.ebuild b/sci-mathematics/rkward/rkward-0.7.2.ebuild
index a76b8cd6a799..e6b9d0f01284 100644
--- a/sci-mathematics/rkward/rkward-0.7.2.ebuild
+++ b/sci-mathematics/rkward/rkward-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 pkg_postinst() {
-	elog "Optional dependencies:"
 	optfeature "kate plugins support" kde-apps/kate:${SLOT}
 	ecm_pkg_postinst
 }
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 2916c7c6e954..b232d12bdf2d 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -11,7 +11,7 @@ DIST singular-4.0.2.tar.gz 8635172 BLAKE2B 5f565bf14677d8414300d7a5602aa96c8cef7
 DIST singular-4.0.3-share.tar.gz 6633256 BLAKE2B c137b72aaa0926eb006624e03fe938678acb94a41da525de1ca4f7711985d253926788b550d2d98b8def15fb0cb60b2527c1c04566a29a28135fcb1a70246025 SHA512 5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a
 DIST singular-4.0.3.tar.gz 12615042 BLAKE2B b3c63434974bb8b5fdef86cbcbe73b76a47503b28dcae6bfc6e4210e1ab1c14224ac0f6eeefa9d8004450f6d9a26843368a9b2ea16bca68bf1215ce33e83df0d SHA512 781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
-EBUILD singular-4.0.2.ebuild 3580 BLAKE2B 3bd6e930a356db2fc3752e430e16ff2074b1494e42e1813108ce50eb846200a9aa1af646422a29a171ad3573387c7e46c8aef57b36dc1ce4d133e0ea090a9311 SHA512 ffcc778fb84b8475a9c3b1f8fc8c1875ac2213551b5fac54c6668d298f5bb338977ea078ce81acabcb83adea61bd514c40a4f3545ec953ac7eeb80e58010cdef
+EBUILD singular-4.0.2.ebuild 3564 BLAKE2B b24e5fe11a2b8d3b400663c5950f9a7d9342db159c53c0ff9a703f1c9ee929d15d7ebde73a4ee303dba99f4d181b118b37c1a3529e8dcd410e98a3296ab2ae4f SHA512 ef838c4b4ed39e442ec90eafa0783a9b2d8526d2da37eeae89050a0c6507f7d813dfbe07a2ebd092fd097573c6607415d8a21dfa044573f3bad79919c15b425b
 EBUILD singular-4.0.3.ebuild 2499 BLAKE2B 5d17c7d35ec1ba6073e7d4703134fe96b4f8d59ae34922947dbc0f8f2aa6ddf52535e766aa62b1f66be5ef92c9dab5b458f02266239f8ba1013920e59c73ae8b SHA512 bfb148756c9f381ccdd6e2374971c0e1e589e7739b473a86826a35d6e15e0d724fcb76cf672896dbf9f562f033d2752bdbe1bc8521cd276b1fc6358e0014ce90
 EBUILD singular-4.2.0_p1.ebuild 2261 BLAKE2B 5c3e9208ffc6bbe2e0e1be3ef26a2ac30c2b859630d9354a219575517293ca74608cdadeee539544c308ff4e495d778eb4b985449e04167df8d833ba9e1da4a8 SHA512 f77fbffe6507710d11ad0081127c2a52918d4762d52aa7741e899106b54e233cd064c28d47b0b2865f4e162cdd31f65e712fa577a2cb35d270d23ce834b52a89
 MISC metadata.xml 389 BLAKE2B dcba16dd34ab572d58d76ea55f528ee1a4bb4c0c37ca272c9a11afdb8117f6982e5109a4a4783d1efc6cb31fe273f07bf79f720f178fea635af29574007c93f9 SHA512 3c5aea925276639c81a03a2a8d05ecaa48edac510f144d92e173402721dbc253638341ac8afdfbc17098ac35d2f4f47b41e5d56427c8ecaa788dc28fbb0977ae
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
index a6741b6bb076..c66500337100 100644
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit autotools eutils elisp-common flag-o-matic multilib prefix toolchain-funcs versionator
+inherit autotools epatch elisp-common flag-o-matic toolchain-funcs versionator
 
 MY_PN=Singular
 MY_PV=$(replace_all_version_separators '.')
diff --git a/sci-mathematics/slepc/Manifest b/sci-mathematics/slepc/Manifest
index 0a8651686a03..09b09fb7b779 100644
--- a/sci-mathematics/slepc/Manifest
+++ b/sci-mathematics/slepc/Manifest
@@ -1,3 +1,7 @@
 DIST slepc-3.13.1.tar.gz 4797627 BLAKE2B 29372b8a2d4c5f3b26e840df743f7aec098bfeeb29e9c108e509baa21d9697da19c737470ba4c132391d5193ebf749ef3f3c6ece600ec7527502d40a239aa0ee SHA512 620c344274808329c0a1009e7844532e03e88d38135bfd5b73bc0bc6815b17b6dfb49341d05399230ba6e06997db688aec17615429eaca3dc94fd886119bf321
-EBUILD slepc-3.13.1.ebuild 1588 BLAKE2B 98ded2dcf390b5194310825ff4b300b47f1bbff72efde1dc90d0e17c9deebfb5d50c2e71573a9f98a322b1f6bd08d6925e4ad2372eec20fdd3a09bc21c84c275 SHA512 073feab3770d208ff3b8bcbddc7d6c3ca5f67511f7e46990d101245f8c46572908dfd1ece994958cf8962868004de0478fbbaec694c60a2adb5f1a4391fdf170
+DIST slepc-3.14.2.tar.gz 4865497 BLAKE2B d6fd0b45368383fad03b17f9d7f0ef26215b7459a5566c62ab2ad758eaa5fbc626be255b0aafa29b8830eb649a7bcfb0f36d383b865b4c1baa9de6037638de84 SHA512 0727a4f1672c4eb3cf0aa20aa408b897425539ac69123001ac3b2e0bc2d1fa230ef028fa0cd5e89e7a86a98884164fd1c97a742f90f0c128fcc7066d032ee321
+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
 MISC metadata.xml 451 BLAKE2B 5268292011dffcbc322504b29332ae20a4e775238e201ffe793e1ebfb8d8c13a836ca1f8eba44b38bc63ba7b21a3634a03df9990e8b801def0152316d1539960 SHA512 7bf6d4cdedaa48f96e9b1d3e237b795f7cbfd840cece0c0181c9efa05ec833477191e8d12cf2b7737a921b85fb5af055d5868e1173415fc70802eb515959c9d5
diff --git a/sci-mathematics/slepc/slepc-3.13.1.ebuild b/sci-mathematics/slepc/slepc-3.13.1.ebuild
index 957624825544..b30b13af2da9 100644
--- a/sci-mathematics/slepc/slepc-3.13.1.ebuild
+++ b/sci-mathematics/slepc/slepc-3.13.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+inherit flag-o-matic python-any-r1 toolchain-funcs
 
 DESCRIPTION="Scalable Library for Eigenvalue Problem Computations"
 HOMEPAGE="https://slepc.upv.es/"
diff --git a/sci-mathematics/slepc/slepc-3.14.2.ebuild b/sci-mathematics/slepc/slepc-3.14.2.ebuild
new file mode 100644
index 000000000000..b30b13af2da9
--- /dev/null
+++ b/sci-mathematics/slepc/slepc-3.14.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Scalable Library for Eigenvalue Problem Computations"
+HOMEPAGE="https://slepc.upv.es/"
+SRC_URI="https://slepc.upv.es/download/distrib/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="complex-scalars doc mpi"
+
+RDEPEND="
+	=sci-mathematics/petsc-$(ver_cut 1-2)*:=[mpi=,complex-scalars=]
+	sci-libs/arpack[mpi=]
+	mpi? ( virtual/mpi )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	dev-util/cmake
+"
+
+MAKEOPTS="${MAKEOPTS} V=1"
+
+src_configure() {
+	# *sigh*
+	addpredict "${PETSC_DIR}"/.nagged
+
+	# Make sure that the environment is set up correctly:
+	unset PETSC_DIR
+	unset PETSC_ARCH
+	source "${EPREFIX}"/etc/env.d/99petsc
+	export PETSC_DIR
+	export PETSC_ARCH
+	export SLEPC_DIR="${S}"
+
+	# configure is a custom python script and doesn't want to have default
+	# configure arguments that we set with econf
+	./configure \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/slepc" \
+		--with-arpack=1 \
+		--with-arpack-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-arpack-lib="$(usex mpi "-lparpack,-larpack" "-larpack")"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	# add PETSC_DIR to environmental variables
+	cat >> 99slepc <<- EOF
+		SLEPC_DIR=${EPREFIX}/usr/$(get_libdir)/slepc
+		LDPATH=${EPREFIX}/usr/$(get_libdir)/slepc/lib
+	EOF
+	doenvd 99slepc
+
+	if use doc ; then
+		dodoc docs/slepc.pdf
+		docinto html
+		dodoc -r docs/*.html docs/manualpages
+	fi
+}
diff --git a/sci-mathematics/slepc/slepc-3.15.0.ebuild b/sci-mathematics/slepc/slepc-3.15.0.ebuild
new file mode 100644
index 000000000000..b30b13af2da9
--- /dev/null
+++ b/sci-mathematics/slepc/slepc-3.15.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Scalable Library for Eigenvalue Problem Computations"
+HOMEPAGE="https://slepc.upv.es/"
+SRC_URI="https://slepc.upv.es/download/distrib/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="complex-scalars doc mpi"
+
+RDEPEND="
+	=sci-mathematics/petsc-$(ver_cut 1-2)*:=[mpi=,complex-scalars=]
+	sci-libs/arpack[mpi=]
+	mpi? ( virtual/mpi )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	dev-util/cmake
+"
+
+MAKEOPTS="${MAKEOPTS} V=1"
+
+src_configure() {
+	# *sigh*
+	addpredict "${PETSC_DIR}"/.nagged
+
+	# Make sure that the environment is set up correctly:
+	unset PETSC_DIR
+	unset PETSC_ARCH
+	source "${EPREFIX}"/etc/env.d/99petsc
+	export PETSC_DIR
+	export PETSC_ARCH
+	export SLEPC_DIR="${S}"
+
+	# configure is a custom python script and doesn't want to have default
+	# configure arguments that we set with econf
+	./configure \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/slepc" \
+		--with-arpack=1 \
+		--with-arpack-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-arpack-lib="$(usex mpi "-lparpack,-larpack" "-larpack")"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	# add PETSC_DIR to environmental variables
+	cat >> 99slepc <<- EOF
+		SLEPC_DIR=${EPREFIX}/usr/$(get_libdir)/slepc
+		LDPATH=${EPREFIX}/usr/$(get_libdir)/slepc/lib
+	EOF
+	doenvd 99slepc
+
+	if use doc ; then
+		dodoc docs/slepc.pdf
+		docinto html
+		dodoc -r docs/*.html docs/manualpages
+	fi
+}
diff --git a/sci-mathematics/spin/Manifest b/sci-mathematics/spin/Manifest
index 10c0b01e95a1..72d24b768b1d 100644
--- a/sci-mathematics/spin/Manifest
+++ b/sci-mathematics/spin/Manifest
@@ -1,4 +1,4 @@
 AUX spin-6.4.5-makefile.patch 620 BLAKE2B 44fe04e7338e872be7efe6ffc2766c926ad425886bba2dff71972a77a455e2a72b34796f1c7b0618eb3777fdb05f12ba9d63c05fd229eee98fa50cc7830ae468 SHA512 47b72f5cda3275f62a291870e3683fb3f29f3eeab2d251336777d9a2c814b6be436bcbe59a8d98c0f4f32d7b0a9a2961f34c436d6f265d8a2474258fd9c0d6ee
 DIST spin645.tar.gz 672549 BLAKE2B 5b0f7d5ef8fbec84a4423938c10272f804084d05d470a69ef954ee261752b238b16643054d934617861fb02ef4a318c708a8464102572d34b71c883cb84fe450 SHA512 77bc35bb852c0448915c655bf11910d0b226d30d66abaa63311e6227de03f920ca026e7399cbeebdae631368fd8091f1e8330bd3094bd4febdf7d5c7a81834ad
-EBUILD spin-6.4.5.ebuild 886 BLAKE2B bf15653b598e3b9a6516d26a6a2231e32e8752f8c3cbec153ac1fc773552f535a189bb69ff0d58463f865ae51e7b4e003b8b6273bfb6b7c2fa75b86bccc0a15a SHA512 4882c4aefde1633d067d15114166d010d442704d66bba585134b8e3f55158933f3960221bc12aeed47a14d81982edde196e79511586a6d6c9eb7058110b2f0b4
+EBUILD spin-6.4.5.ebuild 891 BLAKE2B d80a6d3b613c4c5e8dd3bf307ecb6b20458a0d3ab15ba71d073e369c1aac2f2c83adc7b2fac0717885d9d9fc3e1e3789518a117da3e1341ae1feb81e1c6ac9af SHA512 5230d024a5629291960c4d665cc015bde9b49b81c3619765940308cd9437a2cadb36509f2278285b1daac147e22bc3032a45bfcf9e6bc16233132ad6538f15aa
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sci-mathematics/spin/spin-6.4.5.ebuild b/sci-mathematics/spin/spin-6.4.5.ebuild
index 2d78f62dd3c0..010f2550a874 100644
--- a/sci-mathematics/spin/spin-6.4.5.ebuild
+++ b/sci-mathematics/spin/spin-6.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils toolchain-funcs versionator
+inherit desktop epatch toolchain-funcs versionator
 
 MY_PV=$(replace_all_version_separators '')
 MY_P="${PN}${MY_PV}"
diff --git a/sci-mathematics/twelf/Manifest b/sci-mathematics/twelf/Manifest
index 9d51e6127ddd..83a6dc919c49 100644
--- a/sci-mathematics/twelf/Manifest
+++ b/sci-mathematics/twelf/Manifest
@@ -7,5 +7,5 @@ AUX twelf-1.7.1-emacs-twelf.patch 602 BLAKE2B b4b7572bd3b87013332e26096aa92a698e
 AUX twelf-1.7.1-mlton-20180207.patch 310 BLAKE2B b372c7ca65b4bb12983d84e590d4e303e4b41308ad6f6ccb3f28101e78e18a7138cb5a65011eeec8f04ba990e29804ec02d3faf11e4c6ca998f40f419bca3472 SHA512 4d8044248a28d92e961baa1a935de8f6f52751218e65abd2cae9a264c66e446608d73d6a993df07671330b003735d2fee4e75653e9a324844a0042333b28fdd1
 AUX twelf-1.7.1-mlton-mlb.patch 11244 BLAKE2B e07adfd1520179a8ca3c292638689c8cc344b8d01ebcf2ba9f668cbf2afa5b5132a88d0521ca4123a9165d8fea49cdbab20b48b791bd3e78610d54b534e9e596 SHA512 2d0f42399e444cbb736f38ad7bdc54f51322c17c010b273c365d9db9a1e6c045c19b872d4b5c1e50444559a981aa5569764ac859c7702c116c97c935fd959bfd
 DIST twelf-src-1.7.1.tar.gz 1147610 BLAKE2B 9fbb3c5a4823845a0c721112744330658be0e68784ef209a3d17fb72874ef50d7dbb434a7104704a5540f2f0bc30727bfe1ff602f986570f944454e77c24609d SHA512 1b4baa0f385b6b605583a9da312f23c775aab43e7398c6e151833a6b95c74112492530f44fcb7b14f8288774e9b63e2f9618a5debfbc4d34737bc2588f5850df
-EBUILD twelf-1.7.1-r1.ebuild 2438 BLAKE2B 2b0f2461f8c1f6b245ea41f39043f3f1ad3633643521c1fccd5384acd319962c1d403a7de9d1d6c655a54a44b10daf215da28e6f82ebeadc77286717072f73b8 SHA512 4de8be441caf012ee6735e37408072639491935ab114c1b8966a4c3ed3bc238293ca63e6a5c0869912f9e0b2ebc5fd2274ac5519ea2c10645c73fd04a003c4cd
+EBUILD twelf-1.7.1-r1.ebuild 2431 BLAKE2B 08b4d3eccb106bbced79e7dba62852746ab6ce86ab016660f6236e2dd8d05a0f23df0bc40c64870f4c767cd2e307dfd324401a6bd995b6cc31e8e0bda499de66 SHA512 ebfc0684289e5a605df8588a15a01041c9daa6414e04dc0302726540faf67413b15f1fd7829f5dc972a8706621fb25185d923f34a0f4db36a9cf787cfb246ec9
 MISC metadata.xml 446 BLAKE2B 318daa8b8e87beff1553a9e49e7db737736b8bad6f157753f42dd8fcfa0941dd83273cab94c056ab4e9555019263f1356e99baea1ef4dbca1da2df3d8f096ec7 SHA512 7fcca73104456672c8e262129cdcc232073d6d0a4cd48d6593734646a3611ac6056325cc88be5c3a3585d67bc76fa9fb663a0171df7b84612c56c0ec93bc0e2e
diff --git a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild b/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild
index 21d5f0f5a01a..26846927797b 100644
--- a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild
+++ b/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit elisp-common eutils multilib
+inherit elisp-common multilib
 
 MY_PN="${PN}-src"
 MY_P="${MY_PN}-${PV}"
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 8c1675fd8dc4..5ca755d6efbf 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,7 +1,7 @@
-DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e
 DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb
 DIST wxmaxima-21.01.0.tar.gz 16220587 BLAKE2B b987e8c44c253484d152092093ab9154b7c2a5817c584bc1a4f4a0e5beec3ec2e0bc6995aea6ba28df2223b039ca97905225cc2524840174b2c99a5f7774dab2 SHA512 aec5aa5d3a9883e9b21b890c133684004576411a8341f3913ae548175979ad1f07a16d0fccd24c7757d40f4d06b4070b00fa7ef54f73f26b99c825e03e2a408b
-EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
-EBUILD wxmaxima-20.12.2.ebuild 1433 BLAKE2B aab53bc0b36e755aeb883cf18b2a9dc74e6420478765b351c920f2937f6970a20524d31833da7d51730bd7a5955f998e2968cf36d3a48b8122f2eac339b04f8a SHA512 32773324509bc19466c91a43c39050f25a4922f67eac211a117ec6f69be379881f5615a4d000176c0fb490bd91a7534f75038867e4e91064d1ea1b59fcb79570
-EBUILD wxmaxima-21.01.0.ebuild 1433 BLAKE2B aab53bc0b36e755aeb883cf18b2a9dc74e6420478765b351c920f2937f6970a20524d31833da7d51730bd7a5955f998e2968cf36d3a48b8122f2eac339b04f8a SHA512 32773324509bc19466c91a43c39050f25a4922f67eac211a117ec6f69be379881f5615a4d000176c0fb490bd91a7534f75038867e4e91064d1ea1b59fcb79570
-MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
+DIST wxmaxima-21.04.0.tar.gz 17684730 BLAKE2B a3b12970ad976a3ee3fc237b6d60f52d460e87997b869825d17645daa0f82bcc6f7999188fe4c92bba819d7a895cff468ff273ab62ab30f38a7a54a6dba47786 SHA512 723373c9fd9877bce38a205455e6ac58a48a61ac3ad0be5c09d0b24abeebd35af481f19efe5de08a2507f1198a8b4b6cfa987c50e4d4a580b4e05ec2c3e5a4f7
+EBUILD wxmaxima-20.12.2.ebuild 1431 BLAKE2B 9a4b92a92dcf9636eec1449f27de9c4dbf5493d13e9cbbbc4c6ea8be8bfe5ca9d282b9df2b6c4a3f1d3c442a363551becf1bbf1c40da4eec77bdc69ed36723af SHA512 36ac799799deba2250d21a576a4387d2f4491afeae5dcaf5316d62008196a7ec80b4cc0d1745b67bc845c47172b1affb0f24405fd39edd12abf94c070ef32946
+EBUILD wxmaxima-21.01.0.ebuild 1896 BLAKE2B 5f1defc0d4e009b83ed05b436d58ac434c0d85733c4e51a17e54ebf62c4eeb7fe33b74acb9a650ece08587b0e7fbb4742043b3f0b130d8fcf72d7fe600947e39 SHA512 747541798d41f07190e841518563e648de0e379d6f8485dd03b62b22407cbd090e24bdaf4c7e8d094e07ec00e82b440ce60129f4eaccca3fe7bf1f15559fc966
+EBUILD wxmaxima-21.04.0.ebuild 1896 BLAKE2B 5f1defc0d4e009b83ed05b436d58ac434c0d85733c4e51a17e54ebf62c4eeb7fe33b74acb9a650ece08587b0e7fbb4742043b3f0b130d8fcf72d7fe600947e39 SHA512 747541798d41f07190e841518563e648de0e379d6f8485dd03b62b22407cbd090e24bdaf4c7e8d094e07ec00e82b440ce60129f4eaccca3fe7bf1f15559fc966
+MISC metadata.xml 723 BLAKE2B ab9996b65f11ba1e2a463a837e93de7520b8bc71bf691f3d01a9586d94f27273d41c9114912d5c551fc41329b1f2bce92fd433d620caadbba2bbe947e8532660 SHA512 277b301079c31fb3c5d8daddd6d53baab62eeea4ea66b6492aeb8bbea9f8cc15394b56e32e91e40899aa8637ee74da3b35c231ef117ac8c31a5880f87a096c05
diff --git a/sci-mathematics/wxmaxima/metadata.xml b/sci-mathematics/wxmaxima/metadata.xml
index de974d73bcb2..f18f25f2a4a2 100644
--- a/sci-mathematics/wxmaxima/metadata.xml
+++ b/sci-mathematics/wxmaxima/metadata.xml
@@ -13,6 +13,6 @@ completion based on previous input (tab-key).
 wxMaxima provides 2d formated display of maxima output.
 </longdescription>
   <upstream>
-    <remote-id type="github">andrejv/wxmaxima</remote-id>
+    <remote-id type="github">wxMaxima-developers/wxmaxima</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/wxmaxima/wxmaxima-18.11.4.ebuild b/sci-mathematics/wxmaxima/wxmaxima-18.11.4.ebuild
deleted file mode 100644
index 786a11df35cd..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-18.11.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="ca cs da de el es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="http://wxmaxima-developers.github.io/wxmaxima/"
-SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-S="${WORKDIR}"/${PN}-Version-${PV}
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	setup-wxwidgets
-	cmake-utils_src_prepare
-
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
-		|| die "sed info/CMakeLists.txt failed"
-
-	# locales
-	rm_po() {
-		rm "${S}"/locales/${1}.po || die "rm ${1}.po failed"
-	}
-	l10n_find_plocales_changes "${S}"/locales '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
index a76a6aeeb045..cddb6c554f07 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 S="${WORKDIR}"/${PN}-Version-${PV}
 
diff --git a/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild
index a76a6aeeb045..86038f4610e9 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 WX_GTK_VER="3.0-gtk3"
 PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
 inherit cmake wxwidgets l10n xdg
@@ -9,12 +10,13 @@ inherit cmake wxwidgets l10n xdg
 DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
 HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
 SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-Version-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-S="${WORKDIR}"/${PN}-Version-${PV}
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libxml2:2
@@ -45,6 +47,32 @@ src_prepare() {
 	l10n_for_each_disabled_locale_do rm_po
 }
 
+src_configure() {
+	local mycmakeargs=(
+		-DWXM_UNIT_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Just run the unit tests manually for now as tests fail in a non-descriptive
+	# way even with virtualx
+	# bug #736695
+	cd "${BUILD_DIR}/test/unit_tests" || die
+
+	local tests=(
+		AFontSize
+		CellPtr
+		ImgCell
+	)
+
+	local test
+	for test in "${tests[@]}" ; do
+		./test_${test} || die "Unit test ${test} failed!"
+	done
+}
+
 src_install() {
 	docompress -x /usr/share/doc/${PF}
 	cmake_src_install
diff --git a/sci-mathematics/wxmaxima/wxmaxima-21.04.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-21.04.0.ebuild
new file mode 100644
index 000000000000..86038f4610e9
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-21.04.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
+inherit cmake wxwidgets l10n xdg
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
+SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-Version-${PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libxml2:2
+	x11-libs/wxGTK:${WX_GTK_VER}"
+RDEPEND="${DEPEND}
+	media-fonts/jsmath
+	sci-visualization/gnuplot[wxwidgets]
+	sci-mathematics/maxima"
+
+src_prepare() {
+	setup-wxwidgets
+	cmake_src_prepare
+
+	sed -e "s|GPL.txt ||g" -e "s|share/doc/${PN}|share/doc/${PF}|g" -i CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i info/CMakeLists.txt \
+		|| die "sed info/CMakeLists.txt failed"
+
+	# locales
+	rm_po() {
+		rm locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
+		rm -f locales/manual/${1}.po
+		rm -f info/${PN}.${1}.md
+		rm -f info/${PN}.${1}.html
+		sed -e "\\|/${1}/wxmaxima.1|d" -i data/CMakeLists.txt
+	}
+	l10n_find_plocales_changes locales/wxMaxima '' '.po'
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWXM_UNIT_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Just run the unit tests manually for now as tests fail in a non-descriptive
+	# way even with virtualx
+	# bug #736695
+	cd "${BUILD_DIR}/test/unit_tests" || die
+
+	local tests=(
+		AFontSize
+		CellPtr
+		ImgCell
+	)
+
+	local test
+	for test in "${tests[@]}" ; do
+		./test_${test} || die "Unit test ${test} failed!"
+	done
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}
+	cmake_src_install
+}
diff --git a/sci-mathematics/yafu/Manifest b/sci-mathematics/yafu/Manifest
index afa1d42ce235..b8a3b6a1349e 100644
--- a/sci-mathematics/yafu/Manifest
+++ b/sci-mathematics/yafu/Manifest
@@ -1,5 +1,4 @@
 AUX yafu-1.34.3-Makefile.patch 211 BLAKE2B 787be431c83a03f4db65c4117f6b75b8f510dee9fcf93b8bcf20a7dcdf4393068da16720914e9dba6a098df7698a5101567b01b7f2addc1d3032ac9204a718d0 SHA512 ee88e14d5d7bc61f1666712ca96800f9f2715e3634e69edb4e8d4aceb4cc364f72fdffa7117970204574100cf3481f458dea2b5effa6b025cd26fb5c77a45d42
 DIST yafu-1.34-src.zip 686655 BLAKE2B 6c5ccb587aeacf4c72c7969d409846ad768f2f7ec1c7c100372617ce75c00a6d61a0a00691f6ebce4de1250e00cb4abe4abeee5278d2aab19d0d8861c8bd1916 SHA512 f8afba77e0286c579b4152517ba3a0b6b85d43606e4fafc653dc06b7f7c2aba0f8f3c65b38f3496657495bff476dd4cc8e06daaad8a7a78a36fc6e1c0cf046a4
-EBUILD yafu-1.34.3.ebuild 1351 BLAKE2B 418e096f5aa6902002b8c19c0fd0b6f8cb99311f31166c5fce27ca0fb649e1a3bda1a39fec8ccdf40917b67728db9df36b8b28c94f5c093309c737064eabf17a SHA512 0add41a99b3997be09f466d9d72ebb8580f03e320d850cbc802c26f4d08b312b81103304c284b46d7e6c9bd7d761a863c48f9edbfd7d0f42cf64131483e13f31
-EBUILD yafu-9999.ebuild 1759 BLAKE2B a37f1b0865e27fb72e2770637d9a971edfb1033bfa6db2cf7dacea96509a586975d7168f27f5d290d17a84cbf61e90cfbb421e27ef1afc2a5bf4e484ecd9a279 SHA512 024bb3283f5f22328580d3d83360e8bdf783bea00e53a83459b1dcef2a9142c86a9a2d21e061fe68817e2548735931568ec0fb73ccba3a197cd3933bb6d55c55
-MISC metadata.xml 404 BLAKE2B a4bacb954724b1e7513cde006d06180f16ca94c64d7fbb33fc837d4be3b468e183f0952ad50b84d04630ce319d82f35f23c7e313b5f76b790527a24477ae58cb SHA512 56722324cd3a892578f194fc2a4dc0e59e0cdd4ee516ff6aaeebd87450942163224e00b594ec034ae1d399a642510ed8d5281ccef42665c8ac95880bd78419aa
+EBUILD yafu-1.34.3-r1.ebuild 1249 BLAKE2B 67b4b85adcf4f7209f55e90e054bf019b8268280598f7a1434f1bc44ebe70cb776f870e510e7c875d52b3b41de3bd252b6975535a91f956919f67014d6c52ad8 SHA512 acadd85a8e5c255aab171043c4fc5072dfae1d836d28b7e1f2d4ddb5fc2cc1963b4c3ff912e90dbef228859efd85dc8b88bdfe38600fc2b9fd54af97e73bad11
+MISC metadata.xml 321 BLAKE2B a198ce4210cbb59177aeef1e04575105f7117d292fb84fbc8ed0749043b9ce7cf429a02de9af2283b4689fca16337c88966d3ad52b8cd7fcf3b2c8ca82872652 SHA512 d59beca59e217b2192b449adb9be13f2bf301526ddc16abbdd08b248abb03f085aca725e21465f4e1aec65cce0f6cbea53ecafedfb5f87d66c8f9f74cf590e9e
diff --git a/sci-mathematics/yafu/metadata.xml b/sci-mathematics/yafu/metadata.xml
index f07f2757aeb5..056ae1719a6e 100644
--- a/sci-mathematics/yafu/metadata.xml
+++ b/sci-mathematics/yafu/metadata.xml
@@ -5,9 +5,6 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
-	<use>
-		<flag name="sieve">Use msieve for the sieving steps of NFS</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">yafu</remote-id>
 	</upstream>
diff --git a/sci-mathematics/yafu/yafu-1.34.3.ebuild b/sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
index e48b2e4b2059..24b5c5e29c94 100644
--- a/sci-mathematics/yafu/yafu-1.34.3.ebuild
+++ b/sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
@@ -13,15 +13,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PV}/${PN}-${MY_PV}-src.zip"
 SLOT="0"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="+sieve"
 
 DEPEND="
 	dev-libs/gmp:0=
-	sci-mathematics/gmp-ecm
-	sieve? (
-		sci-mathematics/ggnfs
-		sci-mathematics/msieve
-	)"
+	sci-mathematics/gmp-ecm"
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"
 
@@ -48,7 +43,6 @@ src_configure() {
 
 src_compile() {
 	local VAR
-	use sieve && VAR="NFS=1"
 	use amd64 && emake $VAR x86_64
 	use x86 && emake $VAR x86
 }
diff --git a/sci-mathematics/yafu/yafu-9999.ebuild b/sci-mathematics/yafu/yafu-9999.ebuild
deleted file mode 100644
index 3f727cf66ae4..000000000000
--- a/sci-mathematics/yafu/yafu-9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils subversion versionator
-
-DESCRIPTION="Yet another factoring utility"
-HOMEPAGE="https://sourceforge.net/projects/yafu/"
-#SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-ESVN_REPO_URI="https://svn.code.sf.net/p/yafu/code/"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS=""
-# nfs is overloaded, so using less confusing sieve here
-IUSE="+sieve"
-
-DEPEND="
-	dev-libs/gmp:0=
-	sci-mathematics/gmp-ecm
-	sieve? (
-		sci-mathematics/msieve
-		sci-mathematics/ggnfs )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd trunk
-	# This is not nice. But then the Makefile is quite special :)
-	sed -i -e 's:../gmp/include:gmp:' Makefile 		|| die "Failed to rectify things"
-	sed -i -e 's:../gmp-ecm/include:gmp-ecm:' Makefile 	|| die "Failed to rectify things"
-	sed -i -e 's:LIBS += -L../:# LIBS += -L../:g' Makefile	|| die "Failed to rectify things"
-	sed -i -e 's:\"config.h\":<gmp-ecm/config.h>:g' top/driver.c	|| die "Failed to rectify things"
-	sed -i -e 's:# LIBS += -L../msieve/lib/linux/x86_64:LIBS += -lmsieve -lz -ldl:' Makefile	|| die "Failed to rectify things"
-	sed -i -e 's:CFLAGS = -g:#CFLAGS = -g:' Makefile	|| die "Failed to rectify things"
-	sed -i -e '/$(LIBS)$/s:$(CC):$(CC) $(LDFLAGS):g' Makefile || die
-
-	# proper ggnfs default path
-	sed -i -e 's~strcpy(fobj->nfs_obj.ggnfs_dir,"./");~strcpy(fobj->nfs_obj.ggnfs_dir,"/usr/bin/");~' factor/factor_common.c || die "Failed to rectify things"
-}
-
-src_compile() {
-	local VAR=""
-	cd trunk
-	# hmm, not that useful:
-	#VAR="TIMING=1 "
-	use sieve && VAR+="NFS=1"
-	use amd64 && emake $VAR x86_64
-	use x86 && emake $VAR x86
-}
-
-src_install() {
-	dobin "${S}/yafu"
-	dodoc docfile.txt README yafu.ini
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /sci-mathematics
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)