gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sci-mathematics
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
66 files changed, 1408 insertions, 809 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 096b8c7c3484..0eff5dc5b928 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index 7a077701efca..4d4f8cf75741 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,5 +1,5 @@
 DIST alt-ergo-1.30.tar.gz 380329 BLAKE2B fab16757ed110474cf8f9d01ab53f76b6a300eb478b32bbfd6bb79d7603b1f5c2fc5c97bf44358eb138283f3487ef90febd23865723a4721b01bd870cfdd6507 SHA512 6ac6abdc6602b0ba89ee58eb96c66ac93e8195e0b4f75595381eded86365c2dd881251de2b77e2f1137684651ddc7fd94f922509de0be2964d81f52a6fb0f2f2
 DIST alt-ergo-2.3.0.tar.gz 455577 BLAKE2B 1836782be452df5147fc3041517fd267f3ce7facd15ad460c3e1dfba2b6ea455fee79ad8264ccb12cf21622c21a54c186c9943e7bffb392daab15d046ff93863 SHA512 a2f209b62b8494bfefe84328cdc786185e0534c5e224e212b83045b078352a51d2ab02622f72c22c74c7de95c7a554cbdae2a9a8a0c41f3f26c841f8c72f6b21
 EBUILD alt-ergo-1.30.ebuild 705 BLAKE2B 2ed4bdb55ba084ae8364cf49200a61b9b4c64941817acc1a448ebb5124eaaac264c8d895e5d98e4093fca05a9b7d6db638cf89a808d95af313c49a79cc94f9b9 SHA512 aa1f48cb7fb8d99d7745d77edbc9f69f9f591029c354018243d309f6d27be7e595758ae2f46a7854e82b456afc5405205e31d5f84e974949ad6e9248dc48cd39
-EBUILD alt-ergo-2.3.0.ebuild 964 BLAKE2B 566591a7a26d48129db3e8164bd51afc709831883e98f151b9eb3704a8fa45bc3a4f09bc74547e06895c32a17656ba0e46786ab7cbca0773aa6b9a515a34e635 SHA512 ebff4f5d4ec8eeab2de27402352d881d9918a366ed375f648fa12ad3a77a169c5f62685c600b8f8fd1dbfcfb27bb5b00c50cdf32bb67e41fa80d3c7e03241f42
+EBUILD alt-ergo-2.3.0.ebuild 1063 BLAKE2B 3b26629956a8fe184db67b97c459fe76d1fe56b7085b6f35195a33196a1ded1dc4a82733487af2204c6348f07d80f82786771e4ef236fa5b56fce8fabb64f9b2 SHA512 7f987de9aa54c46d32476d6548d239f823d413e5755fc499b6ac36a52da15792eb69ab6887c4fd3d4b228d2bfe37a7097978c851c44d1bd0e761eb24af9598e2
 MISC metadata.xml 670 BLAKE2B 5f03c359cb298cc9a0fea6ef3a5deb092e5ccca7acfb2b7a5630303659bfd853fe86277ebbfb1fb7b6677d45dde2d5c68d55fffa8d3d8187acac3765f52df7c9 SHA512 9e514e4da2b92aa1e8e8e084450f478b51947172b689664dfe6c0fe0eb139e278e13689c8ba53825cb3bc32140cfd4cd7a68fede0d013cd065d5339d34931e8d
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
index 6dc8404508d2..2f9029c56d08 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="examples gtk +ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-3.12.1[ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt?]
 	dev-ml/zarith
 	gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] )
 	dev-ml/camlzip
@@ -25,6 +25,11 @@ RDEPEND="${DEPEND}"
 
 DOCS=( CHANGES INSTALL.md README.md )
 
+src_prepare() {
+	default
+	find "${S}" -name \*.ml | xargs sed -i "s:Pervasives:Stdlib:g" || die
+}
+
 src_configure() {
 	./configure --prefix /usr --libdir=/usr/$(get_libdir)
 }
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index be7036c253bc..2634c88d00c1 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -1,8 +1,3 @@
-AUX arb-2.11.1-pie-ftbs.patch 585 BLAKE2B cf7fd0230dd00a52452b1ad80f284028eab6c35c8aeb160e3f74b924a7c6e422a0740a3954eb2937b5b13085e47a25abc6c8f9dede88bd5f90cac5570c6b2710 SHA512 f147d61a6c9dfac57ded28a7265db9e6be76ebb8c9c787960d4dafc36ef703cebc42ba4a3ca8ef03ae3b81589d6a6a555a7ff381ddc9fd391466156677e0b4ff
-DIST arb-2.11.1.tar.gz 1248835 BLAKE2B 8ba11f3a92103231c4710c0158ce0811b2a01872e1ec7b7a4a4320d27ab86688aa8733df6dd2464aa55c0a506a8a595e4c370848c78b5c3a650e647f0c6d7411 SHA512 7a014da5208b55f20c7a3cd3eb51070b09ae107b04cbbd6329925780c2ab4d7c38e1fb3619f21456fa806939818370fcae921f59eb013661b6bdd3d0971e3353
-DIST arb-2.16.0.tar.gz 1526059 BLAKE2B 14f4a9b23fa6fc46659b742cc95b4970cee74cf52bda8bc696831b0a5c1f946f41f1c2bba180ad1199c55d741366b3376aeed0efbf6ee087b26f6de788519739 SHA512 171c965aeb03cd2830df8a53990403c6da480a94d44385dadfbb2d02697f7c03e8b9a217094b0ad93f796d889a1564f4b9ae9db35ef9de90f61bb2e3220911be
 DIST arb-2.17.0.tar.gz 1589083 BLAKE2B 68d5b04dca24129ceaec4e05124e35b474157cf1efbb6505121a03058e014cd4eb67b99497dbbafcf62e9e31f9d11c92f749f6e047e6b1513b6c0cc5ef8f22da SHA512 201e0cebbd1c4857d194e5531c76c6e45a478cf6965b836818919adf0fc04f0fe25e16ecd49c62a438876b67f009b872c4f3c774fe35620be0b22c5e08bdb824
-EBUILD arb-2.11.1-r1.ebuild 1588 BLAKE2B 67ceb6433a725ff35ae1e18888be5eedec7f688ee2f7d4c58c170dd8a0da8607aa23741b31745e2ea0305a1160aa32e737a32ef669e16bdbf292c9aa26a5fa4b SHA512 8a61ceafa57adce89ef012f87d24795528a960fbb2bb6ad8d630a2d89df95f42c3e1cc1bde094bf8e57625204c6fadebbc61f4212f7c90f3131653e13edd4306
-EBUILD arb-2.16.0.ebuild 1541 BLAKE2B 304351aa3d08e117e26bdc304771495ed9fe918dd2d5a6da39f67745e73498c19490f681031abf1a62bd477c4f1e6f8abe582257c796d6801717f1c60b9e5c72 SHA512 6c8c1cf422d7916d731f189b7a826c3b79243f153b0dc01a050266e03e09f9e6707526fc03c01647951f4ce6b0ad94378592fca775d3d107b5b960ff7bd7b8c2
-EBUILD arb-2.17.0.ebuild 2037 BLAKE2B befcf948caa3df8f541f2800d1e28162911203e5f62e104ffae6a0109d981bab9ed7370c743fabfda7dc0ee2ecf998781dc6ac7eaf69b01c73c9049b69c9cfd6 SHA512 83f7c827d5d05a8b402ccfd0183650585428561cc61ca0858107a56e7252b3df3b031e89a049df2ea10abbbd63ee62ad0ef7d5c72bb4a57b17d3f64c21532948
+EBUILD arb-2.17.0.ebuild 2035 BLAKE2B 1866ef62a25faaa1dbfe24423c0cc135b61c7297c18d8ac38aa58f30f26a692cf32e1bd63153dfda66f3be27b39eb1186c684b86d7b9e9ca4d8d1c20be03c764 SHA512 a364ab870eda7e5cdedad53d80be7ad80cfeaeea93935b3637bba6d81fb59bd55c2960a3e605a0d58bb8a7e262357ab8825a60acf1bd8c1a56536431a74c5a7c
 MISC metadata.xml 1077 BLAKE2B d21ef7ffc1b41b7b52d7d8caf246b0109be10d06b7bb4d660c9ae0f750d748cac37cd289df3282cbca9f2658e8fb5f6674c170ea6bfd511edb71a3f0da88bc86 SHA512 cc6a2aed7acd718af2aa1612b1b454a2e699da97a33cb9ba9ca747e3782d9439bb0ff96c25e9023776777a5ee20d2c208c7f98dc73c787a16bfca58e9a10e1ee
diff --git a/sci-mathematics/arb/arb-2.11.1-r1.ebuild b/sci-mathematics/arb/arb-2.11.1-r1.ebuild
deleted file mode 100644
index f27adcd77127..000000000000
--- a/sci-mathematics/arb/arb-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune toolchain-funcs
-
-DESCRIPTION="C library for arbitrary-precision interval arithmetic"
-HOMEPAGE="http://fredrikj.net/arb/"
-SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	>=sci-mathematics/flint-2.5.0:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-pie-ftbs.patch )
-
-src_configure() {
-	# Not an autoconf configure script.
-	# Note that it appears to have been cloned from the flint configure script
-	# and that not all the options offered are valid.
-	tc-export CC AR CXX
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--with-flint="${EPREFIX}/usr" \
-		--with-gmp="${EPREFIX}/usr" \
-		--with-mpfr="${EPREFIX}/usr" \
-		$(use_enable static-libs static) \
-		CFLAGS="${CPPFLAGS} ${CFLAGS}" || die
-}
-
-src_compile() {
-	emake verbose
-}
-
-src_test() {
-	# Have to set the library path otherwise a previous install of libarb may be loaded.
-	# This is in part a consequence of setting the soname/installnae I think.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}" emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-	else
-		LD_LIBRARY_PATH="${S}" emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-	use static-libs || prune_libtool_files --all
-	dodoc README.md
-}
diff --git a/sci-mathematics/arb/arb-2.16.0.ebuild b/sci-mathematics/arb/arb-2.16.0.ebuild
deleted file mode 100644
index 8a9abe3d5c7d..000000000000
--- a/sci-mathematics/arb/arb-2.16.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune toolchain-funcs
-
-DESCRIPTION="C library for arbitrary-precision interval arithmetic"
-HOMEPAGE="http://fredrikj.net/arb/"
-SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	>=sci-mathematics/flint-2.5.0:=
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# Not an autoconf configure script.
-	# Note that it appears to have been cloned from the flint configure script
-	# and that not all the options offered are valid.
-	tc-export CC AR CXX
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--with-flint="${EPREFIX}/usr" \
-		--with-gmp="${EPREFIX}/usr" \
-		--with-mpfr="${EPREFIX}/usr" \
-		$(use_enable static-libs static) \
-		CFLAGS="${CPPFLAGS} ${CFLAGS}" || die
-}
-
-src_compile() {
-	emake verbose
-}
-
-src_test() {
-	# Have to set the library path otherwise a previous install of libarb may be loaded.
-	# This is in part a consequence of setting the soname/installnae I think.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}" emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-	else
-		LD_LIBRARY_PATH="${S}" emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-	use static-libs || prune_libtool_files --all
-	dodoc README.md
-}
diff --git a/sci-mathematics/arb/arb-2.17.0.ebuild b/sci-mathematics/arb/arb-2.17.0.ebuild
index 5b8842f7b898..3634a0b0bd72 100644
--- a/sci-mathematics/arb/arb-2.17.0.ebuild
+++ b/sci-mathematics/arb/arb-2.17.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch b/sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch
deleted file mode 100644
index b2db6b2a294c..000000000000
--- a/sci-mathematics/arb/files/arb-2.11.1-pie-ftbs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Use -r instead of -Wl,-r to fix FTBFS with PIE enabled
-Author: Logan Rosen
-Forwarded: yes
-
-diff --git a/Makefile.subdirs b/Makefile.subdirs
-index 3dc757d..f0ec923 100644
---- a/Makefile.subdirs
-+++ b/Makefile.subdirs
-@@ -52,7 +52,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
- 	$(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
- 
- $(MOD_LOBJ): $(LOBJS)
--	$(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+	$(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
- 
- -include $(LOBJS:.lo=.d)
- 
diff --git a/sci-mathematics/cliquer/Manifest b/sci-mathematics/cliquer/Manifest
index 3d395e17cb54..f8e7e75ebcb1 100644
--- a/sci-mathematics/cliquer/Manifest
+++ b/sci-mathematics/cliquer/Manifest
@@ -1,3 +1,3 @@
 DIST cliquer-1.21.tar.gz 412440 BLAKE2B 0a4f31f6b005822271c67ab2f2532809b112a5ceb7aaf828b06bf6ca4cadfb836d3c1f6b70187908104c2eefedeececad6b020cde2d198141dc69801d5b1ce81 SHA512 2f72a649cfef46ef07cc3817a704fbfcda910b0b0a419deb361b2aa18437e4689a8b965e0e364a5d9ae391ba8591e022a0dc414b21c9102094ad28fb2f1b15a8
-EBUILD cliquer-1.21.ebuild 786 BLAKE2B 4a6d38c8109acad18e16b483ec90f3c25a249849a4577918639fdccd5ffedd9ac82a1a5b6d0caa1bacdbea035e1140532ad0a9e80658f9828605c9e3fbdff301 SHA512 8c22ac759160b1fe2b009965b177207d36178f7a53e6551d508308df899306458baa74f17770de3a0f13e4a4d51f3a3cce7cc7dac02851318f302a4a785b19fd
+EBUILD cliquer-1.21.ebuild 784 BLAKE2B 5d822c6f11114d9fd0254af5cd1552c0149d78b506eb75ca61f34506f7af24ef51ab593fdee61db0a8562170c638ba6b61bfdbb014d0708e99c64ebaa43390f5 SHA512 eaa0766c99060fdb7662eff8cab91a09b7a4a9f7a09c8ff8b609f184cd762a4feed18431fd817273feb2aa2704488d1c176b0b1314ac8d944531afaf333d9262
 MISC metadata.xml 739 BLAKE2B c6fa693dfa35996f2bb14d5a466538770264b47830afb59b09b8e0a5b99818e5532ffd6b893b6ed906922fd24ff9abf2511cc849ed01dd5d39d0830b5f289b22 SHA512 a9414bab8c1b6c8858c0de265fd864deb31fef36294a5ebcda07fdaf54eabb1dd0694286215ac48f7f1d36a2682bfdf9fb2d0bcc7fecc5126c815c7281bc731f
diff --git a/sci-mathematics/cliquer/cliquer-1.21.ebuild b/sci-mathematics/cliquer/cliquer-1.21.ebuild
index 0eb04b7ff17b..f08e11fbb5b9 100644
--- a/sci-mathematics/cliquer/cliquer-1.21.ebuild
+++ b/sci-mathematics/cliquer/cliquer-1.21.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
index be8a4670ea66..4e1d31f4f292 100644
--- a/sci-mathematics/eclib/Manifest
+++ b/sci-mathematics/eclib/Manifest
@@ -1,3 +1,3 @@
 DIST eclib-20190909.tar.bz2 914900 BLAKE2B df57972792f96e65b25db5a2ab1063d5a8f1ad05edbed77d9ca2632ddfb4af2cb8586e572155beec09cc0c03472300d1e6fcbdda3527c36e9106006239f50600 SHA512 df829b10c353f528f2040b55d6198e3a48eba179b9a80e71794e4c6d46ee9bb13b3eccec15c7d286ec5d8252e6ba91157c2a08ac4e2da86969a4158450a41960
-EBUILD eclib-20190909.ebuild 1033 BLAKE2B 55a63fbbc16c5ac382622cb519444ae71a37478e525be161869fc783e4d0baf08fa606b9f6ee44a324a0c9107e8b84eea8a8bd737ef8a7f667799e56d40b368d SHA512 561cc44e21af4149172f45967675f49b7584b3d68667095807f36993c67a35b4a833b604f527648c15a412589ec4c60b4fb6ce2abf203c57574827432eded247
+EBUILD eclib-20190909.ebuild 1031 BLAKE2B a2dc95b4e5497f703e1e059dc6cfae3f1b2bf24a688adf23b57681645ad83fdee51e2541ba7b2827a8d95bd22a432f47ddb32a4a8f3580acdf2e0cb8d6d2da9d SHA512 1b3c526c58f1ae7055757c8a632e6e085af4ca23752ffe7f2be18e28259dcb437f42e4c0658dd793dc9afb7c637f960913f128f8774e9c0c89511102353ce19f
 MISC metadata.xml 1058 BLAKE2B f78114f517aa1b21ee6bc36104f1e929b319d77c2a9373c41cfcea4a90d89ff9e0a0d512f4056b6d1c611a3dfe2f64b65117f8e3ba09dd4c3e535eab0cb76f3b SHA512 692e570681c68cd0a2285b616a792e91e341993fceac875f3e35911f04d1933b2e696c9d54d9f90c3a2f459c8365291e03c0a52c1cbf0491a3c303f9e1ba6d41
diff --git a/sci-mathematics/eclib/eclib-20190909.ebuild b/sci-mathematics/eclib/eclib-20190909.ebuild
index 508a1ef0996d..ffffddd7a61d 100644
--- a/sci-mathematics/eclib/eclib-20190909.ebuild
+++ b/sci-mathematics/eclib/eclib-20190909.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="boost flint minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 0190da47d9fa..cb817ee0e2a0 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,19 +1,7 @@
-AUX flint-2.4.3-cflags-ldflags.patch 1879 BLAKE2B d4a076d75a5e612b13fffe1ca64fddf9da7c1cb22049039d8adffe7ca9da27fdaac1255125412d7d16c624d3a05fc6275fd211e289e815225910cb605abb01bf SHA512 05fe22492d8e96eeabd30c5b28f8743354e8bf4e593eaf58d8be6bb47341a1c7148c13de681a5983fdae32cc246259ab69cff8b390002c0836ac2ae7d0a9b87e
-AUX flint-2.4.3-libdir.patch 1215 BLAKE2B bd69e1eefd0a4db311d610a4566c458c251ebfe31a34e32019beb475cebcd63352c381347ac65f37bb38f6fb8938e9912e4e2d7cec413f90414c618c27c0021a SHA512 92beca631043d9bf40f8174462a213e56963736b3b3926540cbd010938e57fd8eb3565185e1941d969700566e106adbd006396b65ba9877dbcf6c630287a7ac7
-AUX flint-2.4.3-whitespaces.patch 1929 BLAKE2B f4c7999526dc44621e3979e261cbe1aaf8f1e26fe19f94db63af7e107e12f8b64597f39c95bdfa0a985ce930e26f059a7cd53cc447a8e7071ba903ad8c831309 SHA512 4bfa3bf3d7393ab577988b4def04fb2fe4107679a8f3eb2db7fd2c900d6ba0b79e685f5357d5d99633ea6eb8e4c7c38530f69f35fcfa250d6751e3d1f41a025f
-AUX flint-2.4.4-PIE-FTBFS.patch 615 BLAKE2B ae78b613c652624f7a994074233b71c8cb69dc543359424f37665d78e10bc3d876ec64f031b1d3185bea2080170487e0a2e1815be023a9cd6c4a9b315419e081 SHA512 80b5c7f68a6a31d2e8a8e5182f6eb975bfecfeae4fc30a039d0dd047d7c0351207980d0688de523789d876f098b111c9ab8f26b97bf95cd57a1c2f95ed6e46b1
-AUX flint-2.4.4-test.patch 709 BLAKE2B fab049ce8f75a4632a9a20d6ee0892f5e3b8f7ed65bd8bb1fb887569a86a1474ccc903b815dfdf203b426b74a519234cdb1a3851b1ba7698f4abe54fd12abb0b SHA512 46f66ef5104b535c0004b63cac30bd0dcd66ff554502387597d0ab5f8d7a8189431872510c0666ad99dd7c15ec7756a87b670ef162ad6b085150c6eee7a7a376
-AUX flint-2.4.5-gmp6-compat.patch 3495 BLAKE2B 69ac50eb94ee9d01d6c396024c08f2f7e6c2e3674c04712a63f18d2b8c9c830a903a27f88dfbb8c44841442a42feafd8272718f1654be2b1d9a495045a3b8e12 SHA512 e7caf37d900380eacb5bea67be1d2e78a1468b92dd21c052d8d5b5d362782425b52107cc97dc68ef73e0da494071f01e980e6b1fafed5bfc8a090f8b9e7e5c3b
-AUX flint-2.4.5-ntl62.patch 454 BLAKE2B cec67356f4b94431d11e3e81f9f37259ddf92a2a77678a604879475f3c8251d70ad5d7edf184ca1f0b01f19239b9b26670dae4e5f346353796855b6b82c07d6e SHA512 c19092d0dd4060469e383aa0844cff40ab55d9f4dda77edf5f8dc7f1a8ad833541cdf92d196fc6b21ad43fadcba6d70d0ace4574e1c6828d2c25d9f74094fbb0
 AUX flint-2.5.2-memory_message.patch 504 BLAKE2B ff8ddc685c973f75a133f36eb1284d833dfc35bf42c19c87a55c8b7816c77ed180b1438d782a7cde45025e11f6f30c4105465f2b80507cb42b6bb7d67fd0bc87 SHA512 86c99da2278530caccc3b4e7be06d014664c8f11438cb5dad32b68b91a5997e23366be6433d576ca9515cba5f46227939a1e4131199383ff7d00afe10e3b9d55
 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 flintxx-include.patch 507 BLAKE2B 250e54de1ab5b70cffdac7348b78db543cbdb366efa419dea62ffed2b0b5f95b787019e96fb95b9253b5289d58a2322b41f660f1719516e410e4245b09accb7b SHA512 144dc23d8706e22c6ac5d50bc2ce6c9e2eb8016155bec48a809bceec435d07781105c073b669302132963f063ab1c311e7381f78cc29a0141ca78eceb25aa0dc
-DIST flint-2.4.4.tar.gz 1639262 BLAKE2B 54162a4d2f02c3e8e441b6a96c1e7ba4e5e8d8ad7b2d36bb7ead49bb112cd94403cb503d1e56621a0a6fedad6387e63dc39888ff3757e298aea55bf55acc4e20 SHA512 236997cf64bdc96741740889f450fdbaf7d7e9b58252645f864d28005c9e7bdf87f7187cd17526606c605f0489f026398a1361b8f209f71158ca3b31c42d86d2
-DIST flint-2.4.5.tar.gz 1640022 BLAKE2B 1267d81bb0270556614ebc8bff65287e0b3738ba0f3245f066ee7ea6971ab4d9082beb2c0a336dcd5b9c1517261aaf55c0bee519c6f71984834a7920002ad95c SHA512 088ff512ea2330f9323a6ca0dc875e8c0926d755317d6007eba4b333a14d7612e82ebcfeabd26d1ec4b9204c4517dee08f914ad1ec852e37336fe378710a8bfc
 DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
-EBUILD flint-2.4.4-r1.ebuild 1556 BLAKE2B df9874dd99c5a624e59d3cfe31e7b76cbcb9186d46cd54374f26b698cf303dbfc887af151bc1ddab8aabc799a560d1325d43a20657dc7039da6f92580ba7984c SHA512 2e32029930d81a5f2e7e23b589a1ff4cb07b06cbddc350d588a50159cef5cbc4b3c05bb1fbf16752313cc98443106d4b0ff3d794bf543100f522ff1f3d71937b
-EBUILD flint-2.4.5.ebuild 1644 BLAKE2B 041ab4f00f44bdd24cbba2d7e41f6ce8a3c3066dfdb2a5af3704c935400ee8d0368b08c1a0034ac80ff580ad08f3d9b6e7e7167893a0a9f93c92933365fe64e4 SHA512 8a2b4c422b2cb28f4dd89fb035a85cc3fbfe725b069f934de2a51a1e114929f80670d047a5c4acca7e585d0f51ba9b6d90f3f38c12bcc8daa557fbf9baa68ca6
-EBUILD flint-2.5.2-r1.ebuild 1712 BLAKE2B 5958681f6035d6ef083c2479cd06ccc9fea58fc4470cc8d9298857379630af4d29589ce0b2f41f08fb512b50267ef37529169287e61489765ddc57794677ebee SHA512 65d3890260fa76fba84e6911923dbbc2907c4b2b13862a7db730812fca1f90e7b31aff724d814c59c60ddf393dc670ec661d1ed2f8dfd4dc3dd3e197e331036c
-EBUILD flint-2.5.2.ebuild 1380 BLAKE2B 2b8e87bfe4d77f3d937a2ed963e894d382694f0bda1b36b3dd8166b994aa0c89f26b921686a9d92702417f7cbdf3d0af17b1e22e48e4e6b859ba4001ef9113b0 SHA512 8faa425010435c1badc4323aad4d2db99c09c79a42103340142bdf442a090857118d74171e11d347a5b844e294d5406f0b1055910312ff53e2594ccadc22a826
+EBUILD flint-2.5.2-r1.ebuild 1714 BLAKE2B e1e6770c375f95ac1bb5d4284ffc205ba4a95d9933799718862ab31a12c87c3da9ed0c46509b808856a3663eef1d4bbd0c7334d9b1f76a192d66e196a2eb1683 SHA512 4ee441362d871807a93a9e9ab8d5a4d261f1c87ae0802525a780855ceb93666f3ca721a0fcbfc7d341522a0c8d81e3b28765ba6a1246a3535881e35e20ec24dd
 MISC metadata.xml 481 BLAKE2B f0d2cbeda37050bec654c0cba3c45b7340f37b29aa570c744d0a882f662481e7d8d777f48b0530fa23090807d9ad0a913733f4d55a3661f82322cfe544b90508 SHA512 63b38afaf08270df42d3a26cca9f5f491562dd89d8e9c43def3849a624d6694343147e47a602d75e44a656a8db1f7cb06885534fe39917cb46f2f895efc8ff16
diff --git a/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch b/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch
deleted file mode 100644
index f0a2ec8531b0..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit afadc8d05674a0e3e2fcf6dfbcf5f3c8f9133119
-Author: hasufell <hasufell@hasufell.de>
-Date:   Sun May 18 19:32:59 2014 +0200
-
-    Respect CFLAGS/CXXFLAGS/LDFLAGS, fixes #66
-    
-    Even in linking command CFLAGS should be respected, no matter
-    if all objects have already been compiled or not. Some flags
-    affect both linking and object compilation and users shouldn't
-    be required to figure them out. This is standard in most build
-    systems anyway.
-    
-    Reorderd the linker line a bit, so it matches common practice,
-    although this doesn't matter technically (except that LDFLAGS
-    must go before libraries we link against).
-
-diff --git a/Makefile.in b/Makefile.in
-index a522ac1..6dda689 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -104,10 +104,10 @@ $(FLINT_LIB): $(LOBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) |
- 	$(AT)$(foreach dir, $(BUILD_DIRS), mkdir -p build/$(dir); BUILD_DIR=../build/$(dir); export BUILD_DIR; MOD_DIR=$(dir); export MOD_DIR; $(MAKE) -f ../Makefile.subdirs -C $(dir) shared || exit $$?;)
- 	$(AT)if [ "$(WANT_NTL)" -eq "1" ]; then \
- 	  $(MAKE) build/interfaces/NTL-interface.lo; \
--	  $(CXX) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) $(LIBS2) -o $(FLINT_LIB); \
-+	  $(CXX) $(CXXFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) -o $(FLINT_LIB) $(LDFLAGS) $(LIBS2); \
- 	fi
- 	$(AT)if [ "$(WANT_NTL)" -ne "1" ]; then \
--	  $(CC) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) $(LIBS2) -o $(FLINT_LIB); \
-+	  $(CC) $(CFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) -o $(FLINT_LIB) $(LDFLAGS) $(LIBS2); \
- 	fi
- 
- libflint.a: $(OBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) | build build/interfaces
diff --git a/sci-mathematics/flint/files/flint-2.4.3-libdir.patch b/sci-mathematics/flint/files/flint-2.4.3-libdir.patch
deleted file mode 100644
index a569be40b8b8..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.3-libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 27eb23c1844029ee64907500bd8aa87097ffcd32 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@hasufell.de>
-Date: Sun, 18 May 2014 18:46:24 +0200
-Subject: [PATCH] Allow to control LIBDIR
-
-Some distributions have lib32/lib64 and need to control
-the destination properly.
----
- Makefile.in | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index c16f838..b6ea4c9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -4,6 +4,8 @@ else
-   $(DLPATH):=$(DLPATH_ADD)
- endif
- 
-+LIBDIR=lib
-+
- QUIET_CC  = @echo '   ' CC  ' ' $@;
- QUIET_CXX = @echo '   ' CXX ' ' $@;
- QUIET_AR  = @echo '   ' AR  ' ' $@;
-@@ -169,13 +171,13 @@ else
- endif
- 
- install: library
--	mkdir -p $(DESTDIR)$(PREFIX)/lib
-+	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
- 	mkdir -p $(DESTDIR)$(PREFIX)/include/flint
- 	$(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \
--		cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/lib; \
-+		cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \
- 	fi
- 	$(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \
--		cp libflint.a $(DESTDIR)$(PREFIX)/lib; \
-+		cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \
- 	fi
- 	cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint
- 	$(AT)if [ ! -z $(EXT_HEADERS) ]; then \
--- 
-1.9.3
-
diff --git a/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch b/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch
deleted file mode 100644
index 3d63aedeab3c..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3506d617ef9dfc5184aa99be05a25e4f73d6c3f6 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@hasufell.de>
-Date: Sun, 18 May 2014 18:47:27 +0200
-Subject: [PATCH] Quote variables that could contain whitespaces
-
-Make does NOT take care of this in this context. It's
-not a variable assignment and installation would fail
-if DESTDIR contains any whitespace.
----
- Makefile.in | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index b6ea4c9..a522ac1 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -171,23 +171,23 @@ else
- endif
- 
- install: library
--	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
--	mkdir -p $(DESTDIR)$(PREFIX)/include/flint
-+	mkdir -p "$(DESTDIR)$(PREFIX)/$(LIBDIR)"
-+	mkdir -p "$(DESTDIR)$(PREFIX)/include/flint"
- 	$(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \
--		cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \
-+		cp $(FLINT_LIB) "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \
- 	fi
- 	$(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \
--		cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \
-+		cp libflint.a "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \
- 	fi
--	cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint
-+	cp $(HEADERS) "$(DESTDIR)$(PREFIX)/include/flint"
- 	$(AT)if [ ! -z $(EXT_HEADERS) ]; then \
--		cp $(EXT_HEADERS) $(DESTDIR)$(PREFIX)/include/flint; \
-+		cp $(EXT_HEADERS) "$(DESTDIR)$(PREFIX)/include/flint"; \
- 	fi
--	mkdir -p $(DESTDIR)$(FLINT_CPIMPORT_DIR)
--	cp qadic/CPimport.txt $(DESTDIR)$(FLINT_CPIMPORT_DIR)
--	mkdir -p $(DESTDIR)$(PREFIX)/include/flint/flintxx
--	cp flintxx/*.h $(DESTDIR)$(PREFIX)/include/flint/flintxx
--	cp *xx.h $(DESTDIR)$(PREFIX)/include/flint
-+	mkdir -p "$(DESTDIR)$(FLINT_CPIMPORT_DIR)"
-+	cp qadic/CPimport.txt "$(DESTDIR)$(FLINT_CPIMPORT_DIR)"
-+	mkdir -p "$(DESTDIR)$(PREFIX)/include/flint/flintxx"
-+	cp flintxx/*.h "$(DESTDIR)$(PREFIX)/include/flint/flintxx"
-+	cp *xx.h "$(DESTDIR)$(PREFIX)/include/flint"
- 
- build:
- 	mkdir -p build
--- 
-1.9.3
-
diff --git a/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch b/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch
deleted file mode 100644
index 5689e3633ee4..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: invoke $(CC) with -r and not -Wl,-r to fix FTBFS with PIE enabled
-Author: Logan Rosen <logan@ubuntu.com>
-Forwarded: yes
-
-diff --git a/Makefile.subdirs b/Makefile.subdirs
-index ec05fb0..f2d8b37 100644
---- a/Makefile.subdirs
-+++ b/Makefile.subdirs
-@@ -59,7 +59,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
- 	$(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
- 
- $(MOD_LOBJ): $(LOBJS)
--	$(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+	$(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
- 
- -include $(LOBJS:.lo=.d)
- 
diff --git a/sci-mathematics/flint/files/flint-2.4.4-test.patch b/sci-mathematics/flint/files/flint-2.4.4-test.patch
deleted file mode 100644
index 11b7cfe21115..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.4-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 5e3d4a0504158f70d227e7cfc03985fe9a646797
-Author: hasufell <hasufell@hasufell.de>
-Date:   Wed Jul 2 12:58:50 2014 +0200
-
-    Fix NTL test build
-
-diff --git a/Makefile.in b/Makefile.in
-index 6dda689..e9de7da 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -214,7 +214,7 @@ build/interfaces/NTL-interface.o: interfaces/NTL-interface.cpp NTL-interface.h
- 	$(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) -c $< -o $@;
- 
- build/interfaces/test/t-NTL-interface$(EXEEXT): interfaces/test/t-NTL-interface.cpp
--	$(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) $< build/interfaces/NTL-interface.o -o $@ $(LIBS);
-+	$(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) $< build/interfaces/NTL-interface.lo -o $@ $(LIBS);
- 
- print-%:
- 	@echo '$*=$($*)'
diff --git a/sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch b/sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch
deleted file mode 100644
index 559cbe51fb28..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From a7f911140e7d0a0125653a40aa2c5fe257bd78f5 Mon Sep 17 00:00:00 2001
-From: Fredrik Johansson <fredrik.johansson@gmail.com>
-Date: Thu, 18 Sep 2014 14:49:05 +0200
-Subject: [PATCH] redefine fmpz_invmod to consider any integer invertible mod 1
- (for gmp 6.0 compatibility)
-
----
- fmpz/doc/fmpz.txt    |  3 ++-
- fmpz/invmod.c        | 11 +++++++++--
- fmpz/test/t-invmod.c | 21 +++++++++++++++++----
- 3 files changed, 28 insertions(+), 7 deletions(-)
-
-diff --git a/fmpz/doc/fmpz.txt b/fmpz/doc/fmpz.txt
-index fb422d8..2ada719 100644
---- a/fmpz/doc/fmpz.txt
-+++ b/fmpz/doc/fmpz.txt
-@@ -899,7 +899,8 @@ int fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
-     Sets $f$ to the inverse of $g$ modulo $h$.  The value of $h$ may 
-     not be $0$ otherwise an exception results.  If the inverse exists 
-     the return value will be non-zero, otherwise the return value will
--    be $0$ and the value of $f$ undefined. 
-+    be $0$ and the value of $f$ undefined. As a special case, we
-+    consider any number invertible modulo $h = \pm 1$, with inverse 0.
- 
- void fmpz_negmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
- 
-diff --git a/fmpz/invmod.c b/fmpz/invmod.c
-index a0cf601..0e20f39 100644
---- a/fmpz/invmod.c
-+++ b/fmpz/invmod.c
-@@ -67,7 +67,11 @@ fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
-             if (c2 < WORD(0))
-                 c2 = -c2;
-             if (c2 == WORD(1))
--                return 0;       /* special case not handled by n_invmod */
-+            {
-+                fmpz_zero(f);
-+                return 1;       /* special case not handled by n_invmod */
-+            }
-+
-             gcd = z_gcdinv(&inv, c1, c2);
- 
-             return (gcd == UWORD(1) ? fmpz_set_si(f, inv), 1 : 0);
-@@ -106,7 +110,10 @@ fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
-             if (c2 < WORD(0))
-                 c2 = -c2;
-             if (c2 == WORD(1))
--                return 0;       /* special case not handled by z_gcd_invert */
-+            {
-+                fmpz_zero(f);
-+                return 1;       /* special case not handled by z_gcd_invert */
-+            }
-             /* reduce g mod h first */
- 
-             r = flint_mpz_fdiv_ui(COEFF_TO_PTR(c1), c2);
-diff --git a/fmpz/test/t-invmod.c b/fmpz/test/t-invmod.c
-index aea236e..8ff1c7f 100644
---- a/fmpz/test/t-invmod.c
-+++ b/fmpz/test/t-invmod.c
-@@ -30,6 +30,19 @@
- #include "ulong_extras.h"
- #include "fmpz.h"
- 
-+/* Use the definiton of GMP versions >= 6.0 */
-+int
-+mpz_invert2(mpz_t a, const mpz_t b, const mpz_t c)
-+{
-+    if (mpz_cmpabs_ui(c, 1) == 0)
-+    {
-+        mpz_set_ui(a, 0);
-+        return 1;
-+    }
-+    else
-+        return mpz_invert(a, b, c);
-+}
-+
- int
- main(void)
- {
-@@ -63,7 +76,7 @@ main(void)
-         fmpz_get_mpz(e, b);
- 
-         r1 = fmpz_invmod(c, a, b);
--        r2 = mpz_invert(f, d, e);
-+        r2 = mpz_invert2(f, d, e);
- 
-         fmpz_get_mpz(g, c);
- 
-@@ -106,7 +119,7 @@ main(void)
-         fmpz_get_mpz(d, a);
- 
-         r1 = fmpz_invmod(c, a, a);
--        r2 = mpz_invert(f, d, d);
-+        r2 = mpz_invert2(f, d, d);
- 
-         fmpz_get_mpz(g, c);
- 
-@@ -149,7 +162,7 @@ main(void)
-         fmpz_get_mpz(e, b);
- 
-         r1 = fmpz_invmod(a, a, b);
--        r2 = mpz_invert(f, d, e);
-+        r2 = mpz_invert2(f, d, e);
- 
-         fmpz_get_mpz(g, a);
- 
-@@ -192,7 +205,7 @@ main(void)
-         fmpz_get_mpz(e, b);
- 
-         r1 = fmpz_invmod(b, a, b);
--        r2 = mpz_invert(f, d, e);
-+        r2 = mpz_invert2(f, d, e);
- 
-         fmpz_get_mpz(g, b);
- 
diff --git a/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch b/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch
deleted file mode 100644
index e08fa774e298..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -druN flint-2.5.orig/interfaces/NTL-interface.cpp flint-2.5/interfaces/NTL-interface.cpp
---- flint-2.5.orig/interfaces/NTL-interface.cpp	2014-07-16 07:50:40.000000000 -0700
-+++ flint-2.5/interfaces/NTL-interface.cpp	2014-08-26 07:51:55.585884615 -0700
-@@ -32,9 +32,7 @@
- #include <NTL/ZZ.h>
- #include <NTL/ZZX.h>
- #include <NTL/mat_ZZ.h>
--#include <NTL/lip.h>
- #include <NTL/ctools.h>
--#include <NTL/g_lip.h>
- #include <gmp.h>
- 
- #include "flint.h"
diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
deleted file mode 100644
index 846ee038654c..000000000000
--- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-RESTRICT="mirror !test? ( test )"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc gc ntl static-libs test"
-
-RDEPEND="dev-libs/gmp:0=
-	dev-libs/mpfr:0
-	gc? ( dev-libs/boehm-gc )
-	ntl? ( dev-libs/ntl )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/texlive-core
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.3-libdir.patch \
-		"${FILESDIR}"/${PN}-2.4.3-whitespaces.patch \
-		"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \
-		"${FILESDIR}"/${PN}-2.4.4-test.patch \
-		"${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
-
-	sed -i \
-		-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
-		./configure || die
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--with-gmp="${EPREFIX}/usr" \
-		--with-mpfr="${EPREFIX}/usr" \
-		$(usex ntl "--with-ntl=${EPREFIX}/usr" "") \
-		$(use_enable static-libs static) \
-		$(usex gc "--with-gc=${EPREFIX}/usr" "") \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		|| die
-}
-
-src_compile() {
-	emake verbose
-
-	if use doc ; then
-		emake -C doc/latex
-	fi
-}
-
-src_test() {
-	emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-	einstalldocs
-	use doc && dodoc doc/latex/flint-manual.pdf
-}
diff --git a/sci-mathematics/flint/flint-2.4.5.ebuild b/sci-mathematics/flint/flint-2.4.5.ebuild
deleted file mode 100644
index 36bcaaaea7a9..000000000000
--- a/sci-mathematics/flint/flint-2.4.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-RESTRICT="mirror !test? ( test )"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gc ntl static-libs test"
-
-RDEPEND="dev-libs/gmp:0=
-	dev-libs/mpfr:0
-	gc? ( dev-libs/boehm-gc )
-	ntl? ( dev-libs/ntl )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/texlive-core
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.3-libdir.patch \
-		"${FILESDIR}"/${PN}-2.4.3-whitespaces.patch \
-		"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \
-		"${FILESDIR}"/${PN}-2.4.4-test.patch \
-		"${FILESDIR}"/${PN}-2.4.5-gmp6-compat.patch \
-		"${FILESDIR}"/${PN}-2.4.5-ntl62.patch \
-		"${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
-
-	sed -i \
-		-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
-		./configure || die
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--with-gmp="${EPREFIX}/usr" \
-		--with-mpfr="${EPREFIX}/usr" \
-		$(usex ntl "--with-ntl=${EPREFIX}/usr" "") \
-		$(use_enable static-libs static) \
-		$(usex gc "--with-gc=${EPREFIX}/usr" "") \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		|| die
-}
-
-src_compile() {
-	emake verbose
-
-	if use doc ; then
-		emake -C doc/latex
-	fi
-}
-
-src_test() {
-	emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-	einstalldocs
-	use doc && dodoc doc/latex/flint-manual.pdf
-}
diff --git a/sci-mathematics/flint/flint-2.5.2-r1.ebuild b/sci-mathematics/flint/flint-2.5.2-r1.ebuild
index 795bf6e90c61..161e3cc3445d 100644
--- a/sci-mathematics/flint/flint-2.5.2-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.flintlib.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="doc gc ntl static-libs"
 
 BDEPEND="doc? (
diff --git a/sci-mathematics/flint/flint-2.5.2.ebuild b/sci-mathematics/flint/flint-2.5.2.ebuild
deleted file mode 100644
index 0a6ef5a44bd8..000000000000
--- a/sci-mathematics/flint/flint-2.5.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-RESTRICT="mirror !test? ( test )"
-LICENSE="GPL-2"
-SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc gc ntl static-libs test"
-
-RDEPEND="dev-libs/gmp:=
-	dev-libs/mpfr:=
-	gc? ( dev-libs/boehm-gc )
-	ntl? ( dev-libs/ntl:= )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/texlive-core
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
-
-	sed -i \
-		-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
-		./configure || die
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--with-gmp="${EPREFIX}/usr" \
-		--with-mpfr="${EPREFIX}/usr" \
-		$(usex ntl "--with-ntl=${EPREFIX}/usr" "") \
-		$(use_enable static-libs static) \
-		$(usex gc "--with-gc=${EPREFIX}/usr" "") \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		|| die
-}
-
-src_compile() {
-	emake verbose
-
-	if use doc ; then
-		emake -C doc/latex
-	fi
-}
-
-src_test() {
-	emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-	einstalldocs
-	use doc && dodoc doc/latex/flint-manual.pdf
-}
diff --git a/sci-mathematics/flintqs/Manifest b/sci-mathematics/flintqs/Manifest
new file mode 100644
index 000000000000..bb93b4b7d83a
--- /dev/null
+++ b/sci-mathematics/flintqs/Manifest
@@ -0,0 +1,3 @@
+DIST flintqs-1.0.tar.gz 151535 BLAKE2B c05761767af65ed5e5c42e75640c0736a26de76126907a91914083791ce0fa3659fb6f9fcdddb0b7aaaf2200010d826a18e7fcbdad0ffc6f861d4bcd941caabb SHA512 8391bb13bcc91f4ea68c972f0f6eaf9aa37bedc4c8694d039a21fd5153b203d561364ae545478d34013001354c4e8a013b2e5a5cb947b6e7f453c6f0f392f8be
+EBUILD flintqs-1.0.ebuild 1009 BLAKE2B 07dca8c379b639415bd62e8cc675eb4634e2aefb62aac16314e1ae2a9e504387a42a18300994b43e2bd914d053d8d3de30cafde8bb226fdc1157df6756f90334 SHA512 254919e66b3e2ceda923e90958a478fd97ece56d3a711da7ecc1f120b8ee8ef0a033cf78b0d941566d9700debd3220ed318f3c51a592074039fdab02c4db6c1a
+MISC metadata.xml 736 BLAKE2B 553a7c524f86f30ba868d5e0db2fe5d1b4c501a5be3041fd7cccdb50e5945ecf794dde68c058ff88a1ed918d9466636d723e117e1c073665c20d5330a3e2ad4c SHA512 5ca499866911f12338a1303be4d037b60a62e257e77856349accff7d002c5fef5f6b1f74e6558392e1ed265413440f237a6775a57ec9a57429ce480fea6f838d
diff --git a/sci-mathematics/flintqs/flintqs-1.0.ebuild b/sci-mathematics/flintqs/flintqs-1.0.ebuild
new file mode 100644
index 000000000000..676e751c8bd8
--- /dev/null
+++ b/sci-mathematics/flintqs/flintqs-1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Multi-polynomial quadratic sieve for integer factorization"
+HOMEPAGE="https://github.com/sagemath/FlintQS"
+# The github tarball is missing the autotools stuff.
+SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-libs/gmp:="
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# Factor,
+	#
+	#   1000000000000000005490000000000000001989
+	#
+	# to get
+	#
+	#   10000000000000000051 * 100000000000000000039.
+	#
+	# The sed command deletes all lines up to the pattern match.
+	#
+	ACTUAL=$(echo 1000000000000000005490000000000000001989 | \
+				 QuadraticSieve | \
+				 sed '0,/FACTORS:/d' | \
+				 sort --numeric | \
+				 uniq |
+				 tr '\n' ' ')
+	EXPECTED="10000000000000000051 100000000000000000039 "
+
+	[[ "${ACTUAL}" == "${EXPECTED}" ]] || die "test factorization failed"
+}
diff --git a/sci-mathematics/flintqs/metadata.xml b/sci-mathematics/flintqs/metadata.xml
new file mode 100644
index 000000000000..5fa38751016e
--- /dev/null
+++ b/sci-mathematics/flintqs/metadata.xml
@@ -0,0 +1,24 @@
+<?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>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <upstream>
+    <remote-id type="github">sagemath/FlintQS</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index d01b5cb9eb24..75c9cd44785a 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,6 +1,8 @@
 AUX 64fricas-gentoo.el 101 BLAKE2B 7d2499931132bd7bf32b528cbc6b09127af060b879ebea93421206f6f5fbe685b070624e507390902d7cfc7cd06a5988ca2df9959b2549736be912b731990c21 SHA512 be36ef5bfb525aa054cd3881ece83d47ee3a9cb7ef1b0c26215d449ddcad8f9f57045b29ab9063a62f43caa764abb251e5fcd04cf1d15bcc423e40d9e69239ef
 DIST fricas-1.3.4-full.tar.bz2 10381144 BLAKE2B caff50ef2b2d8e9ef76448c265316ac8878010c505f9d871aa5579210ab2de3915f56a44687d3f96aba1f857efc8b3ec182b9b6c5c390e38dbdaf7cdba188dcc SHA512 efee0d8a05979c806182e9e45f81b56037d1a660909971d6b94af1f97732cfb7b689709d8af4229b7f649506860b1ed915dd5afb91378f4c9d8a6e960a248170
 DIST fricas-1.3.5-full.tar.bz2 10477848 BLAKE2B 2431e6dacbe1fc9069baa4335876809ee334b677d3d1bd9ddfbb6c23f6bdaaf2307ec994956c736d9dbbe07915cb1e51a235ef58d6307bdd239dca1c19d65552 SHA512 b800a9b3793506e49a4c5a63bd12a20f00b183d00ed9bd0061865f6cea39b05c026975458dcb3bb7da652fb75b3ce6417bbe1c16312da08cd6a366428ae9eaf9
+DIST fricas-1.3.6-full.tar.bz2 10422732 BLAKE2B c406907bbd8be66104db0ba52cfb49740a54daa53cbcb5949c4a4f090c7c978e8a5d345988544d4e93219be8c66a4c50b586ce4d99f32f8d020b1f015fe94b76 SHA512 5732a9645a15886a14b5778c3b2bd813462693e67ef2cd807742b325edd1ac4c3edbd671e25cc568c20e0a01b82d09defdac0b9eb7e355355461316be29d631c
 EBUILD fricas-1.3.4.ebuild 2382 BLAKE2B c4a01a8b8071b730ce265dc0b1dea5e43e9e9f68af96bc21032246ca8cbe04d1e94c4dd553e8d5efb029c1bbb2287d145a9b8126d8ef7cff17b998712be3bee3 SHA512 14723ac33a880819f5c46a6b7a96c4fd50d2eb37d3f92e7588720442249ede46461c6c8913f632ab846a12fa4a943adcaf6fbe3f63483980e581aff9f8f2f039
 EBUILD fricas-1.3.5.ebuild 2382 BLAKE2B c4a01a8b8071b730ce265dc0b1dea5e43e9e9f68af96bc21032246ca8cbe04d1e94c4dd553e8d5efb029c1bbb2287d145a9b8126d8ef7cff17b998712be3bee3 SHA512 14723ac33a880819f5c46a6b7a96c4fd50d2eb37d3f92e7588720442249ede46461c6c8913f632ab846a12fa4a943adcaf6fbe3f63483980e581aff9f8f2f039
+EBUILD fricas-1.3.6.ebuild 2382 BLAKE2B 4ba66ac739fc94f37debc949d6fdb57f838ae664e1a832e8dd24fe14b0cc2457b9e0f6b835cdc92e9f4588c244099adf3b7c7a424d86d27b9354f09c60ead144 SHA512 0799eb9e8ce77b1c75d93fc38c0dddbfd63c93744b7bc1bb376145b556bf78e3b0e73d17f5e04cb8657c979188b211c113768d6def8eb3632d449226fdb39282
 MISC metadata.xml 1161 BLAKE2B 24d65236e4ad6534747f7295730f0e4a37e6c1a49faf1cef8ca2ed3a87459a21f77a3ff7d69b8487c86bac4cef4300607fac89faf57d3d99c8b6e86d9c7679e9 SHA512 c0555d42cc2d50498b1fa4bbf0fd658332f6ad79aaf0ab207ded28f7463401c901b67f53a1274794db2c0927806501493f99277f5325d52ccfacf5e522cfdfc5
diff --git a/sci-mathematics/fricas/fricas-1.3.6.ebuild b/sci-mathematics/fricas/fricas-1.3.6.ebuild
new file mode 100644
index 000000000000..e71afee95ae3
--- /dev/null
+++ b/sci-mathematics/fricas/fricas-1.3.6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib elisp-common
+
+DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
+HOMEPAGE="http://fricas.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Supported lisps, number 0 is the default
+LISPS=( sbcl cmucl gcl ecls clisp clozurecl )
+# Version restrictions, . means no restrictions
+REST=(  .    .     .   .    .     . )
+# command name: . means just ${LISP}
+COMS=(  .    lisp  .   ecl  .     ccl )
+
+IUSE="${LISPS[*]} X emacs gmp"
+RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gmp? ( dev-libs/gmp:= )"
+
+# Generating lisp deps
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+	LISP=${LISPS[$n]}
+	if [ "${REST[$n]}" = "." ]; then
+	    DEP="dev-lisp/${LISP}"
+	else
+	    DEP="${REST[$n]}"
+	fi
+	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
+done
+if [ "${REST[0]}" = "." ]; then
+	DEP="dev-lisp/${LISPS[0]}"
+else
+	DEP="${REST[0]}"
+fi
+RDEPEND="${RDEPEND} ${DEP}:="
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+	RDEPEND="${RDEPEND} )"
+done
+
+DEPEND="${RDEPEND}"
+
+# necessary for clisp and gcl
+RESTRICT="strip"
+
+src_configure() {
+	local LISP n GMP
+	LISP=sbcl
+	n=${#LISPS[*]}
+	for ((n--; n > 0; n--)); do
+		if use ${LISPS[$n]}; then
+			LISP=${COMS[$n]}
+			if [ "${LISP}" = "." ]; then
+				LISP=${LISPS[$n]}
+			fi
+		fi
+	done
+	einfo "Using lisp: ${LISP}"
+
+	# bug #650788
+	if [[ ${LISP} = sbcl || ${LISP} = ccl ]]
+	then GMP=$(use_with gmp)
+	else GMP=''
+	fi
+
+	# aldor is not yet in portage
+	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP}
+}
+
+src_compile() {
+	# bug #300132
+	emake -j1
+}
+
+src_test() {
+	emake -j1 all-input
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	dodoc README FAQ
+
+	if use emacs; then
+		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
+			-i "${D}"/usr/bin/efricas \
+			|| die "sed efricas failed"
+		elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	else
+		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
+	fi
+	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest
index d4e46ed9232b..fe018d2fd844 100644
--- a/sci-mathematics/genius/Manifest
+++ b/sci-mathematics/genius/Manifest
@@ -1,6 +1,9 @@
 AUX genius-1.0.23-tinfo.patch 772 BLAKE2B 30f93f5ab25e51427d946906e0557c7298b280f1311e2f8f47af980e3035993d5b81c1d96258f08e5f23fcf347d992c2025f5448aa82de6d4134b0cde60bec93 SHA512 7f916124faa5f267c00e6609f0956339644a47db236d1f0d0468e64686f39de263b5a57da873dba09ba3b8967b6c8c35bc2b5fee7441b6af74e736deb5285402
 AUX genius-1.0.24-no_scrollkeeper.patch 1072 BLAKE2B fc05460f03b369e7c867b965a3bd3d6b0ac7722129377106c36358c4a07548f1a5a3c227bca9da2e7d5ad5ecf1290275fa6f46393aadd3865012c317b3f66f61 SHA512 d047ef4f3d253f48cee701f37709230d5c78694f98dcadc9b2bae399c93e9e043fa7bff27c81b8bf529cd83f06155b1059384c73e4647fd19795b5921316bdb9
+AUX genius-1.0.25-vte-conf-fixes.patch 5912 BLAKE2B 440ff10661aed72da46dc2fd1c499dfd9ca29ca70b93d867b23b704aea09b6c66681c829a4c189c6dd98f67c62646769326f459a247784fa7e26815dbc873182 SHA512 df3975480eec31922ba49922c1754f23056e68e40d4f52bf7c08155145863d9e6fefef5b0f1d76bd3bb060f5f9f23aab0e0f65be65c9ff5a1a1bedc591737d41
 DIST genius-1.0.23.tar.xz 2910332 BLAKE2B 8c9822737dfd0b445092c6b96376249093f3cfece4f0b98cb1bf62e9066336875fc014798b301686a9ffcaf5e37c1f324771c5b9e86c1578455874964427cca6 SHA512 8c64235d22734a7653468d39500ebbaa38b0ba7c25e292b4e96ddf825082584bf8c70e7ddc463b685ea01d51d3e08233b4e0cf8816a9a0e3357badb90d8e43c7
+DIST genius-1.0.25.tar.xz 2935920 BLAKE2B 9e5a58e15a1e53a64b10c662f1dea91ec80987d1be3ec208aaff76f59d1f9f5b2f9b2b1a2d6bede9c2cae5258038b2995b3bce6600471d088653b1392a1a8eb1 SHA512 ecd01acceb4cea3cb9796edaebc983ed7c0ee618737d98755882a845ddc07e1307851ef9fba75714bc33868556f03c004e03c3b9c42425293cb59a86b8af17a9
 DIST genius-reference.pdf 1024944 BLAKE2B e0058fbd266a4ed4bf29306520ac64b7ff9a970fa79b5132f5556b61a97dd985fe916c888d0d5a678528ef231a9c66310dc2affe01491c7848451b3d54f58274 SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285
 EBUILD genius-1.0.23.ebuild 1461 BLAKE2B a23dd485bc36ebfae68e6cea6f6b63867b77f521e2e4b636050595b1ef3e7f62e21f3aa76669bcbcc23c9a484fe6acea88af6ca335bd5b9789cf47d0617bc564 SHA512 512066eb09d4fe81722bb3cbe0802e074f1f658b24d0ebbb822b973dae9554934d2c469058dcb24320e290309bec4ab82385897e8f0c131c1a569c0d025f98b3
+EBUILD genius-1.0.25.ebuild 1458 BLAKE2B 5ed920490b79d4c2d57ec5e792d0ed5233250fb3be0cd5c3449df2a92a1bf14d1aa56c126b71dd826829d44626b3103046c6e18a81a9e3e956246be17f667696 SHA512 bb7933fa1aae2699e14b3fd74f3eef133f4b614a8a778ad331b311071ae77d309f42ec35005694d82dc80a3b17148f688b453856a6a7d5f93a39b7499ad86823
 MISC metadata.xml 809 BLAKE2B 9102651076c5b608afc1fbd7a2371d771587fbdc4960e56692f0999ddbfc9bef8096e04e59c491dc7c85ce4f75ec9fb9b093f49a3e53979d62e787e13377c345 SHA512 4259f2ea73e57edc70689d48522cb28ae79443b97b25799bfda21e9114bac15ae77bc27933fd6773c99daeaa060088cb0cb0acae71acd4af81fe7ae408c9e06c
diff --git a/sci-mathematics/genius/files/genius-1.0.25-vte-conf-fixes.patch b/sci-mathematics/genius/files/genius-1.0.25-vte-conf-fixes.patch
new file mode 100644
index 000000000000..54d3a65c7ff3
--- /dev/null
+++ b/sci-mathematics/genius/files/genius-1.0.25-vte-conf-fixes.patch
@@ -0,0 +1,173 @@
+From 3b0ffaf91894a70d5d3eefcf587a258cdc818a8f Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 13 Mar 2020 00:37:32 +0200
+Subject: [PATCH] Clean up vte configure.ac handling
+
+---
+ configure.ac    | 113 +-----------------------------------------------
+ src/Makefile.am |   2 -
+ 2 files changed, 2 insertions(+), 113 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6c70c5c9..9d8e76a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,9 +19,9 @@ PKG_PROG_PKG_CONFIG
+ 
+ dnl ================= Requirements ================================================
+ 
++VTE_REQUIRED=0.50.0
+ GTK_REQUIRED=3.21.4
+ GLIB_REQUIRED=2.41.1
+-PANGO_REQUIRED=1.22.0
+ GTKSOURCEVIEW4_REQUIRED=3.99.7
+ GIO_REQUIRED=2.16.0
+ 
+@@ -123,7 +123,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
+-GENIUS_MODULES="amtk-5 gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GIO_REQUIRED"
++GENIUS_MODULES="amtk-5 gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GIO_REQUIRED vte-2.91 >= $VTE_REQUIRED"
+ 
+ if test "x$use_gnome" = "xyes" ; then
+   echo " 
+@@ -260,115 +260,6 @@ AC_ARG_ENABLE(update-mimedb,
+ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+ 
+ 
+-####
+-# VTE STUFF, this is all temporary pending a port to gtk 3.0 in the star trek future
+-# FIXME: OK this happened, so things ought to be properly "whacked" (removed)
+-
+-AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
+-AC_DEFINE_UNQUOTED(VTE_DEFAULT_EMULATION,"xterm",[The default terminal type to be emulated.])
+-VTE_DEFAULT_EMULATION="xterm"
+-AC_SUBST(VTE_DEFAULT_EMULATION)
+-
+-# Check for headers.
+-AC_CHECK_HEADERS(sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h wchar.h)
+-AC_HEADER_TIOCGWINSZ
+-
+-# Check for PTY handling functions.
+-AC_CHECK_FUNCS([cfmakeraw fork setsid setpgid getpgid getpt grantpt unlockpt ptsname ptsname_r tcgetattr tcsetattr])
+-
+-# Pull in the right libraries for various functions which might not be
+-# bundled into an exploded libc.
+-AC_CHECK_FUNC(socket,[have_socket=1],AC_CHECK_LIB(socket,socket,[have_socket=1; LIBS="$LIBS -lsocket"]))
+-AC_CHECK_FUNC(socketpair,[have_socketpair=1],AC_CHECK_LIB(socket,socketpair,[have_socketpair=1; LIBS="$LIBS -lsocket"]))
+-AC_CHECK_FUNC(recvmsg,[have_recvmsg=1],AC_CHECK_LIB(socket,recvmsg,[have_recvmsg=1; LIBS="$LIBS -lsocket -lnsl"]))
+-if test x$have_socket = x1 ; then
+-	AC_DEFINE(HAVE_SOCKET,1,[Define if you have the socket function.])
+-fi
+-if test x$have_socketpair = x1 ; then
+-	AC_DEFINE(HAVE_SOCKETPAIR,1,[Define if you have the socketpair function.])
+-fi
+-if test x$have_recvmsg = x1 ; then
+-	AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
+-fi
+-AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
+-AC_CHECK_FUNCS([ceil floor])
+-
+-# Look for tgetent
+-
+-AC_CHECK_FUNC([tgetent],[vte_cv_termcap_lib=libc],
+-  [AC_CHECK_LIB([ncurses],[tgetent],[vte_cv_termcap_lib=libncurses],
+-    [AC_CHECK_LIB([tinfo],[tgetent],[vte_cv_termcap_lib=libtinfo],
+-      [AC_CHECK_LIB([curses],[tgetent],[vte_cv_termcap_lib=libcurses],
+-        [AC_CHECK_LIB([termcap],[tgetent],[vte_cv_termcap_lib=libtermcap],
+-          [vte_cv_termcap_lib=])])])])])
+-
+-case "$vte_cv_termcap_lib" in
+-  libc)       # FIXME: which headers to include here?
+-              ;;
+-  libncurses) # We need ncurses.h and term.h, or ncurses/curses.h and ncurses/term.h
+-              AC_CHECK_HEADERS([ncurses.h term.h],[],
+-                [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
+-                  [AC_MSG_ERROR([ncurses headers not found])])])
+-              LIBS="-lncurses $LIBS"
+-              ;;
+-  libtinfo)   # Need ncurses/curses.h and ncurses/term.h
+-              AC_CHECK_HEADERS([ncurses.h term.h],[],
+-                [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
+-                  [AC_MSG_ERROR([ncurses headers not found])])])
+-              LIBS="-ltinfo $LIBS"
+-              ;;
+-  libcurses)  # Need curses.h and term.h
+-              AC_CHECK_HEADERS([curses.h term.h],[],
+-                [AC_MSG_ERROR([curses headers not found])],
+-                [[#ifdef HAVE_CURSES_H
+-                  #include <curses.h>
+-                  #endif]])
+-              LIBS="-lcurses $LIBS"
+-              ;;
+-  libtermcap) # Need termcap.h
+-              AC_CHECK_HEADERS([termcap.h],[],
+-                [AC_MSG_ERROR([termcap headers not found])])
+-              LIBS="-ltermcap $LIBS"
+-              ;;
+-  *)          AC_MSG_ERROR([tgetent not found in any library]) ;;
+-esac
+-
+-# Search for the required modules.
+-
+-# We have a direct dependency on X11 on gdk-x11, see bug #613525
+-AC_MSG_CHECKING([for GDK target])
+-GDK_TARGET="$($PKG_CONFIG --variable target gdk-3.0)"
+-AC_MSG_RESULT([$GDK_TARGET])
+-case "$GDK_TARGET" in
+-  x11) PLATFORM_PKGS="x11 cairo-xlib" ;;
+-  *) PLATFORM_PKGS="" ;;
+-esac
+-
+-VTE_PKGS="vte-2.91"
+-PKG_CHECK_MODULES([VTE],[$VTE_PKGS])
+-AC_SUBST([VTE_PKGS])
+-
+-wcs_funcs_includes="
+-#ifdef HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
+-#  include <memory.h>
+-# endif
+-# include <string.h>
+-#else
+-# ifdef HAVE_STRINGS_H
+-#  include <strings.h>
+-# endif
+-#endif
+-#ifdef HAVE_WCHAR_H
+-# include <wchar.h>
+-#endif
+-"
+-
+-AC_CHECK_TYPES(wint_t, AC_DEFINE(HAVE_WINT_T, , [Defined when the wint_t type is supported]), ,$wcs_funcs_includes)
+-
+-
+-########
+-
+ AC_OUTPUT([
+ genius.spec
+ Makefile
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8408becd..f58eb689 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -22,7 +22,6 @@ AM_CPPFLAGS = \
+ 	-I$(top_builddir)/ve					\
+ 	-I$(top_builddir)/gtkextra				\
+ 	$(WARN_CFLAGS)						\
+-	$(VTE_CFLAGS)						\
+ 	$(BINRELOC_CFLAGS)					\
+ 	$(GMP_INCLUDEDIR)					\
+ 	$(GENIUS_CFLAGS)					\
+@@ -102,7 +101,6 @@ gnome_genius_LDADD = \
+ 	@LEXLIB@				\
+ 	$(INTLLIBS)				\
+ 	$(GENIUS_LIBS)				\
+-	$(VTE_LIBS)				\
+ 	$(GENIUS_NOGUI_LIBS)			\
+ 	$(GSV_LIBS)				\
+ 	@READLINE_LIB@				\
+-- 
+2.20.1
+
diff --git a/sci-mathematics/genius/genius-1.0.25.ebuild b/sci-mathematics/genius/genius-1.0.25.ebuild
new file mode 100644
index 000000000000..8d7c54134e0c
--- /dev/null
+++ b/sci-mathematics/genius/genius-1.0.25.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Genius Mathematics Tool and the GEL Language"
+HOMEPAGE="https://www.jirka.org/genius.html"
+SRC_URI="${SRC_URI}
+	doc? ( https://www.jirka.org/${PN}-reference.pdf )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +gui"
+
+RDEPEND="
+	>=dev-libs/glib-2.41.1:2
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	gui? (
+		>=x11-libs/gtk+-3.21.4:3
+		>=x11-libs/gtksourceview-3.99.7:4
+		gui-libs/amtk:5
+		>=x11-libs/vte-0.50.0:2.91 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-update-icon-cache
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/flex
+	virtual/yacc
+" # eautoreconf needs sys-devel/autoconf-archive
+# dev-util/gtk-update-icon-cache because configure checks for it for some reason and never calls it with DESTDIR set..
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.24-no_scrollkeeper.patch"
+	"${FILESDIR}/${P}-vte-conf-fixes.patch"
+)
+
+src_configure() {
+	# Unrecognized --disable-scrollkeeper warning comes from gnome2.eclass adding it based on grep, but upstream has them commented out in .ac with "#" instead of "dnl"
+	gnome2_src_configure \
+		$(use_enable gui gnome) \
+		--enable-nls \
+		--disable-extra-gcc-optimization \
+		--disable-static
+}
+
+src_install() {
+	use doc && DOCS+=" ${DISTDIR}/${PN}-reference.pdf"
+	gnome2_src_install
+}
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index d94f1b5885bc..a0e9b343e7d3 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -2,6 +2,11 @@ AUX gfan-0.5-double-declare-fix.patch 470 BLAKE2B e5d12f62b2efe9781f616825dce16c
 AUX gfan-0.5-fix-build-system.patch 1349 BLAKE2B bce148ee12c3fd720baeccc6a75b0b66ed76f1bb7d1b7ef92c3d67ab26a4743502169b0fbac87b24496f5319adc85dbed1c4efdc1dfb68ecaf795f2d7441d4f1 SHA512 e53e7ec77ef18fa05f14ab0aa011b524439d4c4bdad79d2e197bde1e136df1c2ca043287d17722140ea79351969d87df29eb845ac441f9703c7c786bd6ac582e
 AUX gfan-0.5-fix-gcc9.patch 3712 BLAKE2B fd8b89d8f3019db71ea9bba05a8652666ddef6d35dd75cc97510cf96267ce1cc651375cfb9e269ab765b5bc3c30c0b33cbf73d1a74eea8a564a3d5482c15af28 SHA512 6c1186c2a549191b4db31433ca006de7d916bb43b2a9176f83b0c6516ac757f693721c355aff8b1669987b6db862858b4f428cc372f6787a0f4503242bb5e035
 AUX gfan-0.5-gcc6.1-compat.patch 2000 BLAKE2B 0ba13745140bb56d3398669e453cd245ee31c351ee3899dbded117ad48a238e99306c0c08b050168ddd204f4f30840ab8f04a609b135b782a06522cf65236995 SHA512 daf9527baf68299063ccdd82b53e92a63584fd5cf432b2d889c4aad08ccff0a31c0a75a7b6defd018021df4f46831ed7727a1bd6ea1b0da1fe9a924f9b208fe9
+AUX gfan-0.6.2-Makefile.patch 6603 BLAKE2B 48f9b4280418aef41d502d770c070ec1dcef947a39c6263d991be0f6f41147d06b78a4b07ca76e0fb4bc9780cb9469c98c637473789d857925df8d546ad35e92 SHA512 e1eef6f01c9942b38780f19b774fa3e99df4dbdba738cc2c6c69e2f1858e5e6294db72d7b679c5ff1313a76143bd611077731d360479f9375d6506e33a4a620a
+AUX gfan-0.6.2-testsuite.patch 3223 BLAKE2B ddb94775a13bd503df5c9563750a6b4b68c9e72e1a19aaa0415c5484e07765dfd28ba02b3a0fab65a0b9cd5c61afafbc6a3d862a1de68ece57ef9d8bb2835c16 SHA512 d62e765a39ee1a8cb149fcae8afb538b19a91206dd0b8cf0ac2b681b28569e44f492b770b9e61d7573f2d52f265ad4cf25671197c204238a89075709753a83e6
+AUX gfan-0.6.2-xcode9.3_compat.patch 367 BLAKE2B fb7c685a4dd811fed83e2734a16507b1792e3a97c666d0e7de1d2ed53a7b9b43c5319517f9eef829f47147dc725f2c4ead38968fa3868baa1d16630a8b844636 SHA512 129d2c35777f82bf2a1581450ecb12dd6811fb72b583748b30665c0f9b20d39646233d9b40fb64a3c7790360514a51b30e49c53d83c34d259f664bf820ae1ce2
 DIST gfan0.5.tar.gz 1134987 BLAKE2B 73ea793f5dbceb76a9f143a258ee3e38e1466e4e15ed96dbabb58f33d3a091a885479dd00f8179d3bf2c85cf275605823f63aa33272f1f9984e0fc5841ab35e9 SHA512 11a9657adcd5b39f73244450c09b132d8cd19474d0f9151c0127682bc16847537e4096d39e8a0a63b5c6aef6720e54a72bfd361a5271808d5a5595fd2df494fa
+DIST gfan0.6.2.tar.gz 1321059 BLAKE2B 1ed61e1e084a1ceb65dd21848440bc3a90486c0ce4012b3b64c8029e89636696d2b0e5446ea156d2cf050b5db179c7c2f25c97e683cecf6e9616e8553d8513bf SHA512 5961820750af2522fdc1a86c0254742c3b003607a8707df5d6cd5f0bc6461e4d3db3b1d3cb537979d57eb9dff387974a58aeb91d0b5246d7c701cadc5a2cf4cf
 EBUILD gfan-0.5-r1.ebuild 803 BLAKE2B efaa6db36e8f2c593ef82779cbbd9806197198d4150d785e7df5d5605e167fe11f172703723a89357fc23697f00c5ffd642be1a3dbac412b8b67f175cb524427 SHA512 c47d99455abbd85d48909d59a23408271015a3a1b9f6a79b2b26aa390769c41e32ae6ab2f89e29f9cddc0b5db217c619f2eee0cddfe5a9bab670196ac3ac10fa
-MISC metadata.xml 398 BLAKE2B 3c18380c694b7ac7114c6d83f65b9334a85c6afa5936bb5af9cb5eca2052b416eca08dfd5085d381589976d2ac1e3bbdf09a28757810cf54beb351b89dbcc46b SHA512 ac0668f6b8af01557b5a29a5aab5f6064f77eaed62e3fc080a5c808a62310dedd935271f58035e7c9b340df582922d2a960f67f148d61779a9a64fc1fbf7457e
+EBUILD gfan-0.6.2.ebuild 1355 BLAKE2B 1b1429fa29232e3bde6892547fcff912595bef83ab2a5c44e6ef763da65f678fde3bee193ed7efaad74bfd75389512367c69688d4e54918e08542571c6ae1ea0 SHA512 502b4c7a5619a09d3897b975cdf24834e5592ead0c61f9775ca5627e7bd1fd0eb558b18c25a7721aa5294dd3fa826f4c87ea841c55fb424a47bb2dfd25c87c9a
+MISC metadata.xml 1343 BLAKE2B 1e3385eaf888fa6a69e1e3f761bd5a1037e5a5308878664e604ba5efd096747f84a0a3343d8de7f6eb5dd3ce726d94bdb933e17b9eaf8e345b02fd071fbf821b SHA512 ca914de593af1279439f35fdcc812924b831c30bfa86366443f16cb720acd3e38267f25057f59e76a6b8ff1aa48a33ecfa72c093419aab95c92ed82c3308cd94
diff --git a/sci-mathematics/gfan/files/gfan-0.6.2-Makefile.patch b/sci-mathematics/gfan/files/gfan-0.6.2-Makefile.patch
new file mode 100644
index 000000000000..8e8db53bc911
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.6.2-Makefile.patch
@@ -0,0 +1,155 @@
+diff --git a/Makefile b/Makefile
+index 2c9f949..a49a590 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,8 @@ ALL: default
+ 
+ # When -g is used, it seems that stackdump does not work.
+ # GPROFFLAG = -pg
+-GPROFFLAG = -g
+-#GPROFFLAG = 
++#GPROFFLAG = -g
++GPROFFLAG =
+ 
+ PREFIX?=/usr/local
+ 
+@@ -22,20 +22,8 @@ STACTDUMP_OPTIONS = -DSTACKDUMP_ENABLED -D__assert_fail=__assert_fail2
+ endif
+ 
+ 
+-ifeq ($(sagepath),)
+-SAGE_LINKOPTIONS = 
+-SAGE_INCLUDEOPTIONS =
+-else
+-SAGE_LINKOPTIONS = -L$(sagepath)/ -lpython2.6 -lcsage -lsingular
+-SAGE_INCLUDEOPTIONS = -I $(sagepath)/
+-SAGE_OBJECTS = sage.o sage_link.so
+-
+-sage_link.so: sage_link.pyx setup.py
+-	python setup.py build_ext --inplace --pyrex-include-dirs=$(SAGE_ROOT)/devel/sage/
+-endif
+-
+ ifeq ($(gmppath),)
+-GMP_LINKOPTIONS = -lgmp
++GMP_LINKOPTIONS = -lgmp -lm
+ GMP_INCLUDEOPTIONS =
+ else
+ GMP_LINKOPTIONS = $(gmppath)/lib/libgmp.a
+@@ -49,7 +37,7 @@ CDDDEFINE_PREFIX = -DNOCDDPREFIX
+ endif
+ 
+ ifeq ($(cddpath),)
+-CDD_LINKOPTIONS = -L/usr/local -lcddgmp
++CDD_LINKOPTIONS = -lcddgmp
+ CDD_INCLUDEOPTIONS =
+ else
+ CDD_LINKOPTIONS = $(cddpath)/lib/libcddgmp.a
+@@ -71,37 +59,8 @@ SOPLEX_OBJECTS = lp_soplexcdd.o
+ endif
+ 
+ 
+-# rememember to adjust USEFACTORY in field_rationalfunctions2
+-ifeq ($(singular),)
+-ifeq ($(factory),)
+-SINGULAR_PATH =
+-SINGULAR_LINKOPTIONS =
+-SINGULAR_INCLUDEOPTIONS =
+-SINGULAR_OBJECTS = src/polynomialgcd.o 
+-else
+-SINGULAR_PATH =
+-SINGULAR_LINKOPTIONS = -lcf -lcfmem
+-SINGULAR_INCLUDEOPTIONS = -I /usr/local/include/factory/
+-SINGULAR_OBJECTS = src/polynomialgcd.o src/ftmpl_inst.o
+-endif
+-else
+-#SINGULAR_PATH = $(HOME)/math/software/Singular-3-1-0
+-#SINGULAR_LINKOPTIONS =  -L$(SINGULAR_PATH)/Singular -lsingular -lncurses -lreadline
+-#SINGULAR_INCLUDEOPTIONS = -I $(SINGULAR_PATH)/kernel -I $(SINGULAR_PATH)/omalloc
+-#SINGULAR_OBJECTS = src/singular.o src/singularconversion.o
+-SINGULAR_PATH = $(HOME)/math/software/Singular-svn/trunk/x86_64-Linux
+-SINGULAR_LINKOPTIONS =  -L$(SINGULAR_PATH)/lib -lsingular -lncurses -lreadline  -lcf -lcfmem
+-SINGULAR_INCLUDEOPTIONS = -I $(SINGULAR_PATH)/include -I $(SINGULAR_PATH)/include/omalloc
+-SINGULAR_OBJECTS = src/ftmpl_inst.o src/singular.o src/singularconversion.o
+-#Run the following line before running gfan
+-#export LD_LIBRARY_PATH="/home/anders/math/software/Singular-svn/trunk/x86_64-Linux/lib/:${LD_LIBRARY_PATH}"
+-endif
+-
+-# To produce factory templates:
+-#g++ -c /home/anders/math/software/factory-3-1-7/ftmpl_inst.cc  -fno-implicit-templates -I /usr/local/include/factory/ -I/home/anders/math/software/factory-3-1-7/ -O2 -fomit-frame-pointer -o ftmpl_inst.o
+-
+-ADDITIONALLINKOPTIONS = $(CDD_LINKOPTIONS) $(GMP_LINKOPTIONS) $(SOPLEX_LINKOPTIONS) $(SINGULAR_LINKOPTIONS) $(SAGE_LINKOPTIONS) 
+-ADDITIONALINCLUDEOPTIONS = $(CDD_INCLUDEOPTIONS) $(GMP_INCLUDEOPTIONS) $(SOPLEX_INCLUDEOPTIONS) $(SINGULAR_INCLUDEOPTIONS) $(SAGE_INCLUDEOPTIONS)
++ADDITIONALLINKOPTIONS = $(CDD_LINKOPTIONS) $(GMP_LINKOPTIONS) $(SOPLEX_LINKOPTIONS) 
++ADDITIONALINCLUDEOPTIONS = $(CDD_INCLUDEOPTIONS) $(GMP_INCLUDEOPTIONS) $(SOPLEX_INCLUDEOPTIONS)
+ 
+ 
+ MKDIR=mkdir -p
+@@ -110,13 +69,11 @@ MKDIR=mkdir -p
+ PREFIX =
+ SHELL       = /bin/sh
+ #ARCH        = LINUX
+-CC          = $(PREFIX)gcc
+-CLINKER     = $(CC)
+-CXX         = $(PREFIX)g++
+-CCLINKER    = $(CXX)
++CC          ?= $(PREFIX)gcc
++CXX         ?= $(PREFIX)g++
+ #OPTFLAGS    = -O2 -DGMPRATIONAL -DNDEBUG
+ # Note that gcc produces wrong code with -O3
+-OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O2	 #-O3 -fno-guess-branch-probability #-DNDEBUG
++OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized
+ #OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O3 -mavx -msse2  -finline-limit=1000 -ffast-math -Wuninitialized # -fno-guess-branch-probability #-DNDEBUG -ftree-vectorizer-verbose=2
+ #OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O1             -fno-guess-branch-probability
+  #-DNDEBUG
+@@ -125,10 +82,10 @@ OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O2	 #-O3 -
+ #OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O3 -msse2 -ftree-vectorizer-verbose=2 -ffast-math #-DNDEBUG
+ #OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O3 -mavx -msse2 -ftree-vectorizer-verbose=2 -ffast-math #-DNDEBUG
+ 
+-CFLAGS	  = $(OPTFLAGS) $(GPROFFLAG) $(STACTDUMP_OPTIONS) $(ADDITIONALINCLUDEOPTIONS) -std=c++0x -g $(CDDDEFINE_PREFIX) #-pedantic
+-#CFLAGS	  = $(OPTFLAGS) $(GPROFFLAG) $(STACTDUMP_OPTIONS) $(ADDITIONALINCLUDEOPTIONS) -D_GLIBCXX_DEBUG -std=c++0x -g $(CDDDEFINE_PREFIX) #-pedantic
+-CCFLAGS	  = $(CFLAGS)
+-FFLAGS	  = $(OPTFLAGS)
++CFLAGS	  := $(CFLAGS) $(OPTFLAGS) $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) #-pedantic
++CXXFLAGS  := $(CXXFLAGS) $(OPTFLAGS) $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) #-pedantic
++
++SINGULAR_OBJECTS = src/polynomialgcd.o
+ 
+ CATSOBJECTS =	lp_cdd.o \
+ 		parser.o \
+@@ -394,16 +351,15 @@ EXECS	  = $(MAIN)
+ # (compiling with gcc version 4.7.2 and running gfan _tropicaltraverse on a starting cone for Grassmann3_7)
+ # Either this is a bug in the code or in the compiler. The bug disappears by compiling with -fno-guess-branch-probability
+ src/symmetrictraversal.o: src/symmetrictraversal.cpp
+-	$(CXX) $(CFLAGS) -fno-guess-branch-probability  -c src/symmetrictraversal.cpp -o src/symmetrictraversal.o
++	$(CXX) $(CXXFLAGS) -c src/symmetrictraversal.cpp -o src/symmetrictraversal.o
+ # If compiling with clang, use the line below instead:
+-#	$(CXX) $(CFLAGS) -c src/symmetrictraversal.cpp -o src/symmetrictraversal.o
++#	$(CXX) $(CXXFLAGS) -c src/symmetrictraversal.cpp -o src/symmetrictraversal.o
+ 
+ # Define suffixes to make the program compile on legolas.imf.au.dk :
+ .SUFFIXES: .o .cpp .c
+ 
+ OBJECTS = 	$(addprefix src/,$(SOPLEX_OBJECTS)) \
+ 		$(SINGULAR_OBJECTS) \
+-		$(SAGE_OBJECTS) \
+ 		$(addprefix src/,$(CATSOBJECTS)) \
+ 		$(addprefix src/,$(APPOBJECTS)) \
+ 		src/symmetrictraversal.o
+@@ -420,7 +376,7 @@ default: $(OBJECTS) $(ADDITIONALOBJECTS) $(EXECS)
+ 
+ $(MAIN): $(OBJECTS)
+ #	$(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -lpthread  -o $(MAIN)
+-	$(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -lpthread -rdynamic -o $(MAIN)
++	$(CXX) $(CXXFLAGS) -pthread -o $(MAIN) $(LDFLAGS) $(OBJECTS) -lpthread $(ADDITIONALLINKOPTIONS) $(GPROFFLAG)
+ 
+ release:
+ 	rm -f -r $(RELEASEDIR)/*
+@@ -546,7 +502,7 @@ check:
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $< -o $(patsubst %.c,%.o,$<)
+ .cpp.o:
+-	$(CXX) $(CFLAGS) -c $< -o $(patsubst %.cpp,%.o,$<)
++	$(CXX) $(CXXFLAGS) -c $< -o $(patsubst %.cpp,%.o,$<)
+ 
+ # wget http://ftp.sunet.se/pub/gnu/gmp/gmp-4.2.2.tar.gz
+ # tar -xzvf gmp-4.2.2.tar.gz
diff --git a/sci-mathematics/gfan/files/gfan-0.6.2-testsuite.patch b/sci-mathematics/gfan/files/gfan-0.6.2-testsuite.patch
new file mode 100644
index 000000000000..920646e486e4
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.6.2-testsuite.patch
@@ -0,0 +1,222 @@
+diff --git a/src/app_test.cpp b/src/app_test.cpp
+index 755bfe6..183c735 100644
+--- a/src/app_test.cpp
++++ b/src/app_test.cpp
+@@ -562,6 +562,9 @@ int testIntegers()
+ 			  failed.push_back(i->folder);
+ 		  }
+ 	  cout<<"\n";
++	  cout<<"Number of succesful tests "<<good<<endl;
++	  cout<<"Number of failed tests "<<bad<<endl;
++
+ 	  if(!failed.empty())
+ 	  {
+ 		  cout<<"Failed tests:\n-------------\n";
+@@ -569,11 +572,9 @@ int testIntegers()
+ 		  {
+ 			  cout<<*i<<" FAILED!\n";
+ 		  }
++		  return 1;
+ 	  }
+ 
+-	  cout<<"Number of succesful tests "<<good<<endl;
+-	  cout<<"Number of failed tests "<<bad<<endl;
+-
+ 	  return 0;
+   }
+ };
+diff --git a/testsuite/0008PolynomialSetUnion/command b/testsuite/0008PolynomialSetUnion/command
+index cbb23d6..d61cb71 100644
+--- a/testsuite/0008PolynomialSetUnion/command
++++ b/testsuite/0008PolynomialSetUnion/command
+@@ -1 +1 @@
+-%s _bases | %s _polynomialsetunion |sort
++%s _bases | %s _polynomialsetunion |LC_ALL=C sort|tail -n +2 | sed -e '$ d'
+diff --git a/testsuite/0008PolynomialSetUnion/output b/testsuite/0008PolynomialSetUnion/output
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/output
++++ b/testsuite/0008PolynomialSetUnion/output
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
+diff --git a/testsuite/0008PolynomialSetUnion/outputNew b/testsuite/0008PolynomialSetUnion/outputNew
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/outputNew
++++ b/testsuite/0008PolynomialSetUnion/outputNew
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
diff --git a/sci-mathematics/gfan/files/gfan-0.6.2-xcode9.3_compat.patch b/sci-mathematics/gfan/files/gfan-0.6.2-xcode9.3_compat.patch
new file mode 100644
index 000000000000..83f4b66f8239
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.6.2-xcode9.3_compat.patch
@@ -0,0 +1,13 @@
+diff --git a/src/app_main.cpp b/src/app_main.cpp
+index a33c042..e7ade81 100644
+--- a/src/app_main.cpp
++++ b/src/app_main.cpp
+@@ -205,7 +205,7 @@ public:
+     }
+ 
+     ep->close();
+-    delete ep;//<--- In next release, make the class virtual
++//    delete ep;//<--- In next release, make the class virtual # this is miscompiled clang@xcode-6.3
+ 
+     printf("\n");
+ 
diff --git a/sci-mathematics/gfan/gfan-0.6.2.ebuild b/sci-mathematics/gfan/gfan-0.6.2.ebuild
new file mode 100644
index 000000000000..a75c9f76f0f7
--- /dev/null
+++ b/sci-mathematics/gfan/gfan-0.6.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Compute Groebner fans and tropical varieties"
+HOMEPAGE="https://users-math.au.dk/~jensen/software/gfan/gfan.html"
+SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+BDEPEND="doc? ( virtual/latex-base )"
+DEPEND="dev-libs/gmp:0=[cxx]
+	sci-libs/cddlib:0="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
+	"${FILESDIR}/${PN}-0.6.2-testsuite.patch"
+	"${FILESDIR}/${PN}-0.6.2-Makefile.patch"
+	)
+
+pkg_setup() {
+	tc-export CC CXX
+	append-cxxflags -DNOCDDPREFIX
+}
+
+src_configure() {
+	# The upstream Makefile says that GCC produces bad code with -O3.
+	replace-flags "-O3" "-O2"
+	default
+}
+
+src_compile() {
+	default
+	if use doc; then
+		pushd doc > /dev/null || die
+		# The LaTeX build commands need to be repeated until the
+		# document "stops changing," which is not as easy as it
+		# sounds to detect. Running it twice seems to work here.
+		pdflatex manual.tex && bibtex manual && pdflatex manual.tex || die
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+	use doc && dodoc doc/manual.pdf
+}
diff --git a/sci-mathematics/gfan/metadata.xml b/sci-mathematics/gfan/metadata.xml
index abc08ece6082..c9e1ddd54b35 100644
--- a/sci-mathematics/gfan/metadata.xml
+++ b/sci-mathematics/gfan/metadata.xml
@@ -6,6 +6,21 @@
   <name>Gentoo Mathematics Project</name>
  </maintainer>
 <longdescription lang="en">
-  gfan is a computer algebra tool to compute Groebner fans and tropical varieties.
+  Gfan is a software package for computing Gröbner fans and tropical
+  varieties. These are polyhedral fans associated to polynomial
+  ideals. The maximal cones of a Gröbner fan are in bijection with the
+  marked reduced Gröbner bases of its defining ideal. The software
+  computes all marked reduced Gröbner bases of an ideal. Their union
+  is a universal Gröbner basis. The tropical variety of a polynomial
+  ideal is a certain subcomplex of the Gröbner fan. Gfan contains
+  algorithms for computing this complex for general ideals and
+  specialized algorithms for tropical curves, tropical hypersurfaces
+  and tropical varieties of prime ideals. In addition to the above
+  core functions the package contains many tools which are useful in
+  the study of Gröbner bases, initial ideals and tropical
+  geometry. The full list of commands can be found in Appendix B of
+  the manual. For ordinary Gröbner basis computations Gfan is not
+  competitive in speed compared to programs such as CoCoA, Singular
+  and Macaulay2.
 </longdescription>
 </pkgmetadata>
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index ea88e5dcd571..e8337e380151 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,4 +1,9 @@
 AUX glpk-4.63-debundle-system-libs.patch 2240 BLAKE2B 5bd0d25768682a410159e3bf0eaf83dc038da8c6bda275c6994846516bb347caf6d4ea726e8635c77b84a463cb1ec32955f573589291486067c651a88d7f276c SHA512 186c1dd2197119b376a76a2db9a73d7fc1e43adc6ae54f5d3e39ad9114a9a406d45dd7bce4bcea31cfce94e71234b70872db22378e8312026912a93077488805
+AUX glpk-4.65-debundle-system-libs.patch 1930 BLAKE2B 0c265afe9338e75bb3d6536e9e0b2f473e15b4b524b29244bd6bce44a1f77e48c122a463a3800a246435b47d240e799fd16a21ef5c66eb00643759774c47ef73 SHA512 940c2d3dc12efd8df90c17277630a60ea6682eff0323ea82eeb8b81377db612103c29fb44bbe8ff936d96a436548be3e4c772f55f8412adaad546a6381be6333
+AUX glpk-4.65-fix-mysql-include-prefix.patch 1837 BLAKE2B ecd90024e07f29e8ebb6af80b520c8f192cfea21c90d8c247001389f2ccfcf24ad487981a0cc719d1ca99e266dd2a9d66f6416d4f2d5e7c80bdf807b9bb7b74e SHA512 c74281bf3e03e136d183b562b8f682a3e1957019a36ec0c6a048049f0d5f55361107a62e36eaa9e3306a1f13df10adf55c2f54f096b6e353108856e05d9ce799
+AUX glpk-4.65-longstep_verbosity.patch 844 BLAKE2B c1d14e6dfd596694bf1da060129713eb70ceebd4b1742e8496b89c1e1bfefa5bfdf320ecb8d863aa5b5a0d9750bca8bf59b261608cc39b1d1a0b3fe3b10a7be4 SHA512 29d8e876c0d5fba14056e8f0639e3746c6f4c0eefcad284727921e0ca7184ad96b4363dfe9bfe67b74d6d9419f37d21e453e431bf53438b624c1ab0ef9fe1092
 DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c
-EBUILD glpk-4.63.ebuild 1458 BLAKE2B 521546a879c84b90bb7945a8cc8f5193b0a2d3d01d19eca0e2e036a219dde203a39b8687738154beb2b783843a870eb544c3cbba43d2cd6443a3e291e96e0059 SHA512 f1f080df14f6df511d12c6f56d463d62b1ef4f8814c6ea08e12ce278496f2c968a5d2bb57ca350ac8d63bef7210fc6f4ba4493baa402fbe3ce07a2d4185d96af
-MISC metadata.xml 668 BLAKE2B 9dec50a5d6aa33f108651ed8fd891750fc8146eedf8df28abc0fa04a6db2f0d590073fe3606c658a99d56d283d7a24629503bbf11f6593ef1b90314d26a1ab69 SHA512 0c37b2854097a14a58070b1651ccdcdfae652e7d2b5afd62c617e22fa0256acee07aab0409f6621382151e1fb5e605002a3a809113693b2078054a4b16e72452
+DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
+EBUILD glpk-4.63.ebuild 1460 BLAKE2B 87059596f20960dc68de7bd7fd804bbb7774ea373601782da090fa3dad4403e28725cfed8dc31bb25c0a229ff5275b7950665c31baf2f2fdf9c88f0489f25073 SHA512 3d5c104f103f46440499181f5c0155ca1a8d4b7418fc8c93bcff7382601f4fbcd2380ea3a637ad469c0ac3a579b67b6c011ecdcfaf66fb0cd40adb33c675dff3
+EBUILD glpk-4.65.ebuild 1792 BLAKE2B f32f1e3e8d84be2e5419114abb7aee35ad0e6c5692bb01835f58d869b571832dbc2d49f1cb8ad42fbb7a2edcc632f7a0b167fbe27c59ed05ba3a5dcfb5643a2d SHA512 31041d5866fbd516cba4f7db1332de86f0d47820da51d5cc30a22dc1109df7cf7465af31e489779c94e5faab9c4c126ef13f6ad7662d397e5ffdc3aac99d7542
+MISC metadata.xml 998 BLAKE2B 11afba9ccdd6a53cee9432201eee2ae03483da71212f1c7f9907a775e6c2fcce068648fdae87965dab7550c9157c86697802707b582589626cf48e4236aa56e0 SHA512 1ef83c282b3a6143a1e85a1ecdc55463cf5617409dc990806917077c30e4acd2663b2772bf47aa96c572ee78dab76467c10b4ae9a2705220aa6e8e4936c4f7b5
diff --git a/sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch
new file mode 100644
index 000000000000..78af8b8d9431
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch
@@ -0,0 +1,91 @@
+diff --git a/configure.ac b/configure.ac
+index 96c4cc5..29e11f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,6 +69,11 @@ AC_PROG_LIBTOOL
+ dnl Check for math library
+ AC_CHECK_LIB([m], [exp])
+ 
++AC_CHECK_LIB([amd], [amd_1])
++AC_CHECK_LIB([colamd], [colamd])
++AC_CHECK_HEADER([amd.h])
++AC_CHECK_LIB([z], [gzopen])
++
+ dnl Check for <sys/time.h> header
+ AC_CHECK_HEADER([sys/time.h],
+    AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
+diff --git a/src/Makefile.am b/src/Makefile.am
+index eb5dc1b..b814627 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,10 +6,8 @@ lib_LTLIBRARIES = libglpk.la
+ 
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/api \
+ -I$(srcdir)/bflib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/draft \
+ -I$(srcdir)/env \
+ -I$(srcdir)/intopt \
+@@ -18,8 +16,7 @@ libglpk_la_CPPFLAGS = \
+ -I$(srcdir)/mpl \
+ -I$(srcdir)/npp \
+ -I$(srcdir)/proxy \
+--I$(srcdir)/simplex \
+--I$(srcdir)/zlib
++-I$(srcdir)/simplex
+ 
+ libglpk_la_LDFLAGS = \
+ -version-info 43:0:3 \
+@@ -27,18 +24,6 @@ libglpk_la_LDFLAGS = \
+ ${NOUNDEFINED}
+ 
+ libglpk_la_SOURCES = \
+-amd/amd_1.c \
+-amd/amd_2.c \
+-amd/amd_aat.c \
+-amd/amd_control.c \
+-amd/amd_defaults.c \
+-amd/amd_dump.c \
+-amd/amd_info.c \
+-amd/amd_order.c \
+-amd/amd_post_tree.c \
+-amd/amd_postorder.c \
+-amd/amd_preprocess.c \
+-amd/amd_valid.c \
+ api/advbas.c \
+ api/asnhall.c \
+ api/asnlp.c \
+@@ -104,7 +89,6 @@ bflib/scf.c \
+ bflib/scfint.c \
+ bflib/sgf.c \
+ bflib/sva.c \
+-colamd/colamd.c \
+ draft/bfd.c \
+ draft/bfx.c \
+ draft/glpapi06.c \
+@@ -202,21 +186,6 @@ simplex/spxprim.c \
+ simplex/spxprob.c \
+ simplex/spychuzc.c \
+ simplex/spychuzr.c \
+-simplex/spydual.c \
+-zlib/adler32.c \
+-zlib/compress.c \
+-zlib/crc32.c \
+-zlib/deflate.c \
+-zlib/gzclose.c \
+-zlib/gzlib.c \
+-zlib/gzread.c \
+-zlib/gzwrite.c \
+-zlib/inffast.c \
+-zlib/inflate.c \
+-zlib/inftrees.c \
+-zlib/trees.c \
+-zlib/uncompr.c \
+-zlib/zio.c \
+-zlib/zutil.c
++simplex/spydual.c
+ 
+ ## eof ##
diff --git a/sci-mathematics/glpk/files/glpk-4.65-fix-mysql-include-prefix.patch b/sci-mathematics/glpk/files/glpk-4.65-fix-mysql-include-prefix.patch
new file mode 100644
index 000000000000..4dd6583d6dea
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.65-fix-mysql-include-prefix.patch
@@ -0,0 +1,47 @@
+From 5cff695e9eb8405efbdfa976f1fad965c55436e8 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 6 Mar 2020 16:24:10 -0500
+Subject: [PATCH 1/1] configure.ac: attempt mysql_config to find the MySQL
+ headers.
+
+When building with MySQL support, the configure script guesses that
+the path to the MySQL headers is /usr/include/mysql. That is usually
+correct, but when people install MySQL to a nonstandard location such
+as /home/mjo/usr, it falls over. Fortunately, MySQL usually provides
+an executable called "mysql_config" that can output the location of
+its headers.
+
+In such a "local" installation, if I prepend /home/mjo/usr/bin to my
+PATH, then running "mysql_config" will execute the mysql_config from
+/home/mjo/usr/bin and will therefore output -I/home/mjo/usr/include as
+the preprocessor flag that glpk needs. That's the right thing to do,
+and it works just as well for a system install under /usr or
+/usr/local.
+
+This commit attempts to find the headers using mysql_config first,
+and falls back to the location /usr/include/mysql.
+
+Gentoo-bug: https://bugs.gentoo.org/597620
+---
+ configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 96c4cc5..d20a6ef 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,7 +145,10 @@ if test "$enable_mysql" = "yes"; then
+       AC_MSG_ERROR([--enable-mysql requires --enable-dl])
+    fi
+    AC_MSG_RESULT([yes])
+-   CPPFLAGS="-I/usr/include/mysql $CPPFLAGS"
++   # Guess at the include directory if mysql_config isn't in our PATH.
++   MYSQL_INCLUDE=$(mysql_config --include 2>/dev/null)
++   test -z "${MYSQL_INCLUDE}" && MYSQL_INCLUDE="-I/usr/include/mysql"
++   CPPFLAGS="${MYSQL_INCLUDE} $CPPFLAGS"
+    AC_DEFINE_UNQUOTED([MYSQL_DLNAME], ["$LIBMYSQL"], [N/A])
+ else
+    AC_MSG_RESULT([no])
+-- 
+2.24.1
+
diff --git a/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch b/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch
new file mode 100644
index 000000000000..1b78ece3e695
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch
@@ -0,0 +1,23 @@
+http://lists.gnu.org/archive/html/bug-glpk/2018-03/msg00000.html
+
+diff --git a/src/draft/glpios03.c b/src/draft/glpios03.c
+index 21d6a00..eb34ad0 100644
+--- a/src/draft/glpios03.c
++++ b/src/draft/glpios03.c
+@@ -920,13 +920,10 @@ int ios_driver(glp_tree *T)
+ #if 0
+       ((glp_iocp *)T->parm)->msg_lev = GLP_MSG_DBG;
+ #endif
+-#if 1 /* 16/III-2016 */
++#if 1 /* 01/III-2018 */
+       if (((glp_iocp *)T->parm)->flip)
+-#if 0 /* 20/I-2018 */
+-         xprintf("WARNING: LONG-STEP DUAL SIMPLEX WILL BE USED\n");
+-#else
+-         xprintf("Long-step dual simplex will be used\n");
+-#endif
++         if (T->parm->msg_lev >= GLP_MSG_ALL)
++            xprintf("Long-step dual simplex will be used\n");
+ #endif
+       /* on entry to the B&B driver it is assumed that the active list
+          contains the only active (i.e. root) subproblem, which is the
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
index 8236a7344d2f..e895918d23a1 100644
--- a/sci-mathematics/glpk/glpk-4.63.ebuild
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0/40"
 IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	sci-libs/amd:0=
diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild
new file mode 100644
index 000000000000..258796fa21ae
--- /dev/null
+++ b/sci-mathematics/glpk/glpk-4.65.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU Linear Programming Kit"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/glpk/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/40"
+IUSE="doc examples gmp odbc mysql static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	sci-libs/amd:0=
+	sci-libs/colamd:=
+	sys-libs/zlib:0=
+	gmp? ( dev-libs/gmp:0= )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.65-fix-mysql-include-prefix.patch"
+	"${FILESDIR}/${PN}-4.65-debundle-system-libs.patch"
+	"${FILESDIR}/${PN}-4.65-longstep_verbosity.patch"
+)
+
+src_prepare() {
+	# TODO: the ODBC library is dlopen()ed, so we only want to append
+	# -I<foo> to the preprocessor flags, and not all of the CFLAGS that
+	# were used to build libiodbc. That fix and the pkg-config fallback
+	# should be sent upstream, and placed into CPPFLAGS rather than
+	# CFLAGS (as configure.ac does now).
+	use odbc && [[ -z $(type -P odbc_config) ]] && \
+		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use mysql || use odbc; then
+		myconf="--enable-dl"
+	else
+		myconf="--disable-dl"
+	fi
+
+	econf ${myconf} \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable static-libs static) \
+		$(use_with gmp)
+}
+
+src_install() {
+	default
+	if use examples; then
+		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
+}
diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml
index 237a45406ed4..eef02da51bb6 100644
--- a/sci-mathematics/glpk/metadata.xml
+++ b/sci-mathematics/glpk/metadata.xml
@@ -4,14 +4,25 @@
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>
   </maintainer>
+    <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <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 lang="en">
-  The GNU Linear Programming Kit package is intended for solving
-  large-scale linear programming (LP), mixed integer programming
-  (MIP), and other related problems. It is a set of routines written
-  in ANSI C and organized in the form of a callable library. 
+    The GNU Linear Programming Kit package is intended for solving
+    large-scale linear programming (LP), mixed integer programming
+    (MIP), and other related problems. It is a set of routines written
+    in ANSI C and organized in the form of a callable library.
 </longdescription>
 </pkgmetadata>
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 74716a31145f..2d82297ca4f0 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,7 +1,4 @@
-DIST gmp-ecm-6.4.4.tar.gz 941058 BLAKE2B e83f02592a8bb86285f258fefc3e302cc5168888109e7f87835b25412baf526df58e5ea38347acfd926b90fac15b4103981a14aa7b853dba0cb0168467a223e0 SHA512 039009de2d1a22de7abed2e2b843fa2bc684ddcfc45892891a24b93ad4b3640a97d2e7612ebcbdbca8db032534c226ad77c67199772b21a6139e5fa205687097
 DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-EBUILD gmp-ecm-6.4.4-r1.ebuild 1501 BLAKE2B 48aa2b0e116f151507bfebc43ca33b413c29d5eb89364e608556b611302094dc8c0db497350c8001f4164822b89fedc1aa571dd3332c5182dc600f6cc2af5566 SHA512 131cef9c49bfdea884516a56b0b1ddf42602886555554c4eab112f17417f2b9838a3fc70ba7171f9eb9c882971bbc73bda1619b8f2a31986a08d2380c8abe4a3
-EBUILD gmp-ecm-7.0.4-r1.ebuild 1230 BLAKE2B 43eafb8be5dce1211467d2cb40ae5f0aa68306876a891a3160903eb71f1922c38091320d5f9f9bb66b8ac444eb48d9121b8743d13ee31b0ffb5825598e862f4f SHA512 3eb32837e3b7311fc9dda8592c9934da55191ee5b294de9d2d0540f20f6665f64234995f7e243ae4b39d63baba5787d5ca9724b51ea6e840090ca0b239ed50d5
-EBUILD gmp-ecm-7.0.4-r2.ebuild 854 BLAKE2B a87be49f51af233f60c6e0e3e8c90b95d90c1bbca35308c57e7f0c472d6c15eb5e4d4e41d2157e546373bf3ef73feab57dc431b5c7ccdcdd09b666cc603556e2 SHA512 b4af870ddacc1cc748c32459af13fdf373a794df59ab23c05cc7d01973dc5cc750fa169ce5765bf246019da13b01e7cc211ad0c704693ed83ef6e92180e06284
+EBUILD gmp-ecm-7.0.4-r2.ebuild 1283 BLAKE2B da1c9b2c779874c6ab1dc6fd2138b85c49f70ca1467d2ba021a50ab2b5bc70a64487a82e5986f0ca9ac86f4fb1d0916e55986be644ffefde5ed8aea9c23af313 SHA512 34e79c04c4454ec04ac07df58d11d9facedeb5f7a80c5553b1298f03401eb2bb33449134b0def1dba77e5b0cdbaf7ad87c3694f9f0310b6688c28f4a7d2a18dd
 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-6.4.4-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
deleted file mode 100644
index 463c145bb3c8..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/32159/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune -openmp static-libs 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() {
-	sed -e '/libecm_la_LIBADD/s:$: -lgmp:g' -i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-shellcmd is broken
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable openmp) \
-		${myconf}
-}
-
-src_compile() {
-	append-ldflags "-Wl,-z,noexecstack"
-	if use custom-tune; then
-		use amd64 && cd x86_64
-		use x86 && cd pentium4
-		emake
-		cd .. && make bench_mulredc || die
-		sed -i -e 's:#define TUNE_MULREDC_TABLE://#define TUNE_MULREDC_TABLE:g' `readlink ecm-params.h` || die
-		sed -i -e 's:#define TUNE_SQRREDC_TABLE://#define TUNE_SQRREDC_TABLE:g' `readlink ecm-params.h` || die
-		./bench_mulredc | tail -n 4 >> `readlink ecm-params.h` || die
-	fi
-	default
-}
-
-src_install() {
-	default
-	mkdir -p "${ED}/usr/include/${PN}/"
-	cp "${S}"/*.h "${ED}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
-}
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
deleted file mode 100644
index e650e69207f7..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/36224/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune -openmp static-libs 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() {
-	sed -e '/libecm_la_LIBADD/s:$: -lgmp:g' -i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-shellcmd is broken
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable openmp) \
-		${myconf}
-}
-
-src_compile() {
-	append-ldflags "-Wl,-z,noexecstack"
-	if use custom-tune; then
-		emake && emake ecm-params # need to build all to get benchmark bits, then run benchmark
-		emake
-	fi
-	default
-}
-
-src_install() {
-	default
-	mkdir -p "${ED}/usr/include/${PN}/"
-	cp "${S}"/*.h "${ED}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
-}
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 62d2aabe95ee..7ed81f19115a 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="
@@ -26,6 +26,17 @@ pkg_pretend() {
 	use openmp && tc-check-openmp
 }
 
+src_compile() {
+	default
+	if use custom-tune; then
+		# One "emake" was needed to build the library. Now we can find
+		# the best set of parameters, and then run "emake" one more time
+		# to rebuild the library with the custom parameters. See the
+		# project's README or INSTALL-ecm. The build targets don't depend
+		# on ecm-params.h, so we need to "make clean" to force a rebuild.
+		emake ecm-params && emake clean && emake
+	fi
+}
 src_configure() {
 	econf \
 		--enable-shared \
diff --git a/sci-mathematics/gp2c/Manifest b/sci-mathematics/gp2c/Manifest
index 9f11fb5eb61e..379ebed5b593 100644
--- a/sci-mathematics/gp2c/Manifest
+++ b/sci-mathematics/gp2c/Manifest
@@ -1,3 +1,5 @@
 DIST gp2c-0.0.11pl2.tar.gz 851845 BLAKE2B 599469af3e9975270e6d9f88c1209ee3da9ae9ab9bfc90abf2431e00d553d427c15a509278b099a133262b6d02d6fa3f06090bd0083c46c9488e697dc5da5245 SHA512 20f7fc61480a70d3f8811d7881e0f386a1ced522b5c538443dc0a9fe3332d37a67ba68441eb512b5fefdb761e232f9316704fa456a311651161da7b4653ca4b7
+DIST gp2c-0.0.11pl3.tar.gz 854003 BLAKE2B 478307b9fa56b8e58a66001bbeac3ce6193a446cb6a339bbd65de9105924fe92a0e9c39302d836c7f3e7d2fe100ac678514d4e7eef1bdb0b880cc55763002864 SHA512 06d3680da739ce13a0a80a88c7b07a9b336acecb95f4841d8e984f1d4b66ad0a3ffe47e2abb77ad7e564fa976d16c468d62e6ddc15ede3beba00db6d92a91d97
 EBUILD gp2c-0.0.11.2-r1.ebuild 742 BLAKE2B 455bef05ccc38ff584dbaef4519d0a639e5c2fbd16494ebd1dfd55e20aa0f17080f9457139f9de2626760f8ab5bfe34a248d748758749d96702ea8fa84de833e SHA512 3f45599208f38e26a70679478d17072613438502ddfd2702ee090c08d8e4272c04d50577aa5d852f8c6cb61c9709ec1c36e5ff1a996078e44f03874d28011fcb
+EBUILD gp2c-0.0.11.3.ebuild 743 BLAKE2B 317626f0ae673bf2f7bb5f5921c8a1c3c7f76b2e17b38926bf2c2b4901670bc3e74ceee1c4b35e04bb5657e04021f558126b5195ae9f2eba115843c58346c80b SHA512 17d40fccabedcbaca8e51bad72d3b39158a2587a29808088bf4721ab171739929049ac51eabf4e02fe547a7650f2da873b24dad4868f9ca7904faac643d56fb8
 MISC metadata.xml 886 BLAKE2B b4dfcb3e2de5064a3a537c6598814f7ec47a7db0a9bfefcc4cba78c373ed97d0ffa08fdd2ccbf049b28900c84afe8f594d7562fe35ad7c9a0ad59f2d63d9988d SHA512 71cf581ae9463fd7f4bb8eea880a940251571b076ec008d6ae2625c8158fb2562b8f4944e7092b05ba264b0bdb31ad31d4be2392ce8c1c82ff0452b513cf8ddc
diff --git a/sci-mathematics/gp2c/gp2c-0.0.11.3.ebuild b/sci-mathematics/gp2c/gp2c-0.0.11.3.ebuild
new file mode 100644
index 000000000000..b7314146b675
--- /dev/null
+++ b/sci-mathematics/gp2c/gp2c-0.0.11.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-"$(ver_rs  3 'pl')
+DESCRIPTION="A GP to C translator"
+HOMEPAGE="http://pari.math.u-bordeaux.fr/"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Perl is run on the build host to compile the descriptions in desc/,
+# see for example desc/Makefile.am.
+BDEPEND="dev-lang/perl"
+
+# This is the first version of pari to put pari.cfg where we expect it.
+DEPEND=">=sci-mathematics/pari-2.11.2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf --with-paricfg="${EPREFIX}/usr/share/pari/pari.cfg"
+}
diff --git a/sci-mathematics/lrcalc/Manifest b/sci-mathematics/lrcalc/Manifest
index 8f94804abb32..ed64891540ba 100644
--- a/sci-mathematics/lrcalc/Manifest
+++ b/sci-mathematics/lrcalc/Manifest
@@ -1,4 +1,4 @@
 AUX lrcalc-1.2-includes.patch 1939 BLAKE2B 37dc25d9219899cf9cd6268038715b927af294135f1acbebf5651fdfdcb50f7b041e53464c36f572201be411941d889b5ef7c1a20e31eda9915339ec378faf0b SHA512 d5ad549ddf23609870f6b15e389323bf26ea2c981c4af28c93dae7f70b4f7c96e242011213acb7c138ba9acc0ce0bc0c41d51d3fccf4cc5de331a12d965a46a6
 DIST lrcalc-1.2.tar.gz 363120 BLAKE2B d3f652abfe38e81331dcbac7068d087b198445bf02dc5ccb5bcbd76b9bbc329687209e6ccf40ecd09f166e7d2da054edd0e5c2b18503d8e4d961ae4ad91b5152 SHA512 699f4c2ddabe5879542d5c11f3df3979a4e009ad37741711a70fb48b4a0d4a7969e5bb110adb63d4473f3c2b61d1efdb7228a6b74c5dd7e1b5aea8cf1d170fab
-EBUILD lrcalc-1.2.ebuild 605 BLAKE2B f2636b067aca52fa77940eb0f07c44342639a429c838f80a0b465e3c633514750e7589f4f924db6368ce3377872251289f54821f27b0b638ea504e505e351bed SHA512 82504bee51054eb0a6325ac7e53c83c5310a9bd414b8734d6069b054f9db31e82c5182893c60b9183c04b2b96846a1583b3b3eb20ec98097c1e56919cd5c84c4
+EBUILD lrcalc-1.2.ebuild 603 BLAKE2B 3b496c19b6edef0ccffa01d4f83018a5e81b3d9a476e6d166ad1206130d1071b7ef7dd0cb172f95b50b01626801d557b9776cd1a0a483ee23e0517f5e8eaedaf SHA512 cecb3e191a63af99122dc5a0cf9d0fa1eb933ce5c98db7c991379c2fbff46bd914e1d7b2e62231cbf3f5cbb55c5cfe72c81cc6618374cc158bc6e63e160f81ad
 MISC metadata.xml 834 BLAKE2B d230c80d9552789e93a2f2cc9e1a8eac968d4762ceeba6103f92676cb709d45bf39b2b6820e889d11ad30c60493aec84076d8ee3f5f038640038655f3e2c5a07 SHA512 f54cc63235625646117f0d569fb69c3b3b66b5508fb65a65a3fb92811ff44f72df7546d44728f5882d2db9b70520036ccfda05cb58d9cf9dd3164132dbebbc57
diff --git a/sci-mathematics/lrcalc/lrcalc-1.2.ebuild b/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
index 563cb914f3bc..a3c74e53b017 100644
--- a/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
+++ b/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://sites.math.rutgers.edu/~asbuch/lrcalc/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 2815f775c064..48b470247149 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -19,5 +19,5 @@ DIST maxima-5.43.2.tar.gz 40871773 BLAKE2B a00a6ca06159d5acde195d9dc0f59d3a4b727
 EBUILD maxima-5.38.1.ebuild 4833 BLAKE2B 2c5ebe02be239596fbc93f30c9e135eac32f50a968283a18584d05c3739136d5f0bd1bcb4ce6e810016bb0d66f1e46139e7d208cc381a704a027bc3c99ace3b8 SHA512 cb3273aaaae70bff0b29ed8c9eee4e4aba0fe7b49cdf3249f478c4016be8ea2610adbb15490b1852f11c9f51beaf7bd5d62eb9ff9c53f9c4a541c7af52dbea93
 EBUILD maxima-5.42.1.ebuild 4917 BLAKE2B a8d765381cd94518b530811e67ca3c47899af78db8e0ac524c490619885944189fecff035b6f7dfcdd3fb5abdd94c40b62a8b97e1819544fbbc7120ea1bf075f SHA512 ad0e0c1d56cab25e2b3c0f494b2746c1dc7e670e02e6f002bf4a4e6728daefd7c975142cd22741347c11ea4e8c2262780c3e88f9adb86fdbe135031ca3a28759
 EBUILD maxima-5.42.2.ebuild 4920 BLAKE2B 200ad44b31fd224c37c302aa4dcfb6b46a83d7cf462d1aaaaf933f91d753d8375914ad0b6f254f3c8f4eae4f89b0bbdf1885c3e943cbe8587ccfb93999a4204f SHA512 6fdbedf61012c414dad5e9d2dbf6e705967d43dfced240a4378dd523aba99e51082cd4bce283c683192f780854a1f694461ef4600b49415ef33503a8f1d03c2e
-EBUILD maxima-5.43.2.ebuild 4999 BLAKE2B 43e7908ec49474564c59f9c03e8db28411806efb9851e36dc78398057a4aeec48f1190132a92fb540ba06ee724730b54e4ab0f6819f54ded6ae1ba502c301a27 SHA512 4f493e9f5fe0a2e9d66c331e9499e908cb985f91194587c37edd4df95875cde66a1eb2a782bd87b81bdde020965a59d05942bb7d065b795610fe8ec78c740158
+EBUILD maxima-5.43.2.ebuild 4981 BLAKE2B 1533fed6bce9d74afa336783ae413a1ce282d1e84887b226c57d67da6afc2a909ac7ab0d23b31145098e9dc5270c12a5e29dd0bc7668e7ff12745d8277c9d90a SHA512 045f36bc99313f2d8e065ce5c450e346701e88ddf9a8f0f8fff05505ed141896c72fc413b233e651645bf72c5ae6079d782abf090f323550a353ffc50243459a
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/maxima-5.43.2.ebuild b/sci-mathematics/maxima/maxima-5.43.2.ebuild
index 7c68f0a0e322..d139d3dcda03 100644
--- a/sci-mathematics/maxima/maxima-5.43.2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.43.2.ebuild
@@ -32,7 +32,7 @@ for lang in ${LANGS}; do
 done
 
 # texlive-latexrecommended needed by imaxima for breqn.sty
-RDEPEND="!app-emacs/imaxima
+RDEPEND="
 	X? ( x11-misc/xdg-utils
 		 sci-visualization/gnuplot[gd]
 		 tk? ( dev-lang/tk:0 ) )
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 1282a3642906..63563bf553ac 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -15,8 +15,10 @@ DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648
 DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
 DIST octave-4.4.1.tar.gz 28626462 BLAKE2B 0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6 SHA512 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
 DIST octave-5.1.0.tar.gz 32034788 BLAKE2B d387f41f6ae826b35735fc4208d71be84076a81544f5cd0e3d5410f41a70eebb5b0b3bbf19e4344b88901869d54f2759259dc374c44a430f681d3b0c32cb02cb SHA512 a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb
-EBUILD octave-4.2.2.ebuild 5102 BLAKE2B 08512a3fd0d084a5e56cc0de1c6c22c171efe525a64a48e712261911d188f0a2d879b9d5b233d14bd6a69a937fa9370f50432dcabdee21f547c94823ce3f19e0 SHA512 56d2c1b5cb19657801bf47cb8eb1d9ea519da2631e113b7750fbd8d57a8a192b8903085ec361ac8af8aaef2f8fa624bbee6be7a3022e071e5d78102c339dc0a3
+DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
+EBUILD octave-4.2.2.ebuild 5103 BLAKE2B 690f0a397a887a26d0ad7dc31af6893af0ccafed623013d02f2f79e9683a558827e313f2c3a46b035eef754662ed26691c8b56be5cf05a5b79b41604f37635b1 SHA512 7534b737c7e9c9b56ac768b00f46c3ff79ec5362c9f73f3deda6e41776f2e4d254189c22ccae32d723481fb1c675f8bc1cd7af8783bfd6dc6c51e4ebb8e99f7f
 EBUILD octave-4.4.0.ebuild 5082 BLAKE2B 8736fa239d93b6847d413e50cf75427bf16407814d5d32f55f2d8688b57fbeacb471afd2a86ec8c1f6a1c1da11882a40dd221e5eea9fdd0ad59e224c0f1e5d65 SHA512 b71030ab908c404a3672d1df9f85e2cf3aa99f4e6e968ae90a95af228912e4615e869d58efaa018a7cb1300d4630111af82bc306b3d1e56340df5dbd1065bd32
 EBUILD octave-4.4.1.ebuild 5180 BLAKE2B 495f7aa6fc5508fbe2285e5fbc8eb7a4055d84e538384487c3f535f9d5cb90bb3c0d896455d05a02878d786a0a338373380f8e955415673a625db17cc80a14fe SHA512 b26dd91d325a55a94da6eb4bba15f279f3d8c80dcecc19c53ff3d8c43c664aea45769b0f3310a38addab326bf6bc59aa6b88b2b07981d731803d82865989250d
 EBUILD octave-5.1.0.ebuild 5076 BLAKE2B 6f843fc6ff0157c6e4f80aaa2f2cc056c4215483e0b62b809821e8f81234caf8be57bb9232fd305fb2bf8d4266de452b7efa20c208a23f4aa7ca4e038785adb3 SHA512 41f83b3a3431a103b10a654573a8d7cb5eb1f45b79125e15818d8f2850faccd5266ee24ee102e4bed0452ba17a3d8999ca755830fea353ada4dd973282a5b0d1
+EBUILD octave-5.2.0.ebuild 5462 BLAKE2B 9b76e5654e712b254cf2151bd3cad205a63bb064ce0b58d717c73097a8f7ffa2ed1e2abfafd1d30f6e6e7a2913a0159b8c27f069dc6640471302c34d5d77b615 SHA512 77d4843fb0499f145a3ac77f166c8f5eb92f236acbd48154c70c94e02a2bcb74175a0e28384686e7a4ab42210892a47d3578d26b25947d0a0f41b611da0f132a
 MISC metadata.xml 1137 BLAKE2B 69a3d32e58fcf2f855b54664e1fb4e0f2eec69bd8522218957320a0d0f8bf67fb8d5e28f7f108d3baf7992454adef3a416d4bdae9d7b4fd2bfe77225de17a69e SHA512 7351fa4b9a696406543cda7246378e4b4df4dad3033f9a87e4c5036663fc32965c7db45d8ff32959904a9bf71cff88484b542bc3e20ea0ee946a0025c091a345
diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild
index ec97d6fd7401..8600b40098fd 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/bzip2
diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild b/sci-mathematics/octave/octave-5.2.0.ebuild
new file mode 100644
index 000000000000..5d9b11ef5c5e
--- /dev/null
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/octave/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
+	portaudio postscript +qhull +qrupdate readline sndfile +sparse
+	ssl static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/bzip2
+	app-text/ghostscript-gpl
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	virtual/blas
+	virtual/lapack
+	curl? ( net-misc/curl:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
+	gnuplot? ( sci-visualization/gnuplot )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-libs/qscintilla:=
+	)
+	hdf5? ( sci-libs/hdf5:0= )
+	java? ( >=virtual/jre-1.6.0:* )
+	opengl? (
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		virtual/glu
+		>=x11-libs/fltk-1.3:1=[opengl,xft]
+		x11-libs/gl2ps:0=
+	)
+	ssl? (
+		 !libressl? ( dev-libs/openssl:0= )
+		 libressl? ( dev-libs/libressl:0= )
+	)
+	portaudio? ( media-libs/portaudio )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		media-gfx/transfig
+	)
+	qhull? ( media-libs/qhull:0= )
+	qrupdate? ( sci-libs/qrupdate:0= )
+	readline? ( sys-libs/readline:0= )
+	sndfile? ( media-libs/libsndfile )
+	sparse? (
+		sci-libs/arpack:0=
+		sci-libs/camd:0=
+		sci-libs/ccolamd:0=
+		sci-libs/cholmod:0=
+		sci-libs/colamd:0=
+		sci-libs/cxsparse:0=
+		sci-libs/umfpack:0=
+	)
+	X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	java? ( >=virtual/jdk-1.6.0 )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )"
+
+# Removed "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
+# because I think Z_LIBS are added to LIBOCTINTERP_LINK_DEPS
+# in the top-level configure.ac now.
+#
+# Both "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
+# and "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch were removed
+# because this support has been broken upstream for a long time,
+# and a fix that involves "using namespace Magick;" was rejected
+# as far as I can tell. Moreover, the configure.ac patch no longer
+# applies. In the meantime, I've remove support for USE=imagemagick
+# and USE=graphicsmagick.
+#
+# Removed "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch because it was fixed
+# in https://hg.savannah.gnu.org/hgweb/octave/rev/cdaa884568b1
+#
+# The texi patch is upstream as https://savannah.gnu.org/bugs/?58057
+# and should be in a future release.
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.0-texi.patch
+	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	econf \
+		--localstatedir="${EPREFIX}/var/state/octave" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		--disable-64 \
+		--disable-jit \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
+	default
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		dodoc $(find doc -name '*.pdf')
+	else
+		# bug 566134, macros.texi is installed by make install if use doc
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && \
+		java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
+	doenvd 99octave
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/sci-mathematics/planarity/Manifest b/sci-mathematics/planarity/Manifest
index c04b9ef8f09f..664e7a5cd236 100644
--- a/sci-mathematics/planarity/Manifest
+++ b/sci-mathematics/planarity/Manifest
@@ -1,4 +1,4 @@
 AUX planarity-3.0.0.5-extern.patch 591 BLAKE2B e8c6c75fdb587f10d38023daec5806ae0930dd4c4be1a74fa11fdd2d837a5b5904948a01601702a5de160725dd60214e0de2aa014f20e41dc957e0c4b24f36f4 SHA512 6fb06c58f853ddaa2fe308a8104db4fee1d6021f4ece9f3f6438ba667e65167f248ac6b3b674e997380f2c874447deda1b7be6dbec2f2c66c188ae5cc8c09bc1
 DIST planarity-3.0.0.5.tar.gz 492644 BLAKE2B d183bc07cab7246b62cc7340956206e3f6c5999aa92b223e7665ebd8ae1bc0c354011c078ea4f42d2e45efa2ae5e83e082e4c8d80e3391a4f20be1020ebf8188 SHA512 dfeb7e024e1f5758e5abbd854c4ca963b4f5d45433b2c5eb00ce85c154b5407ebccd1ace0db167488dee757db2c23367101a2aa568941a3664bac9058ea24328
-EBUILD planarity-3.0.0.5.ebuild 967 BLAKE2B eb1c2d9b9e174118bca3896651b44ab5d93328e5aaee5eaaa4fde52631d437e53b3e7a6d706ba0366bf9f583158858973d92aa0ca15cd0d8a61c41bba73f2eee SHA512 653e5762d8e63dac31116e5c2a6c8ed7d3114be538fae84c487cff9478c536d6223cf0d42fa7673ef8c85eaa57f75c31b6c302403da91439ecea71839e30ae8d
+EBUILD planarity-3.0.0.5.ebuild 965 BLAKE2B 22f69cf8ce923ef032264bfe35c95ef969b2e6efa0d59214d9e4c7b7a2305e9f4b02543ae6f76c3301d2efe591caf8755be99d6f2377e90b6a7b634b8667846b SHA512 0d61d50250dc39bef0013e9a1e9b838afd0c9edc166d6e419dc6932b50475ebaf2262cd8afaace8e0fe081aa621e4eff3b476bd3b4c14f8c2a9ca9aec1492cef
 MISC metadata.xml 778 BLAKE2B f20aefc29faa94ac4305f4e63a1732ea4f8a6de80bc5289909f215558e8a662bd91b9a7dac87f60c05d2468f1effb7cfa725dd3be27a8594a0cf4a9a2a2b5ff0 SHA512 f4ee0f9f009eb40865f7fb2f849442ad2201f67a494574c40e94c1cc82ef56cd744fdbe5e5b41dddfdf3914ae7f6835bdc008d1a970a65211fb2971905cc0405
diff --git a/sci-mathematics/planarity/planarity-3.0.0.5.ebuild b/sci-mathematics/planarity/planarity-3.0.0.5.ebuild
index e0acab922a49..e9cb127f19fd 100644
--- a/sci-mathematics/planarity/planarity-3.0.0.5.ebuild
+++ b/sci-mathematics/planarity/planarity-3.0.0.5.ebuild
@@ -14,7 +14,7 @@ IUSE="examples static-libs"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # https://github.com/graph-algorithms/edge-addition-planarity-suite/issues/4
 # https://github.com/graph-algorithms/edge-addition-planarity-suite/pull/3
diff --git a/sci-mathematics/pymc3/Manifest b/sci-mathematics/pymc3/Manifest
index 152c08a7e338..516fc1e3ee69 100644
--- a/sci-mathematics/pymc3/Manifest
+++ b/sci-mathematics/pymc3/Manifest
@@ -1,3 +1,3 @@
 DIST pymc3-3.1.tar.gz 34553828 BLAKE2B 73c4d50f7d656322fa1a7384aefa1f46caacccc8055138fefc27a82d765866efb9d4853a842a2df312058c558edd66b37a40295904c86f023f8fec5503877206 SHA512 30799d9c1b670adbcf5cc1463029d71a87c7b917e83b1f6cb453d75553616da7173421e7ae6e31b332c85f8170daea735344ff83ba6605cf3b15cf79c5c4fb97
-EBUILD pymc3-3.1.ebuild 1572 BLAKE2B e44ba3893aa920b20d9a623605fbf7d2d3dbe8f88ab276e28c5d6b4100d58c8610a153b9e8292ff9383da9be89f1eefbad5776137cce6a5535e1e6d6f2d92406 SHA512 746a9c4b3dca0563cc512d50fcb7eb9bb3f9c253e77628dceb243a8c616c9b0d4556e2add7e8ea4b34aacff7cc2e90d58f4f0d464cc3a0eb86158dacc154a121
+EBUILD pymc3-3.1.ebuild 1531 BLAKE2B 8e497bc9fa347d879cd356bad2100fdb60c91c35838d703010f2ddd990bd7a0c773b143fafb3eef1f29b33bc682f1141bcf545c51a4ab57a42a63405d439eaed SHA512 d9f0c88fb2708626e2778c163bf0b31031e219c664356c11478ede36923e8c288af260167fd61711282fe40a70ffa588a84b63002b8207bc0796d5063a741a62
 MISC metadata.xml 740 BLAKE2B 2c56161497137f40e0e25e85299af90c361ddbcaccb4436747ba111e725c9a881fdf88944dd0208909275bf4013b9e1d5983b590ad7f46589f584549288aa02c SHA512 c75ed4b57479fef93c4b667792cb284212f859532697c4d4876e2dc23ab13d2c470143d3236de03e741a0797049a12d3a7e2f0d2ae4f07b2cfb0b7943c78526d
diff --git a/sci-mathematics/pymc3/pymc3-3.1.ebuild b/sci-mathematics/pymc3/pymc3-3.1.ebuild
index 1b1dad62cb0c..3c95b008123c 100644
--- a/sci-mathematics/pymc3/pymc3-3.1.ebuild
+++ b/sci-mathematics/pymc3/pymc3-3.1.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 	>=dev-python/theano-0.9[${PYTHON_USEDEP}]
 	>=dev-python/tqdm-4.8.4[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.12[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/sci-mathematics/rw/Manifest b/sci-mathematics/rw/Manifest
index 6f4d78083495..86b3e0904e57 100644
--- a/sci-mathematics/rw/Manifest
+++ b/sci-mathematics/rw/Manifest
@@ -1,3 +1,3 @@
 DIST rw-0.8.tar.gz 217215 BLAKE2B e6f379ce7cde0fafb0c6e234e8958018c0682ad47e60da3755a891b7eee4c910e84556252a333a12fe0cf2eac88863a272cb8fa6d2cfa4c9f1e93bd88bc6a2d2 SHA512 609d46fd3c76e2eb1724cc3e3ff9354d13b3c15ce23b96bef9f73f02b490e1d8713146230db079fcc87f45f5acc0e04130dac04e27589836e20891c63219f3ec
-EBUILD rw-0.8-r2.ebuild 997 BLAKE2B b0672882fb55ce59d0a61ad2dbb2af244ee10fb28b7360cfca9b5b5c107ef2479f5c6958dd61d6c207791079f30d540b557a8f72ed3acba993d1bb29a049edb8 SHA512 db1098d25921b53f35768eb7a465283a79c38a3e6cdaa17c19d7bbe1203ef52b39e596490dcbab8e0cb69161d04dcfd3f760df890aaec4325ee7f6b8470ec13d
+EBUILD rw-0.8-r2.ebuild 995 BLAKE2B f9b78b421a24cedc9a347f63b22e5b33d8cf115121724705207fae590c303d1956b2001f91e3735332b748ef189fafeb42d04f6844a66881790152babc76cfb5 SHA512 2fd5999820443b7d755814af961b1e1c862749180ffc6c3815be15cdc3790c036a2de5c4e4a02d5bf316c7cb1e0b6b024c86484a0a6022b831ba91ba73554660
 MISC metadata.xml 1128 BLAKE2B 30c263e8a47107c0c5d9a7ee5377a5deaa6260767734361b85eca07f5c1a88d8f2375f2c5d20a28cd1241fcf70a2dfcff16a7fc2886977dfd9f25b5388aa73bb SHA512 34ec83d5cf7d7ed12ef6c58291a6a1b8323d580121e8b489dadc569f09b184e6952cefd934da504542a7a4cbe5c59a781ff703dec21c7ee4010f31153144328c
diff --git a/sci-mathematics/rw/rw-0.8-r2.ebuild b/sci-mathematics/rw/rw-0.8-r2.ebuild
index cd1ab5d589b1..bc5bc34162b6 100644
--- a/sci-mathematics/rw/rw-0.8-r2.ebuild
+++ b/sci-mathematics/rw/rw-0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 # We have a file collision (librw.so) with xpaint, bug 560210.
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index adf65b94c5d8..e0199dadd995 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,3 @@
 DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46 SHA512 d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1
-EBUILD z3-4.8.6.ebuild 2331 BLAKE2B 62d1efd6f32d39fe38a5d45750ccf579755084771f2e501ebcc42ead957581bfe007dab981c976fdd348d9ba08d1d52694fcfe5a0627b3e3b1c02a408905863f SHA512 759a9b8c0a1309226bd14ac0c3c1836c9e1bf70d4d14f82d9a4337a78e3ee4ddf068a8d4d8e421c7cd97697fd11a5a05addc48055de5cf78ee844262b0dbdd74
+EBUILD z3-4.8.6.ebuild 2335 BLAKE2B e980e31d4d6ab4443b7b385c66aa1a71ab062d4783e1947d1a2d9688986729a19769813e22cb7395d9a8a1a45e1fb898da1a8e6c923c8486aa8dccd601f9874b SHA512 214122932dcbb1cef0e3d3617e37e3057936b28afc7d70fff2fe08bfcaad963516d48f20fe65efaf80729f5ab070b562aa574c163f908c82b620846e5cda7982
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/z3-4.8.6.ebuild b/sci-mathematics/z3/z3-4.8.6.ebuild
index fe56e09602bd..fca0f4ef0b6c 100644
--- a/sci-mathematics/z3/z3-4.8.6.ebuild
+++ b/sci-mathematics/z3/z3-4.8.6.ebuild
@@ -19,7 +19,7 @@ IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[${MULTILIB_USEDEP}] )"
+	gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.8 )"
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sci-mathematics
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)