gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /sci-mathematics
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
58 files changed, 1131 insertions, 1020 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index d4a782a20533..d3f74aba2e15 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/agda-stdlib/Manifest b/sci-mathematics/agda-stdlib/Manifest
index 854bd5c659da..b302dfcd9db8 100644
--- a/sci-mathematics/agda-stdlib/Manifest
+++ b/sci-mathematics/agda-stdlib/Manifest
@@ -1,7 +1,5 @@
 AUX 50agda-stdlib-gentoo.el 58 BLAKE2B e9b9bef913e26c63e4b0e19a1e4b5c0e370959689ae18e74ed54e7a8c1415c19fb517af9be59feee3e636042bc22fb68f1fd5457f551a436b920b42685aec1f4 SHA512 f45f0e59a1becd5d2b13b452219cc77b553dad9480a848ea62f276e106ab911ed1594e826fe487b886fe9b6e8aadcfde47de4fb1b0ab144ae98b6ac9eb385cfd
 AUX standard-library.agda-lib 55 BLAKE2B 057e933b07b291fd505f2e64f43b087c2aa4f4828ba2a03b5a53b9cac0f0fd0ab1f523c91efd6090e34e376dcc61d90bc5193063b6f07280c0eb2d688a07dedc SHA512 b1e2cbffe4b99157661fe6f4685580c7524890735db0a20ae1942e076b00d0df13624f587ea7584319e5665484da63beb3e0e5c77226bdbe02a4a80fa33a17b4
-DIST agda-stdlib-2.4.2.5.tar.gz 253379 BLAKE2B c635040892bf940057bacf35f85fa6b7e3b49d1877ca7310933c27312b37566f3df077ad021d34e7855daa1e23b2495df82fe288e8416a11f630beeb313ca027 SHA512 b15ed5838916240c8602fe7a4bccddf43c71ab3a18ecb5a6dc85199b908e261b04cf794a4d93c90af0a9263a36603c392280639ace7fecead0c39269c2623302
 DIST agda-stdlib-2.5.2.0.13.tar.gz 264701 BLAKE2B f35b419aac1b80af86217a86fb8e21a2f3427ef9629c8f2e284036859cd89da16ce1b64ceb87f8a3030b5bdb2a68b4f59f74a717fc1e13378ecb20cc6b28f59c SHA512 340a7b9cb15793cdbe99f558a32eaab3476b94b4d43d45bdc92c6b368197d075c977fd2f6ce0c5b0baf584289a2218b07dd030ad2b83f6d9e4bc7effee91eece
-EBUILD agda-stdlib-2.4.2.5.ebuild 1914 BLAKE2B f76f7e595d75dcf99b1e6968fd2b1c458e951b1e2807f7110261830cad2b1b436964c826764ec59e5093712dd6ca1b999746b1321a00d902f9e9891bd9ef01cd SHA512 40c9829fe63f6041253dc022c072fc1eca9e8fbdb1945c6d2f89e278cc051df05534397919691b52638a46e656bd6455db185f0dccd1899d581c85be0c6708d2
 EBUILD agda-stdlib-2.5.2.0.13.ebuild 2175 BLAKE2B debbd1f201004b20b3e41ad446eac17e2e5ae53175d2c5c56e1a35e94239835d337f5f87bc9b2f03b39a8b7bc1f52476cf02147f5c47fab5ce9e18aac4086e25 SHA512 18c5b73a3dc72a8ee6839381428f27617d299f7c0f61af6c10ce32279e9d50b43b6a36ae02ed675ee1a196914d7f1a2331318976e038c6fc827ec66f95cc9a23
 MISC metadata.xml 584 BLAKE2B 9d0eb0995feecbe10282cabba0b56dfe8278149f16840a477b55e6cf63675c79a642922eca2980f193447b1cdfdb59c4f1524a6cd9ec264175e2a753de6b918f SHA512 5d4446db6dac997893534b330f16a5631ff7472fa9178ced3c7300848a0c1733718985f3f6fa2f39adb905e973f8926371043cc08dac99e795e62850e1f2f2dd
diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild b/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
deleted file mode 100644
index be6d6baf3910..000000000000
--- a/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Agda standard library"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://github.com/agda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile +ffi"
-
-# filemanip is used in lib.cabal to make the GenerateEverything and
-# AllNonAsciiChars executables, so agda-stdlib does not require a subslot
-# dependency on filemanip.
-
-RDEPEND="~sci-mathematics/agda-${PV}:=[profile?]
-	>=dev-haskell/filemanip-0.3.6.2[profile?] <dev-haskell/filemanip-0.4[profile?]
-	>=dev-lang/ghc-6.12.1
-	ffi? ( sci-mathematics/agda-lib-ffi )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	cabal-mksetup
-	eapply_user
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-	"${S}"/dist/build/GenerateEverything/GenerateEverything \
-		|| die "GenerateEverything failed"
-	local prof
-	use profile && prof="--ghc-flag=-prof"
-	agda +RTS -K1G -RTS ${prof} \
-		-i "${S}" -i "${S}"/src "${S}"/Everything.agda || die
-	# Although my agda-9999 build has
-	# /var/tmp/portage/sci-mathematics/agda-9999/work/agda-9999/dist/build/autogen/Paths_Agda.hs
-	# containing:
-	# datadir    = "/usr/share/agda-9999/ghc-7.6.1"
-	# it fails without the --css option like:
-	# /usr/share/agda-9999/ghc-7.4.1/Agda.css: copyFile: does not exist
-	local cssdir=$(egrep 'datadir *=' "${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir    = \(.*\)@\1@')
-	agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" "${S}"/README.agda || die
-}
-
-src_test() {
-	agda -i "${S}" -i "${S}"/src README.agda || die
-}
-
-src_install() {
-	insinto usr/share/agda-stdlib
-	insopts --preserve-timestamps
-	doins -r src/*
-	dodoc -r html/*
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-}
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 7334f7c783c0..d2a3e137974a 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,8 +1,4 @@
 AUX 50agda2-gentoo.el 317 BLAKE2B c295509014fc7f254c5c0650b079d3827b182270c6e1aa3d1ddf4f4076d94115f0168d4ad0c96a876be57ead4db26219e594a9afed3aba2ce3cab30e8cf19060 SHA512 55b7438896cb66b4b32b0ba0d9468bb2496df1f63a78f3f4b4e19cc038018605c9cbd7880d2be1b40d6d1509ac6df20304cdc8c2ccde69e89777acfc65a1ce8e
-AUX agda-2.4.2.5-hashtables.patch 558 BLAKE2B 88532103f488b643ac84ad37fae3776514034121624c43610910c44a67ac0e68cc5d5d8afece38e2fbf95dbaa3e268e2418d1c34ba4a8fbc60637d63765be42d SHA512 0297fc4605db3dc11f08ec068cfdce908d273c6d14f472e4d00b4416a8e5f671b3b77d4e0cb671671bafd07b39ec46e72eab6cab972145199b25b3c4cfb0b3a6
-DIST Agda-2.4.2.5.tar.gz 1031427 BLAKE2B bf64731e0c068c4f609e9651f0cb6ea763f1e02ddd8909269a140f8ebd036dbb5b36d9f1b038a32016447bbfbd4f9dd6a00a1cc34616efd7099a2b4ddcc7d3bc SHA512 c2e090a42f699200854c20dad868b4b67e99107f0cdbba20ed268f4618fcf80068ee31db37e4b6637f73128d9f652ef9276d8f7adea54628da759d79f5e4f4a2
 DIST Agda-2.5.2.tar.gz 1240885 BLAKE2B bccdaa0c40b8e116f44ee436171cec0a8e1366d7b1f0b469bf459eacf4256e29a00c60a371dcf7971c499e948ce6264861016bb51fcad3251f62cb3e7370c19c SHA512 39ec73316eb7409f7f2618e86a9a3a2c420c93470bf46a1c37a4c4753c6c831d2d6da9ba007086ddee9defd481a695bf142a0a7d360dfa01bdb1fb92467af164
-EBUILD agda-2.4.2.5-r2.ebuild 4436 BLAKE2B 95e7429fdf3b03505aa2357e2ff7da7b9246d371cf595a26ef9d05dc23d42f4b1267a4cc3759a89ecd135e77ce390fc9db8ed333591159286dae6f594f8931b7 SHA512 8a0f546dc68745851a8083db3a8dff1e141b727026be86ab207ce848500553964cea1c3ca16ef4ffb3492cc13011ccddd50b03fe7dc63723a6f43730d97c075b
-EBUILD agda-2.5.2-r1.ebuild 5270 BLAKE2B fadb3f989c59b25c576376534c43b16d896f99d6cfb349c9ec59364428eec21651943e5a71daf6951aedda6fe8bc97b031b670652dae66ff954dca20fbcb070d SHA512 9de1a2016cdb763df7e450c80514417f3cff228fe97b3a2f7041722b3a09904c99a24e5c152bba54ea10c28b8c37c2b2ac2a5f1a68ef00d38e8335f93159332d
-EBUILD agda-2.5.2-r2.ebuild 5305 BLAKE2B b5fe5d674d023921cc3a6e3a13d281d3289306f0d7ad08b0f1402fdabff79d8ae7a58ac9a17437fa298d142ee601b02256222bfdbec8994d687ad61522b16e65 SHA512 faa7262d365ebdfb1d3b19e4ee2c1a7b8d4e02d91fb414fba5fedee4da92e6027690fa00e6fc92714e22920f43753d059e79841cebafc6bc2ef8e2f3fa77090c
-MISC metadata.xml 907 BLAKE2B f4890d2c0e7c8d3eeb57ad9472ae3b5ae287fc7880fa853ec5d1a6c9867aa3e11ef71cd5b46ed5e9fd9e3c3307eea1260c4aa0d9f1598de64f48f43e0c2af137 SHA512 d48af119f929e739634165e1ece14ef2bf55eb996fd0852fd34783a18da04a156bf858b3f0a7ad3cd5c85e55c564bfb3e5552786161fd2ad66f86eb5d3d91426
+EBUILD agda-2.5.2-r2.ebuild 5012 BLAKE2B 2632473b655f5331674f251697f37989a02a8e217c523492a2223ea5a5d9989677316b91a5bc35e9989d85c55012bf9bd133e6e037b3a631fb19617c2d195de1 SHA512 a6caec191849f979c4ea3777b3601a8bf2783e9324e86cf6cd632e1b9ea0c10914db976621a697e53fabfb0f1d42aa2528678298c58e639ca17c55455dbe32c8
+MISC metadata.xml 848 BLAKE2B d9882eb994ae956610051e9a634584c99b5725e77184649a9a68716fd07d70cce7d22ad77c2785f3ec6c4f96ccb333d72db40f1e97162371ab1390a9a55f09c2 SHA512 48e8e93adaef133b0491f96f93e5dc3c57ebe235f1568aeb649e10e6fe9eced0cb421cd801e1f0f24c27c084a3efcb58855032a14c74e87d806ab41da0ebff37
diff --git a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
deleted file mode 100644
index 63b99d3e1cba..000000000000
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-MY_PN="Agda"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A dependently typed functional programming language and proof assistant"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs +stdlib emacs"
-
-RDEPEND=">=dev-haskell/binary-0.7.2.1:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?]
-	>=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?]
-	>=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?]
-	>=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?]
-	>=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?]
-	>=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
-	>=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	>=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/quickcheck-2.8:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?]
-	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.3.3.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/void-0.5.4:=[profile?] <dev-haskell/void-0.9:=[profile?]
-	>=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-haskell/zlib-0.4.0.1:=[profile?]
-	>=dev-lang/ghc-7.6.2:=
-	>=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?]
-	>=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-"
-RDEPEND+="
-		emacs? ( >=app-editors/emacs-23.1:*
-			app-emacs/haskell-mode )
-"
-PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${PV} )"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.16.0
-	dev-haskell/happy
-	cpphs? ( dev-haskell/cpphs )
-"
-RDEPEND+="!sci-mathematics/agda-executable"
-
-SITEFILE="50${PN}2-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-hashtables.patch
-
-	sed -e '/.*emacs-mode.*$/d' \
-		-i "${S}/${MY_PN}.cabal" \
-		|| die "Could not remove agda-mode from ${MY_PN}.cabal"
-	sed -e '/^executable agda-mode$/a \ \ buildable: False' \
-		-i "${S}/${MY_PN}.cabal" \
-		|| die "Could not remove agda-mode executable from ${MY_PN}.cabal"
-
-	cabal_chdeps \
-		'zlib >= 0.4.0.1 && < 0.6.1' 'zlib >= 0.4.0.1' \
-		'transformers-compat >= 0.3.3.3 && < 0.5' 'transformers-compat >= 0.3.3.3' \
-		'build-tools: cpphs >= 1.19 && < 1.20' 'build-tools: cpphs >= 1.19' \
-		'alex >= 3.1.0 && < 3.2' 'alex >= 3.1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpphs cpphs)
-}
-
-src_compile() {
-	if use emacs; then
-		BYTECOMPFLAGS="-L ./src/data/emacs-mode"
-		elisp-compile src/data/emacs-mode/*.el \
-			|| die "Failed to compile emacs mode"
-	fi
-	haskell-cabal_src_compile
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	dist/build/agda/agda --test +RTS -M1g || die
-}
-
-src_install() {
-	local add="${ED}"/usr/share/"${P}/ghc-$(ghc-version)"
-
-	haskell-cabal_src_install
-
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	# generate Primitive.agdai, emulate Setup.hs postinst phase
-	Agda_datadir="${add}" \
-		"${ED}"/usr/bin/agda "${add}"/lib/prim/Agda/Primitive.agda \
-		|| die "Failed to build 'Primitive.agdai'"
-
-	if use emacs; then
-		elisp-install ${PN} src/data/emacs-mode/*.el \
-			|| die "Failed to install emacs mode"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "Failed to install elisp site file"
-	fi
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
diff --git a/sci-mathematics/agda/agda-2.5.2-r1.ebuild b/sci-mathematics/agda/agda-2.5.2-r1.ebuild
deleted file mode 100644
index 1c7e55a7ad8d..000000000000
--- a/sci-mathematics/agda/agda-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-MY_PN="Agda"
-MY_P="${MY_PN}-${PV}"
-
-## shared with sci-mathematics/agda-stdlib
-# upstream does not maintain version ordering:
-#  https://github.com/agda/agda-stdlib/releases
-# 0.11 -> 2.5.0.20160213 -> 2.5.0.20160412 -> 0.12
-# As Agda-stdlib is tied to Agda version we encode
-# both versions in gentoo version.
-##
-MY_UPSTREAM_AGDA_STDLIB_V="0.13"
-MY_GENTOO_AGDA_STDLIB_V="${PV}.${MY_UPSTREAM_AGDA_STDLIB_V}"
-
-DESCRIPTION="A dependently typed functional programming language and proof assistant"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs debug uhc +stdlib emacs"
-
-RESTRICT=test # Unrecognized option: --test (did you mean any of --help --js --css ?)
-
-RDEPEND=">=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?]
-	>=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?]
-	>=dev-haskell/edisoncore-1.3.1.1:=[profile?] <dev-haskell/edisoncore-1.3.2:=[profile?]
-	>=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?]
-	>=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?]
-	>=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[profile?]
-	>=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
-	>=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?]
-	>=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?]
-	>=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?]
-	>=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?]
-	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.3.3.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-haskell/zlib-0.4.0.1:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	>=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?]
-	>=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?]
-		>=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?]
-		>=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?]
-		>=dev-haskell/uulib-0.9.20:=[profile?] )
-"
-RDEPEND+="
-		emacs? ( >=app-editors/emacs-23.1:*
-			app-emacs/haskell-mode )
-"
-PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${MY_GENTOO_AGDA_STDLIB_V} )"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.22.2.0
-	dev-haskell/happy
-	cpphs? ( dev-haskell/cpphs )
-"
-RDEPEND+="!sci-mathematics/agda-executable"
-
-SITEFILE="50${PN}2-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if ! use emacs; then
-		sed -e '/.*emacs-mode.*$/d' \
-			-i "${S}/${MY_PN}.cabal" \
-			|| die "Could not remove agda-mode from ${MY_PN}.cabal"
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpphs cpphs) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag uhc uhc)
-}
-
-src_compile() {
-	if use emacs; then
-		BYTECOMPFLAGS="-L ./src/data/emacs-mode"
-		elisp-compile src/data/emacs-mode/*.el \
-			|| die "Failed to compile emacs mode"
-	fi
-	haskell-cabal_src_compile
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	dist/build/agda/agda --test +RTS -M1g || die
-}
-
-src_install() {
-	local add="${ED}"/usr/share/"${P}/ghc-$(ghc-version)"
-
-	haskell-cabal_src_install
-
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	# compile Agda.Primitive and Agda.Builtin modules, emulate Setup.hs postinst phase
-	Agda_datadir="${add}" \
-		"${ED}"/usr/bin/agda "${add}"/lib/prim/Agda/Primitive.agda \
-		|| die "Failed to build 'Primitive.agdai'"
-	for file in "${add}"/lib/prim/Agda/Builtin/*.agda; do
-		Agda_datadir="${add}" \
-			"${ED}"/usr/bin/agda "${file}" \
-			|| die "Failed to build '${file}'"
-	done
-
-	if use emacs; then
-		elisp-install ${PN} src/data/emacs-mode/*.el \
-			|| die "Failed to install emacs mode"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "Failed to install elisp site file"
-	fi
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
diff --git a/sci-mathematics/agda/agda-2.5.2-r2.ebuild b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
index 620d6ba28f88..bac38fefcb17 100644
--- a/sci-mathematics/agda/agda-2.5.2-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs debug uhc +stdlib emacs"
+IUSE="+cpphs debug +stdlib emacs"
 
 RESTRICT=test # Unrecognized option: --test (did you mean any of --help --js --css ?)
 
@@ -57,10 +57,6 @@ RDEPEND=">=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?
 	>=dev-lang/ghc-7.10.1:=
 	>=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?]
 	>=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?]
-		>=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?]
-		>=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?]
-		>=dev-haskell/uulib-0.9.20:=[profile?] )
 "
 RDEPEND+="
 		emacs? ( >=app-editors/emacs-23.1:*
@@ -92,8 +88,7 @@ src_prepare() {
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag cpphs cpphs) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag uhc uhc)
+		$(cabal_flag debug debug)
 }
 
 src_compile() {
diff --git a/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch b/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch
deleted file mode 100644
index 9bba347fa292..000000000000
--- a/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/full/Agda/Utils/HashMap.hs b/src/full/Agda/Utils/HashMap.hs
-index 5e1da8b..7c34548 100644
---- a/src/full/Agda/Utils/HashMap.hs
-+++ b/src/full/Agda/Utils/HashMap.hs
-@@ -5,7 +5,7 @@ module Agda.Utils.HashMap
-   ) where
- 
- import Data.Hashable
--import Data.HashMap.Strict as HashMap
-+import Data.HashMap.Strict as HashMap (HashMap, filter, lookup, insert, delete, empty, insertWith, toList, adjust, union, unionWith, elems, fromList, (!), keys, map, unions, foldr)
- import qualified Data.Maybe as Maybe
- 
- -- | Like 'Data.Map.Strict.mapMaybe'.
diff --git a/sci-mathematics/agda/metadata.xml b/sci-mathematics/agda/metadata.xml
index 057c778e5810..ea96b9e3cce7 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -18,6 +18,5 @@
 <use>
   <flag name="cpphs">Use cpphs instead of cpp.</flag>
   <flag name="stdlib">Install the standard library.</flag>
-  <flag name="uhc">Add support for the uhc backend.</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index 8b3494715513..ecd4fea1560e 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -3,5 +3,5 @@ AUX arb-2.18.0-multilib-strict.patch 590 BLAKE2B 7f438139ff5f0a19db074ea3bfab064
 DIST arb-2.17.0.tar.gz 1589083 BLAKE2B 68d5b04dca24129ceaec4e05124e35b474157cf1efbb6505121a03058e014cd4eb67b99497dbbafcf62e9e31f9d11c92f749f6e047e6b1513b6c0cc5ef8f22da SHA512 201e0cebbd1c4857d194e5531c76c6e45a478cf6965b836818919adf0fc04f0fe25e16ecd49c62a438876b67f009b872c4f3c774fe35620be0b22c5e08bdb824
 DIST arb-2.18.1.tar.gz 1595831 BLAKE2B 010ae7a17a9cc1c11ded5806ff761115f3e78c48a5d8fc058eae0715b1e00e40345d4e6445a84c71c37627879648f445663dcc3bbcebdeaac8439a993ade38ee SHA512 07afb45829119bc695926dab4221051b221c2cc3952e42c9928efc74570b05fc01c97ea86b1b67c16d7a19a55b4e32dce97e08c9b72f36b33dd62bfccd19bb05
 EBUILD arb-2.17.0.ebuild 2035 BLAKE2B 1866ef62a25faaa1dbfe24423c0cc135b61c7297c18d8ac38aa58f30f26a692cf32e1bd63153dfda66f3be27b39eb1186c684b86d7b9e9ca4d8d1c20be03c764 SHA512 a364ab870eda7e5cdedad53d80be7ad80cfeaeea93935b3637bba6d81fb59bd55c2960a3e605a0d58bb8a7e262357ab8825a60acf1bd8c1a56536431a74c5a7c
-EBUILD arb-2.18.1.ebuild 790 BLAKE2B 5e2101ab5002f49381de85535de0b1449909d11e27c2bde71280839e9b9c6f927ef5feb4401ca9de8e98f8e4d11a09ecb8e292b0055e5b10f326cc27abeb44b7 SHA512 6792a29a1b0b7aae2fc83f8bf666ebc82c770a9e0ab029fc2dc9543ed71f2cdf9cb951afd931e67707ec52c17602b9b21dbd71b0c0f4462fa5751882a9d28ff7
+EBUILD arb-2.18.1.ebuild 802 BLAKE2B c1d8d9c8e296a2d9fe8938eb60dc20baaaa33aef608ab9d7f94543705a41e562b7307d49b4f6ced1a5cebdf04ddd816f9c1f49e3f8a09e49d6625119919a6a7a SHA512 7d9652d1d18f930668651b4457cf45408a6decb5a2094167b042eac61215f3e260b73d23a8643e447f3372958b470da254d5e7da1aa13635bf7e09dcbd916588
 MISC metadata.xml 1077 BLAKE2B d21ef7ffc1b41b7b52d7d8caf246b0109be10d06b7bb4d660c9ae0f750d748cac37cd289df3282cbca9f2658e8fb5f6674c170ea6bfd511edb71a3f0da88bc86 SHA512 cc6a2aed7acd718af2aa1612b1b454a2e699da97a33cb9ba9ca747e3782d9439bb0ff96c25e9023776777a5ee20d2c208c7f98dc73c787a16bfca58e9a10e1ee
diff --git a/sci-mathematics/arb/arb-2.18.1.ebuild b/sci-mathematics/arb/arb-2.18.1.ebuild
index 691185c1d346..6ccf809eabf7 100644
--- a/sci-mathematics/arb/arb-2.18.1.ebuild
+++ b/sci-mathematics/arb/arb-2.18.1.ebuild
@@ -14,7 +14,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="GPL-2+"
 SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
deleted file mode 100644
index f59327eb0eb3..000000000000
--- a/sci-mathematics/axiom/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX axiom-200711-gcl-configure.patch 445 BLAKE2B 28686847a31e279674d20067d96b901cf75f9e12f52623974bd321e697ef9e8f5111048ef946f4b37ee6ccd07b3a562e5227cc6eb65da949d12c3ceee4fc051b SHA512 fe03fccc6d165e2bc6785c39aa0b3fa5d44761054931162e7b96667e1ad29c941bbb38f1eabb81a638eee3cefeeeb8bf3b31e69f3f2a8f3871fa192466bfda64
-AUX noweb-2.9-insecure-tmp-file.Makefile.patch 439 BLAKE2B 514a35388961232b000b08dd8ac3d50d36fd4249499f989290a58ccee312fda651a4cfc26b83b50a4907dbe1f0d44010342d0f7f385a11fd259eb3d4073fd360 SHA512 2f13d849e01a68b2c04a978889755fd8d5160d929dae3ccb398015e40044cfcf2f40eca4824171fc65cec381f956c947886762383adddeeff541eb5f509f0425
-AUX noweb-2.9-insecure-tmp-file.patch.input 4819 BLAKE2B 47039b204a972c9d3df2218ba83143decb8c498ba71d3a1a5666f56ce39a2d142b3894bb926ade4fc58c8f9ec270cc1d1fd369d60cb5390f83b60178dc2e6e4f SHA512 90c7407823d47e89ee1268a1f4d06c13439d0fa77aee23f0db7e5875c7535f1083dedde622d9b1f5586232389bcebd1353f7e2dd0535fec5d039af8eddde9b9d
-DIST axiom-may2008-src.tgz 207172456 BLAKE2B 67c400e10d1f53e70cbb28c09b0cefa1071916550606bbcf6695cbc407984bbab824f09bc7451d64d1432adfe8b673a75e9043168bba235fc3e775ce8e83199f SHA512 36f137622a3179aa8c84ddbe6506681a67e1f8d69db430777c3eb6aca0da24c601b2c63f586ead838f74ae3b2043d46b63d742e1dd1191fbf3a10affb958662c
-EBUILD axiom-200805.ebuild 2856 BLAKE2B 84e334a1604f69e348a83be115346e86e6f058190fec5bb06c12db86f74fd247c0267904a3ff53c48f1e09dbef169b7900ca1197c5fa2261094c3acb24012065 SHA512 c0b6c81d3fef16810db118700e10008703d2a3ca6eea3ff8b741a335d0a351ba82463c2f4d8c5b83cb0816e8decaa6638b91bfd5c96e6090f82a93bb6bd029d0
-MISC metadata.xml 269 BLAKE2B 5511cf8f01948aaca0488a6ed41ed923b130bfea9ba90d49f39bff86cfbd1e956b662d07406c76ca8e7e1d2ceb54547740e9f61a0a16041e5fcf18d713f90f03 SHA512 ecf9121172cdf04793bdbf6684060c7f15fb2a25606e53d8fc7dbc78efe24e264affa600c1ee3106ce8216b7093dff66eced3f78dd6ca7bd6ee589d1c7912cd6
diff --git a/sci-mathematics/axiom/axiom-200805.ebuild b/sci-mathematics/axiom/axiom-200805.ebuild
deleted file mode 100644
index ff9ea32b60ba..000000000000
--- a/sci-mathematics/axiom/axiom-200805.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib flag-o-matic
-
-DESCRIPTION="Axiom is a general purpose Computer Algebra system"
-HOMEPAGE="http://axiom.axiom-developer.org/"
-SRC_URI="http://www.axiom-developer.org/axiom-website/downloads/${PN}-may2008-src.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# NOTE: Do not strip since this seems to remove some crucial
-# runtime paths as well, thereby, breaking axiom
-RESTRICT="strip"
-
-DEPEND="virtual/latex-base
-	x11-libs/libXaw
-	sys-apps/debianutils
-	sys-process/procps"
-RDEPEND=""
-
-S="${WORKDIR}"/${PN}
-
-pkg_setup() {
-	# for 2.6.25 kernels and higher we need to have
-	# /proc/sys/kernel/randomize_va_space set to somthing other
-	# than 2, otherwise gcl fails to compile (see bug #186926).
-	local current_setting=$(/sbin/sysctl kernel.randomize_va_space 2>/dev/null | cut -d' ' -f3)
-	if [[ ${current_setting} == 2 ]]; then
-		echo
-		eerror "Your kernel has brk randomization enabled. This will"
-		eerror "cause axiom to fail to compile *and* run (see bug #186926)."
-		eerror "You can issue:"
-		eerror
-		eerror "   /sbin/sysctl -w kernel.randomize_va_space=1"
-		eerror
-		eerror "as root to turn brk randomization off temporarily."
-		eerror "However, when not using axiom you may want to turn"
-		eerror "brk randomization back on via"
-		eerror
-		eerror "   /sbin/sysctl -w kernel.randomize_va_space=2"
-		eerror
-		eerror "since it results in a less secure kernel."
-		die "Kernel brk randomization detected"
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input \
-		"${S}"/zips/noweb-2.9-insecure-tmp-file.patch \
-		|| die "Failed to fix noweb"
-	cp "${FILESDIR}"/${PN}-200711-gcl-configure.patch \
-		"${S}"/zips/gcl-2.6.7.configure.in.patch \
-		|| die "Failed to fix gcl-2.6.7 configure"
-	epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch
-
-	# lots of strict-aliasing badness
-	append-flags -fno-strict-aliasing
-}
-
-src_compile() {
-	# use gcl 2.6.7
-	sed -e "s:GCLVERSION=gcl-2.6.8pre$:GCLVERSION=gcl-2.6.7:" \
-		-i Makefile.pamphlet Makefile \
-		|| die "Failed to select proper gcl"
-
-	# fix libXpm.a location
-	sed -e "s:X11R6/lib:$(get_libdir):g" -i Makefile.pamphlet \
-		|| die "Failed to fix libXpm lib paths"
-
-	# Let the fun begin...
-	AXIOM="${S}"/mnt/linux emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}"/opt/axiom COMMAND="${D}"/opt/axiom/mnt/linux/bin/axiom install
-
-	mv "${D}"/opt/axiom/mnt/linux/* "${D}"/opt/axiom \
-		|| die "Failed to mv axiom into its final destination path."
-	rm -fr "${D}"/opt/axiom/mnt \
-		|| die "Failed to remove old directory."
-
-	dodir /usr/bin
-	dosym /opt/axiom/bin/axiom /usr/bin/axiom
-
-	sed -e "2d;3i AXIOM=/opt/axiom" \
-		-i "${D}"/opt/axiom/bin/axiom \
-		|| die "Failed to patch axiom runscript!"
-
-	dodoc changelog readme faq
-}
diff --git a/sci-mathematics/axiom/files/axiom-200711-gcl-configure.patch b/sci-mathematics/axiom/files/axiom-200711-gcl-configure.patch
deleted file mode 100644
index a5ecb58d7cc7..000000000000
--- a/sci-mathematics/axiom/files/axiom-200711-gcl-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure	2008-02-01 09:06:15.000000000 -0500
-+++ configure.new	2008-02-01 09:03:18.000000000 -0500
-@@ -1711,7 +1711,7 @@
- 	# results, and the version is kept in special file).
-     
- 	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--	    system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
-+	    system=MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`
- 	fi
- 	if test "`uname -s`" = "AIX" ; then
- 	    system=AIX-`uname -v`.`uname -r`
diff --git a/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.Makefile.patch b/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.Makefile.patch
deleted file mode 100644
index b8cd40ea03bb..000000000000
--- a/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile~	2005-09-05 19:50:31.000000000 +0100
-+++ Makefile	2006-02-17 17:08:31.000000000 +0000
-@@ -85,6 +85,7 @@
- 	${PATCH} <${ZIPS}/noweb.modules.c.patch ; \
- 	cd ${OBJ}/noweb/src ; \
- 	${PATCH} <${ZIPS}/noweb.src.Makefile.patch ; \
-+	${PATCH} -p0 <${ZIPS}/noweb-2.9-insecure-tmp-file.patch ; \
- 	./awkname ${AWK} ; \
- 	${ENV} ${MAKE} BIN=${MNT}/${SYS}/bin/lib LIB=${MNT}/${SYS}/bin/lib \
-                 MAN=${MNT}/${SYS}/bin/man \
diff --git a/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.patch.input b/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.patch.input
deleted file mode 100644
index 00288a8a3133..000000000000
--- a/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.patch.input
+++ /dev/null
@@ -1,168 +0,0 @@
---- awkname
-+++ awkname
-@@ -5,7 +5,7 @@
- esac
- 
- rc=0
--new=/tmp/$$.new; old=/tmp/$$.old
-+new=$(tempfile -p new); old=$(tempfile -p old)
- 
- for file in lib/emptydefn lib/unmarkup lib/toascii \
-                         awk/noidx awk/totex awk/tohtml awk/noindex \
---- awk/totex.nw
-+++ awk/totex.nw
-@@ -24,7 +24,7 @@
- @
- On an ugly system, we have to put it in a file.
- <<invoke awk program using file>>=
--awkfile=/tmp/totex$$.awk
-+awkfile=$(tempfile -p totex)
- trap 'rm -f $awkfile; exit 1' 0 1 2 15	# clean up files
- cat > $awkfile << 'EOF'
- <<awk program for conversion to {\TeX}>>
---- lib/toascii
-+++ lib/toascii
-@@ -7,9 +7,9 @@
-                 *)      echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;;
-         esac
- done
--awkfile="tmp/awk$$.tmp"
--textfile="/tmp/text$$.tmp"
--tagsfile="/tmp/tags$$.tmp"
-+awkfile=$(tempfile -p awk -s .tmp)
-+textfile=$(tempfile -p text -s .tmp)
-+tagsfile=$(tempfile -p tags -s .tmp)
- export awkfile textfile tagsfile
- trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
- nawk 'BEGIN { textfile=ENVIRON["textfile"]
---- shell/cpif
-+++ shell/cpif
-@@ -17,7 +17,7 @@
- 0)		echo 'Usage: '`basename $0`' [ -eq -ne ] file...' 1>&2; exit 2
- esac
- 
--new=/tmp/$$
-+new=$(tempfile)
- trap 'rm -f $new; exit 1' 1 2 15	# clean up files
- 
- cat >$new
---- shell/nonu
-+++ shell/nonu
-@@ -2,7 +2,7 @@
- LIB=/usr/public/pkg/noweb/lib
- # attempt to convert nuweb to noweb using sam
- 
--tmp=/tmp/nonu$$
-+tmp=$(tempfile -p nonu)
- trap '/bin/rm -f $tmp; exit 1' 1 2 15	# clean up files
- cp $1 $tmp || exit 1
- 
---- shell/roff.nw
-+++ shell/roff.nw
-@@ -80,7 +80,7 @@
- other, and quoting each quote is ugly.  The pragmatic solution is to
- copy the awk program into a temporary file, using a shell here-document.
- <<invoke awk program>>=
--awkfile="/tmp/noweb$$.awk"
-+awkfile=$(tempfile -p noweb -s .awk)
- trap 'rm -f $awkfile' 0 1 2 10 14 15
- cat > $awkfile << 'EOF'
- <<awk program>>
-@@ -662,12 +662,13 @@
- 
- base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
- tagsfile="$base.nwt"
-+tmpfile=$(tempfile -p tags)
- (echo ".so $macrodir/tmac.w"
- if [ -r "$tagsfile" ]; then 
--   cp $tagsfile /tmp/tags.$$
-+   cp $tagsfile $tmpfile
-    $AWK '<<action for [[tags]] line>>
--         <<functions>>' /tmp/tags.$$
--   rm -f /tmp/tags.$$
-+         <<functions>>' $tmpfile
-+   rm -f $tmpfile
-  fi
-  cat "$@") |
- ($ROFF $opts 2>$tagsfile)
---- shell/noroff
-+++ shell/noroff
-@@ -35,9 +35,10 @@
- 
- base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
- tagsfile="$base.nwt"
-+tmpfile=$(tempfile -p tags)
- (echo ".so $macrodir/tmac.w"
- if [ -r "$tagsfile" ]; then 
--   cp $tagsfile /tmp/tags.$$
-+   cp $tagsfile $tmpfile
-    $AWK '{
- 	     if      (sub(/^###TAG### /       , "")) tags[$1] = $2
- 	     else if (sub(/^###BEGINCHUNKS###/, "")) printf ".de CLIST\n.CLISTBEGIN\n"
-@@ -88,8 +89,8 @@
- 	 #	print str3
- 	 #	print convquote(str3)
- 	 # }
--	 function tag(s) { if (s in tags) return tags[s]; else return "???" }' /tmp/tags.$$
--   rm -f /tmp/tags.$$
-+	 function tag(s) { if (s in tags) return tags[s]; else return "???" }' $tmpfile
-+   rm -f $tmpfile
-  fi
-  cat "$@") |
- ($ROFF $opts 2>$tagsfile)
---- shell/toroff
-+++ shell/toroff
-@@ -9,7 +9,7 @@
-            exit 1;;
-     esac
- done
--awkfile="/tmp/noweb$$.awk"
-+awkfile=$(tempfile -p noweb -s .awk)
- trap 'rm -f $awkfile' 0 1 2 10 14 15
- cat > $awkfile << 'EOF'
- /^@begin docs 0$/ { if (delay) next }
---- lib/toascii.nw
-+++ lib/toascii.nw
-@@ -28,9 +28,9 @@
- Also arranged here is a temporary file for storage of the awk program on an
- ugly system, as discussed below.
- <<arrange temporary files>>=
--awkfile="tmp/awk$$.tmp"
--textfile="/tmp/text$$.tmp"
--tagsfile="/tmp/tags$$.tmp"
-+awkfile=$(tempfile -p awk -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+textfile=$(tempfile -p text -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+tagsfile=$(tempfile -p tags -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
- export awkfile textfile tagsfile
- trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
- @ %def textfile tagsfile awkfile
---- shell/roff.mm
-+++ shell/roff.mm
-@@ -214,7 +214,7 @@
- .ADDLIST 1a
- .PRINTLIST
- 
--awkfile="/tmp/noweb$$.awk"
-+awkfile=$(tempfile -p noweb -s .awk) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
- trap 'rm -f $awkfile' 0 1 2 10 14 15
- cat > $awkfile \&<< 'EOF'
- \c
-@@ -1628,14 +1628,15 @@
- tagsfile="$base.nwt"
- (echo ".so $macrodir/tmac.w"
- if [ -r "$tagsfile" ]; then 
--   cp $tagsfile /tmp/tags.$$
-+   tagstemp=$(tempfile -p tags) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+   cp $tagsfile $tagstemp
-    $AWK '\c
- .USE "action for \*[BEGINCONVQUOTE]tags\*[ENDCONVQUOTE] line" 11c
- \&
-          \c
- .USE "functions" 8a
--\&' /tmp/tags.$$
--   rm -f /tmp/tags.$$
-+\&' $tagstemp
-+   rm -f $tagstemp
-  fi
-  cat "$@") |
- ($ROFF $opts 2>$tagsfile)
diff --git a/sci-mathematics/axiom/metadata.xml b/sci-mathematics/axiom/metadata.xml
deleted file mode 100644
index 514f7304d513..000000000000
--- a/sci-mathematics/axiom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index ee8eefe59d76..ad0ceb4500cf 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,5 +1,8 @@
 AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad
 DIST CGAL-4.11.3-doc_html.tar.xz 30576756 BLAKE2B 6d32f3bca1c5aee4ed09eb96a35113a8a71bf14679e204683268ccee56f4a4799ef696bebd5ec0fd6add964e23273efc87167c122a5dc781c9cc7b2f5b938c29 SHA512 a729bea11a9b853a8197cc7ebb089005f98868e393e91142946d45a485e2e9ac9eacce1b230d91240080033b5c31bfd0195820ee5ae7f621bdd75f1abf19244f
 DIST CGAL-4.11.3.tar.xz 14657412 BLAKE2B a10457d255fcdd822f90419ff6af5389c50e88b254ed7f37471e24bb8523732b5aa6bd1ee5e67f14fcf0d8e79abf86e798ddeb3e0ce965dc2cde5667377bf5e0 SHA512 44cdd5fb313841d208ffeb9a96aa8db5111defd581b749c80f655390b5468f7c18b61df0ac2bdeb5259507341cc451fcd8cd50f7ff0571efdcb76eb920f92f7e
+DIST CGAL-5.1-doc_html.tar.xz 50630976 BLAKE2B 559287263b189ec5ac4a0b3445e1cc5862471285f28caca40f48b25b64eaef3426c42a178e4cb4db69a1e324963a9af665e84ca8f44da8b55ebb344f18f56fdc SHA512 ada944d73d3e6465a14d87ee87d1cabaee2c4848622b5360c14d6a9b5ff5ba3e19859943ecb7595b0dec7e950f214aa47b6ab389c23dd5f2794fc21a9e3a17db
+DIST CGAL-5.1.tar.xz 22850692 BLAKE2B 42320e07e222c3f69febe7dc478c74ef6cde0de723ea2d84c891b6e598d02c38026e9246edd467cadea8d66e527000a9b4af296ab026dd42c7876acea9824ccb SHA512 41085eeb113cec0eede2e21df05c9d2530db5988b4f9d0379f8de7c655cab09266620eebe017e0141c0ccdbcbafe8c074fd5bec46a40aaba95aa7521732e4423
 EBUILD cgal-4.11.3.ebuild 1855 BLAKE2B 634dc890c3ae78d684f3ecd775558d2464015b0d05e2cd5711e2df9b6ffd3cf6612fc6639559850e0e79cfdf1499ed594da13db6c302b66a31175f418aa03730 SHA512 cfd6ef2caadb533102e29b2243f06a5cea0fd0f9e0bef4bb479fc1d43a4691ea991376dfe5756165f7b6844c2b614d3943294a14cd9edd4349cc87b693f08959
-MISC metadata.xml 1320 BLAKE2B 783149a7fc48a50a58319ff81790908eb6294bf1fae99fcf8cffd6249ef1c60c1a87f3d818352f70b36790d2fd9ffb0daa9b16d918625a27f82b843579228fd1 SHA512 ee385a11e84af08f5c8146da067d27beceea4f15b2ede403ed799dc7766a4f749904356f22175eceb121555d6a40f3994381f6a1f8d2a90178962b65cf2a40d0
+EBUILD cgal-5.1.ebuild 1670 BLAKE2B ce2c3082e49dc42ed8c49eede073159077c305643aa45e8608a9458ad61635097569878953b62e82e7a4cc29f349ed4caf39a1127e702b015adb6dd575949610 SHA512 50aabd483922ca5c1c2e03779cca5186a9dc3e03c52967fcb3084d925ae9a797032c23d25cbd2f349a2a4ae8d0ac7a7b2f85860cc1bfbaba70e8168875e0474b
+MISC metadata.xml 1552 BLAKE2B f05f378f0343972d254851ddac6512761f36741106091b37d8e4fe216f4df6ebad12faea0d7e9323b999b5595d6d03a7b9848601fc83bf8bd8c35234c71e7301 SHA512 fc1bef0c6259b274716ad0c9bb50946268857fd8bd919d4fe2e4d6a89bbee518ef321f2fa4b43587ee61e40dcc96d12c5e152b39bdbbc39b440300c61039d4db
diff --git a/sci-mathematics/cgal/cgal-5.1.ebuild b/sci-mathematics/cgal/cgal-5.1.ebuild
new file mode 100644
index 000000000000..4dde3874c447
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-5.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=CGAL-${PV}
+
+DESCRIPTION="C++ library for geometric algorithms and data structures"
+HOMEPAGE="https://www.cgal.org/"
+SRC_URI="
+	https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}.tar.xz
+	doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples +gmp mpfi ntl qt5"
+
+RDEPEND="
+	dev-cpp/eigen
+	dev-libs/boost:=[threads]
+	dev-libs/mpfr:=
+	sys-libs/zlib
+	x11-libs/libX11:=
+	virtual/glu:=
+	virtual/opengl:=
+	gmp? ( dev-libs/gmp:=[cxx] )
+	mpfi? ( sci-libs/mpfi )
+	ntl? ( dev-libs/ntl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch )
+
+src_prepare() {
+	cmake_src_prepare
+	# modules provided by dev-cpp/eigen
+	rm cmake/modules/FindEigen3.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
+		-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
+		-DCGAL_HEADER_ONLY=OFF
+		-DWITH_LEDA=OFF
+		-DWITH_Eigen3=ON
+		-DWITH_ZLIB=ON
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GMPXX=$(usex gmp)
+		-DWITH_MPFI=$(usex mpfi)
+		-DWITH_NTL=$(usex ntl)
+		-DWITH_CGAL_Qt5=$(usex qt5)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
+	cmake_src_install
+	if use examples; then
+		dodoc -r examples demo
+	fi
+}
diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml
index ec85a1dbc69a..d26f70426b39 100644
--- a/sci-mathematics/cgal/metadata.xml
+++ b/sci-mathematics/cgal/metadata.xml
@@ -5,6 +5,14 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
+  <maintainer type="person">
+    <email>gentoo@aisha.cc</email>
+    <name>Aisha Tammy</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
   The Computational Geometry Algorithms Library is a collaborative
   open source library containing:
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 44cbfae283d9..a0aa977db6e9 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,5 +1,7 @@
+DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
 DIST coq-8.6.1.tar.gz 5588811 BLAKE2B 1016e54ef9b42a8534add55ab057454fad35b3fe103ba877689489c7d9cf43d76c1fbee123801d91035d353a882120650f94c433d9ee1daa878b8c819609c949 SHA512 814ab76a06ca15f927081428da74add4bc67290199fa011853b9c68a00cdefaf813b10fbac18a434f4504fce8f2173eb544080bf6f50d62caa41bb8724b13083
 DIST coq-8.9.1.tar.gz 6001970 BLAKE2B f65498e2485c59f4f95d2afeac35750ebf85b5af6db7c269a11635f2414df483d4cb159557060c9118de25f4922176f54d2e5c6f12174599371348341cb4d80f SHA512 66344f801b955d1b6daf3ab1d704551070c95cf9032ae74f15fb33f7ec313812b3e05c0ec277a2eb448e3fdfd9721df06d36612e2fb4928b6530d70147f1d983
+EBUILD coq-8.12.0.ebuild 1823 BLAKE2B 84da9000cdaf8ae40283fca252940fec5ca491766998e644450fd506f001baa2cf686cb28e9ea6d669927f6cca4eb9fa33f65d5c097bb953e42921227b601ca6 SHA512 9c1025360c6cb55f420f75a2f9d6aec7964bbf76db4494f4e4fa948d3e4a939dcea52f69943e1bc2baabe0fed983fcd756bc502090462b81c2933db8ba1cb4a2
 EBUILD coq-8.6.1-r1.ebuild 2007 BLAKE2B e11542ca13987c776b7dd4b181a4e369381d5b4bf16d61e2ba06b77d7c26e93295a18040ca757b02df492fb034f8852e9d340f52dbd22e7dde8cefaf60fe14f8 SHA512 b26850dc5f062a938a6974c1b49eb6f09645c75cdbac945262919be3d13c46e897d839ea063258868c6e6785cdeb31fc41152c2ffc0b412ca3b152e5ea89ffbc
 EBUILD coq-8.9.1-r1.ebuild 1884 BLAKE2B d060bd67a71bbe9cfc8c73ec578ca19565f88b671f667305ffbf7a911f46de8040918848321cbebee6c7957d566638007b634a0909ff8603497ca2ef71607a7f SHA512 76d68162cfc431547f5c499d1ffa80c1446a95e2f96c414830a93d4d91ed65143eb0c8bf3b12ed27d3d1b4bd302e498ea1ebf783b37a8576c7c009d4681a83ef
 EBUILD coq-8.9.1-r2.ebuild 1824 BLAKE2B c98446eed745fb1c111ad025ac19d9cc707917863ef32d47e1bdf0653b0d49ff2e050ab423ae864f55579c0e5bea0ac41e2c7ae51851e0ced846ff40d55d3646 SHA512 e7d7150b74cdfb9da5acc4dcf7e1355f9bc213d6a0aaaa72cad5a5db521718ef2533232bfb6176b7b09df2eda6283f82fa849dd2d56a671ee2b2f39496d5d358
diff --git a/sci-mathematics/coq/coq-8.12.0.ebuild b/sci-mathematics/coq/coq-8.12.0.ebuild
new file mode 100644
index 000000000000..f057ce34b154
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.12.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk debug +ocamlopt doc"
+
+RESTRICT=test
+
+RDEPEND="
+	>=dev-lang/ocaml-4.11.0:=[ocamlopt?]
+	dev-ml/camlp5:=[ocamlopt?]
+	dev-ml/num:=
+	gtk? (
+		dev-ml/lablgtk:3=[sourceview,ocamlopt?]
+		dev-ml/lablgtk-sourceview:3=[ocamlopt?]
+		)"
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+	doc? (
+		media-libs/netpbm[png,zlib]
+		virtual/latex-base
+		dev-tex/hevea
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-latexextra
+		)"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	ocaml_lib=$(ocamlc -where)
+	local myconf=(
+		-prefix /usr
+		-bindir /usr/bin
+		-libdir /usr/$(get_libdir)/coq
+		-mandir /usr/share/man
+		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
+		-docdir /usr/share/doc/${PF}
+		-configdir /etc/xdg/${PN}
+		)
+
+	use debug && myconf+=( -debug )
+	use doc || myconf+=( -with-doc no )
+
+	if use gtk; then
+		if use ocamlopt; then
+			myconf+=( -coqide opt )
+		else
+			myconf+=( -coqide byte )
+		fi
+	else
+		myconf+=( -coqide no )
+	fi
+
+	use ocamlopt || myconf+=( -byte-only )
+
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake STRIP="true" -j1 world VERBOSE=1
+}
+
+src_test() {
+	emake STRIP="true" check VERBOSE=1
+}
+
+src_install() {
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
+	dodoc README.md CREDITS
+
+	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+}
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index a48185aa2fde..ceab02a8ac73 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -6,5 +6,5 @@ AUX flintxx-include.patch 507 BLAKE2B 250e54de1ab5b70cffdac7348b78db543cbdb366ef
 DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
 DIST flint-2.6.3.tar.gz 4526340 BLAKE2B d663b44166cd857f83c2752eb4d4f6dc45eb8de535089e5dbe9939ac1464f1d69f66b62184644fff1ecd1d171f389d5ab874873def670c702733a0eba17bfd13 SHA512 8e71570364c789b1d4eaaa5f5adf10212cab47bf1a9f45c333211035ed021a86bb7b1de1feec51e83b2e113e8168853e370f127d2d2b1e941a12aec71fe8ae9e
 EBUILD flint-2.5.2-r1.ebuild 1714 BLAKE2B e1e6770c375f95ac1bb5d4284ffc205ba4a95d9933799718862ab31a12c87c3da9ed0c46509b808856a3663eef1d4bbd0c7334d9b1f76a192d66e196a2eb1683 SHA512 4ee441362d871807a93a9e9ab8d5a4d261f1c87ae0802525a780855ceb93666f3ca721a0fcbfc7d341522a0c8d81e3b28765ba6a1246a3535881e35e20ec24dd
-EBUILD flint-2.6.3.ebuild 1148 BLAKE2B a131754672341cbebfc5b74c07525213d6c7fecff58acf48db94aad682e29526dc91727e13210fae02b440ed3ece9a921b5f6e22a59bd3874bebcba76280dc43 SHA512 45eb898e733364e021b2723acd5d57d4ea5946e9b3f49ba95e8ccff9e8ef831b30a4007f5f93b34ed8cff14fd4aa2feee9633c9c94665244006a7b42e2349901
+EBUILD flint-2.6.3.ebuild 1155 BLAKE2B 5297af3acffb38e372b910766b6c4bd18c03779f2a36c4fd26ea6585a26a7c0201386e550b5ebc69dbb97a1e705470fa6ddaecd435e49fe85d2c527413af6b98 SHA512 1294c25101affbeb28c4a42110516e0f376344153c2b67b87300ea73f5aeaca12ee137051dce0983c2dc47d198dbc8a359a70fae46befb209a7b7aca20deff1b
 MISC metadata.xml 481 BLAKE2B f0d2cbeda37050bec654c0cba3c45b7340f37b29aa570c744d0a882f662481e7d8d777f48b0530fa23090807d9ad0a913733f4d55a3661f82322cfe544b90508 SHA512 63b38afaf08270df42d3a26cca9f5f491562dd89d8e9c43def3849a624d6694343147e47a602d75e44a656a8db1f7cb06885534fe39917cb46f2f895efc8ff16
diff --git a/sci-mathematics/flint/flint-2.6.3.ebuild b/sci-mathematics/flint/flint-2.6.3.ebuild
index d6ba11ee4b12..d943d1c39050 100644
--- a/sci-mathematics/flint/flint-2.6.3.ebuild
+++ b/sci-mathematics/flint/flint-2.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.flintlib.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/14"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="doc ntl test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/geomview/Manifest b/sci-mathematics/geomview/Manifest
index c8ebe92eccff..e4e1a2d829b1 100644
--- a/sci-mathematics/geomview/Manifest
+++ b/sci-mathematics/geomview/Manifest
@@ -3,5 +3,5 @@ AUX geomview-1.9.5-zlib.patch 1048 BLAKE2B e53d415fc75c25d4930241c92ae06ff6b857a
 AUX gvcl-mode.el 7416 BLAKE2B 764b13c0a68dc4c6091bd4b630d6d130d094600fa5a81ccca22ab2fdc34113fe953a74fde83fde050fed972c7e939ba46dc4151161736ca32879a765c7a9151f SHA512 b7f834cc5a3187e4a1fe5342a392d22576aee7f76f95493e02512e3055b1f5e349e170405e6b419c06816470167fc3a063f6f6dee934b35ed4f02f5a3e0a0812
 DIST geomview-1.9.5.tar.bz2 4532535 BLAKE2B 6be3f31050dd3954e88f224e818c6ff454fef9f7d716314ff0a4ca1bebad18726e55b238504d468a371edd72029bbb13795a2244e7a65815eaf1b78b2c167172 SHA512 a22bcd254e1e4c5c6797811f315d158f84fe82a3f95646bfdf3be203e9cd7fc8cacbf26f55a0a08bcb47cf2b2ad17ae4b48cdc4d78f810f48dab9fa1c7d56e7f
 DIST geomview.png.tar 10240 BLAKE2B ea1b81f69b77d93bdf4d4dff74e11cb6229d002f8c3c1ac1fbea23c443955e513302f0df0fe55d859309701c5dde6647f0fb9fb8d42b79329c16f1438f93d0a5 SHA512 3abdc04f04410a50876af6b0f1aefc6891c47926ca9e5a4a31bd001310972996497f4e6c33db059fdbca09b236b7763e5476d75427e653d54861b4b3a4e54f51
-EBUILD geomview-1.9.5-r1.ebuild 1478 BLAKE2B fbc24b9533938b440d6828c5e031484d854e211c2a828a8a5bd0136b95168db561be4c082d287ef0e5163ae930a8d439e4ae82013b929f8e9ee3bdf680f23d31 SHA512 9410e4cfe6d06ad54b5c895fa82a4ed8ccb8c32f624288b556acb43866a79bc772f57c2a486cfbf3472374857c0576dab6b25ad9bba15d7c5c656c42e3f7915b
+EBUILD geomview-1.9.5-r1.ebuild 1531 BLAKE2B 78dde11153a992d9d95f708fe25ee2518c45c5fe08c3b63ce9d8d4f01eac9ef71c042fb62f101c2a0833a8489c6029b71e2f767367d73f5bb196f6610a63b536 SHA512 2782e6e9e2d5f6d52c4ad71da4cb1cfae1d0643c83a42dce25d38c1fbd67b0aaa8d394fb837a482bc55e86c34b9525c23e2ad04e5f980a844f618a79b6a76dd3
 MISC metadata.xml 447 BLAKE2B 41da96eda2f4978156b20b0b874d6912b3b8653837d8bc84b0fb066f579efc0093cc636764848f5fc375b440982a2f7d4e4514910a2fc1d1c272ea01960ad172 SHA512 88525614463991653d0f863dcd54acd5c8d81255bce84dbeb6efe7b188a99f941b441c4ef078c9ff11011bdb933ba892529b062b9274c0878d6e0195498ec063
diff --git a/sci-mathematics/geomview/geomview-1.9.5-r1.ebuild b/sci-mathematics/geomview/geomview-1.9.5-r1.ebuild
index 0ffb2d155b8a..6d077450ffb3 100644
--- a/sci-mathematics/geomview/geomview-1.9.5-r1.ebuild
+++ b/sci-mathematics/geomview/geomview-1.9.5-r1.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit elisp-common eutils fdo-mime flag-o-matic
+inherit desktop elisp-common flag-o-matic xdg
 
 DESCRIPTION="Interactive Geometry Viewer"
 HOMEPAGE="http://geomview.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
 	https://dev.gentoo.org/~jlec/distfiles/geomview.png.tar"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="motionaveraging debug emacs zlib"
 
-DEPEND="x11-libs/motif:0
+DEPEND="
 	virtual/glu
 	virtual/opengl
+	x11-libs/motif:0
 	emacs? ( >=app-editors/emacs-23.1:* )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
@@ -25,10 +28,11 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${P/_/-}"
 
 SITEFILE="50${PN}-gentoo.el"
-PATCHES=( "${FILESDIR}/${PN}-1.9.5-zlib.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-1.9.5-zlib.patch )
 
 src_configure() {
 	econf \
+		--disable-static \
 		--with-htmlbrowser=xdg-open \
 		--with-pdfviewer=xdg-open \
 		$(use_enable debug d1debug) \
@@ -40,7 +44,7 @@ src_compile() {
 	default
 
 	if use emacs; then
-		cp "${FILESDIR}/gvcl-mode.el" . || die
+		cp "${FILESDIR}"/gvcl-mode.el . || die
 		elisp-compile *.el
 	fi
 }
@@ -55,16 +59,19 @@ src_install() {
 
 	if use emacs; then
 		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_pkg_postinst
 	use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_pkg_postrm
 	use emacs && elisp-site-regen
 }
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 0e7d3abacc4c..45e9d5dd568e 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -5,5 +5,8 @@ AUX gimps.service 283 BLAKE2B db6c0c777d514aa0216c1af087418ead25561ffa950752e237
 AUX gimps.tmpfiles 38 BLAKE2B c306d739ed0a0cc8bb4c80c7051ad93326cf0054d3f7fd61c4ed8a7d518356d521f7d3c3202d0b8b69723b8e7178457a34c65e92732eb15e8e64c3dff468ae2a SHA512 61c5eda13289175cdf55704442ceab4d5391d24cfa49f04155799fc2798e5ad5f1e624802e1c04b99685b1560f9898d1b0fc0c15c82251d1a765dd5de93024d8
 DIST p95v298b6.linux32.tar.gz 5696871 BLAKE2B e2c68c4dac1e4cfbc2e44542665326d33a7929585928ca720569b918f5286c97b93acc45c03d0514cadb29e87e5c6ca103e69953417df8405e36998c5768896b SHA512 6f82973237c59cd548fe7bfc08c51a62cc7ac4e98a8539e5dfbc23eec21fb6f46e1534dc834852557af61fa1a6fc9b634d9117d85fce37f8f6f9189fb724518b
 DIST p95v298b6.linux64.tar.gz 7032597 BLAKE2B de4de01d68caba4530d5adca165bfaa28cdb7e276b44355b200245cac6bab80bc05885a994c06331c2f66bdcd236c8bdb6cc8206ca40fb583bce6dc98eced7b1 SHA512 cb0ea195f4167e22bfdeef02872205a40ccd4d110abc9c354a413284db9aef1dbf9888ecdc3f09262e0d1033c0e4bed1f23d4d966fb58c437673a81095252bd1
+DIST p95v303b6.linux32.tar.gz 5702312 BLAKE2B 728c8b8e7e2b5187dc8126bccc5e2c165fbfbc0900d6c35517cd21b78e5292df143641e3766cc0146918062039b1eecab568f9b278f64b1b9197ee2f775603b9 SHA512 3e06fb77be07334949ece3ae152bdf5491f0b7f8e33e0e8ed2af3c34332841975a9514d1993ed2355abfa4e09f93e42093d02f96dc30c3471ae9f974cc2de11a
+DIST p95v303b6.linux64.tar.gz 7046127 BLAKE2B 9cde9c2670203071cfc463434a47c8123064cb232bfeb25d8767cad2c25ea75b395e2ec135b7b4a6dc9616e9d6b05ead371e1083274a82468f62a0e1de93c98f SHA512 6d6ded9a1724993d42adee28d400b0337835c52a4ce42271e62efb37134adfc6f017f55475860fbc1224e377a227ef8547b8852a35c082c37e996f4a1c1b570c
 EBUILD gimps-29.8.6-r1.ebuild 1746 BLAKE2B 54a0f315c0fedf1971ed17fcb0d2e2e184c05974f43556c2433763c113a7b382dfd9e828d6f51f338ded4bd4d273e55f76207f64b28049dfd50341a935d59d91 SHA512 3cf1f72eb72634e6e5274441dd624da5c3ea760fb69ff3a78146fdcc3d06a7ab801895f51fc49abf14dc9db239504dbf2da371bc88204d6a52731c84ac247dbd
+EBUILD gimps-30.3.6.ebuild 1808 BLAKE2B 3483a73734d0b0008c992a946d36558f1e8ac93872a46bf80d79bb21ae65720c5614df1e1380fb15c2db2537559bc1969fc90dba0614afef1c2f8a6419ea996d SHA512 0dd32cf22373ec922a2716afc7f60ed5af2b0f76ba8f91b94eef891b1137b1dc597f0aca3609f76cb56b3f90b973953decd946d37e02cb6a1db1df1fd81c55a4
 MISC metadata.xml 529 BLAKE2B a6e3550d128d6c4801029726feb868aa1cd1017b8a2f6f7ebbb3743a7b2190d40db06d22eb4f8ce94e35ab5e6b1f213afdf179fe7777501ad87457be43d9af44 SHA512 a7fb9bd05f987e1d48a04b70e78cbb3906927197793870435fee8b68dd9da623a68fc30ca96d0173952414d9741674ba2cc2c3f821dfd7b302f91f09e887a362
diff --git a/sci-mathematics/gimps/gimps-30.3.6.ebuild b/sci-mathematics/gimps/gimps-30.3.6.ebuild
new file mode 100644
index 000000000000..849d8cb06863
--- /dev/null
+++ b/sci-mathematics/gimps/gimps-30.3.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="The Great Internet Mersenne Prime Search"
+HOMEPAGE="https://www.mersenne.org/"
+
+# The author has finally caved in to the pressure of putting the build
+# number in the package name. Some dark magic necessary to get to the
+# package name
+
+MY_PV=$(ver_rs 2 'b' )
+
+SRC_URI="
+	amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux64.tar.gz )
+	x86? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux32.tar.gz )"
+
+SLOT="0"
+LICENSE="GIMPS"
+RESTRICT="mirror bindist"
+KEYWORDS="-* amd64 x86"
+
+# Since there are no statically linked binaries for this version of mprime,
+# and no static binaries for amd64 in general, we use the dynamically linked
+# ones and try to cover the .so deps with the packages listed in RDEPEND.
+# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
+
+DEPEND=""
+RDEPEND="net-misc/curl
+	>=dev-libs/gmp-6.1.2"
+
+S="${WORKDIR}"
+I="/opt/gimps"
+
+QA_PREBUILT="opt/gimps/mprime"
+
+DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
+
+src_install() {
+	dodir ${I}
+	keepdir /var/lib/gimps
+	pax-mark m mprime
+	cp mprime "${D}/${I}" || die
+	fperms a-w "${I}/mprime"
+	fowners root:0 "${I}"
+	fowners root:0 "${I}/mprime"
+
+	einstalldocs
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
+	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	echo
+	einfo "GIMPS data files were not removed."
+	einfo "Remove them manually from /var/lib/gimps/"
+	echo
+}
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 7cc581b134d2..15763aa82869 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -2,5 +2,5 @@ AUX glpk-4.65-debundle-system-libs.patch 1930 BLAKE2B 0c265afe9338e75bb3d6536e9e
 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.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
-EBUILD glpk-4.65.ebuild 1834 BLAKE2B d6ec90c5f7e267c831733b1008e720b4f1e66dfd62ee010f6880daf58a9477d5687fdadf45635ea0e365591cf4dbb6fb88a9a185361e212989b60b13fe3cdd42 SHA512 3cee3950f88357a0984d4c28edff8daa8d470330a12901973e320c550ca2bb6ad6595f0dbea6edd1622e8209fda683f43da27267f89d687b48de95261471e6e0
+EBUILD glpk-4.65.ebuild 1832 BLAKE2B 9abcc5f63cf3754ffd725de49e19ebea55bc948011f553ac11f0972c22360d1446f45169f35a1c65efdc926b58c46e591aa9d61fe6b5eaa504fd42e53b0f4294 SHA512 966ad0b3f8046b081a6fdad455f88c2a96b4840f4acc6c4b8551d428599876ddbe694885f642885e8fbd9992ca2119e885b9c7889982aa622e0a86ac5cd004f8
 MISC metadata.xml 998 BLAKE2B 11afba9ccdd6a53cee9432201eee2ae03483da71212f1c7f9907a775e6c2fcce068648fdae87965dab7550c9157c86697802707b582589626cf48e4236aa56e0 SHA512 1ef83c282b3a6143a1e85a1ecdc55463cf5617409dc990806917077c30e4acd2663b2772bf47aa96c572ee78dab76467c10b4ae9a2705220aa6e8e4936c4f7b5
diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild
index 30668cbb935a..741587830d00 100644
--- a/sci-mathematics/glpk/glpk-4.65.ebuild
+++ b/sci-mathematics/glpk/glpk-4.65.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/40"
-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"
 IUSE="doc examples gmp odbc mysql"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 2d82297ca4f0..872b5835e0da 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,4 +1,4 @@
 DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-EBUILD gmp-ecm-7.0.4-r2.ebuild 1283 BLAKE2B da1c9b2c779874c6ab1dc6fd2138b85c49f70ca1467d2ba021a50ab2b5bc70a64487a82e5986f0ca9ac86f4fb1d0916e55986be644ffefde5ed8aea9c23af313 SHA512 34e79c04c4454ec04ac07df58d11d9facedeb5f7a80c5553b1298f03401eb2bb33449134b0def1dba77e5b0cdbaf7ad87c3694f9f0310b6688c28f4a7d2a18dd
+EBUILD gmp-ecm-7.0.4-r2.ebuild 1295 BLAKE2B e0cc50158348439a3e56289d2a3b8406efd520a31af0ba74c23fb8305e79f6f27a337aad1c1a00dd2678921dc954a42433f57469c23068e1fc3cc62a5af6ea96 SHA512 54be563c2ba245ac0a382439b9910b4e6b4b68d4b5cd50b59121fa47cb158b5f19150ea96ff08f39f5d8b4d5d418d8e9f3c4b2fd49fb1bd98118559d3f1758de
 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-7.0.4-r2.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 7ed81f19115a..00cc0de3c934 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 ~arm ~arm64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="
diff --git a/sci-mathematics/mathematica/Manifest b/sci-mathematics/mathematica/Manifest
index 02ea9912b39a..edf5484156d4 100644
--- a/sci-mathematics/mathematica/Manifest
+++ b/sci-mathematics/mathematica/Manifest
@@ -1,5 +1,7 @@
 DIST Mathematica_10.3.1_LINUX.sh 3200459545 BLAKE2B 5a057b4e714eabb0afebe5a3ef536dbdc2d49a775130442e21493d6a0756527362fddfa7fabf927f996464456309c37b10b70a37f05718cb9f79d8ffc5912098 SHA512 08658a01a18c14a9b3f422816007980bf6576162e4cca6779ed1bdaf6b9748fb36a195006529ed6725f462042a264e7ee7753e802af8072ba6bebfee0cad8543
+DIST Mathematica_12.1.0_LINUX.sh 5889770327 BLAKE2B b0e637714f376d4066d5e484ef9facdcac36db691f7fd93e4a8228960acc9ec4b74b12ca19556c01247bd7927497f01f0c339a099b7f5abc7547051cc99c1fce SHA512 a661aa644944ee1058d7429f352ba6508514314086676a6eb918aac32773cc949feb531951b614be53198fa863575d8db456c66aa1306fd858c23423ef590fbb
 DIST Mathematica_12.1.1_LINUX.sh 4438946649 BLAKE2B 473f814a3e0686bb3a6ac1f49c887842bc17db11439b65c1dad1dae8cd5797e6762d94bccdf156f6f9ba1edb9a16ed5172936a6884d2f0f98c29808214b1eabe SHA512 5cfdd91bae9bad53afe405b40759732589119256c3f785058808b20faf21f593d90bf7bb2dbaccf3e983aa84ff380a1fa6d40fd63f5ba17109c1cd6818c63490
 EBUILD mathematica-10.3.1-r1.ebuild 2821 BLAKE2B 958869840413f275d50272636693c776ac399cc14401d21d8709aab81ec23f396b0407618b787a4c04fe5a70327c604bef81735f6fcdeb8cbbaf6b74cf387172 SHA512 ac52970098b31e2e1a72d50dffc0db3cfe67c68eed8272b1d78febe5e47eb514b333c23a9c5f7030bb606f937106b5a237818d9ab829779533e33f5459d2aeb2
+EBUILD mathematica-12.1.0.ebuild 3134 BLAKE2B 4a8f269cfb1d77dd941dfab8c56dc310306aea75fd6d676f2e79a1208420c25161afef7e253c101763d57a441480403580dbb62b31b420f6dbce3f7cfa786fc8 SHA512 cf14b8567a9dc6bd7f19447cb9d277c929084abf20bf073c4d9aa049e1795ddba0862f43340bfbb37d2633d84e7b5adfe4a3123554fd62bc55c018394177a2ee
 EBUILD mathematica-12.1.1-r1.ebuild 3134 BLAKE2B 4a8f269cfb1d77dd941dfab8c56dc310306aea75fd6d676f2e79a1208420c25161afef7e253c101763d57a441480403580dbb62b31b420f6dbce3f7cfa786fc8 SHA512 cf14b8567a9dc6bd7f19447cb9d277c929084abf20bf073c4d9aa049e1795ddba0862f43340bfbb37d2633d84e7b5adfe4a3123554fd62bc55c018394177a2ee
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-mathematics/mathematica/mathematica-12.1.0.ebuild b/sci-mathematics/mathematica/mathematica-12.1.0.ebuild
new file mode 100644
index 000000000000..20aaab87c6fa
--- /dev/null
+++ b/sci-mathematics/mathematica/mathematica-12.1.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib xdg
+
+DESCRIPTION="Wolfram Mathematica"
+SRC_URI="Mathematica_${PV}_LINUX.sh"
+HOMEPAGE="https://www.wolfram.com/mathematica/"
+
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+IUSE="+doc"
+
+RESTRICT="strip mirror bindist fetch"
+
+DEPEND=""
+
+# Mathematica comes with a lot of bundled stuff. We should place here only what we
+# explicitly override with LD_PRELOAD.
+RDEPEND="
+	media-libs/freetype
+"
+
+# we need this a few times
+MPN="Mathematica"
+MPV=$(ver_cut 1-2)
+M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel WolframScript math mathematica mcc wolfram"
+M_TARGET="opt/Wolfram/${MPN}/${MPV}"
+
+# we might as well list all files in all QA variables...
+QA_PREBUILT="opt/*"
+
+S=${WORKDIR}
+
+src_unpack() {
+	/bin/sh "${DISTDIR}/${A}" --nox11 --keep --target "${S}/unpack" -- "-help" || die
+}
+
+src_prepare() {
+	default
+
+	pushd "${S}/unpack" > /dev/null || die
+
+	# fix ACCESS DENIED issue when installer check the avahi-daemon
+	sed -e "s:avahi-daemon -c:true:g" -i "Unix/Installer/MathInstaller" || die
+
+	/bin/sh "Unix/Installer/MathInstaller" -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die
+
+	popd > /dev/null || die
+}
+
+src_install() {
+	local ARCH='-x86-64'
+
+	if ! use doc; then
+		einfo "Removing documentation"
+		rm -r "${S}/${M_TARGET}/Documentation"
+	fi
+
+	einfo 'Removing MacOS- and Windows-specific files'
+	find AddOns SystemFiles -type d -\( -name Windows -o -name Windows-x86-64 \
+		-o -name MacOSX -o -name MacOSX-x86-64 -\) -delete
+
+	# move all over
+	mv "${S}"/opt "${D}"/opt || die
+
+	# the autogenerated symlinks point into sandbox, remove
+	rm "${D}"/opt/bin/* || die
+
+	# install wrappers instead
+	for name in ${M_BINARIES} ; do
+		einfo "Generating wrapper for ${name}"
+		echo '#!/bin/sh' >> "${T}/${name}"
+		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /${M_TARGET}/Executables/${name} \$*" \
+			>> "${T}/${name}"
+		dobin "${T}/${name}"
+	done
+	for name in ${M_BINARIES} ; do
+		einfo "Symlinking ${name} to /opt/bin"
+		dosym ../../usr/bin/${name} /opt/bin/${name}
+	done
+
+	# fix some embedded paths and install desktop files
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica.desktop") ; do
+		echo Fixing "${filename}"
+		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
+		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
+		domenu "${filename}"
+	done
+
+	# install mime types
+	insinto /usr/share/mime/application
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do
+		basefilename=$(basename "${filename}")
+		mv "${filename}" "${T}/${basefilename#application-}"
+		doins "${T}/${basefilename#application-}"
+	done
+}
+
+pkg_nofetch() {
+	einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}"
+	einfo "in your \$\{DISTDIR\}."
+	einfo "Note that to actually run and use Mathematica you need a valid license."
+	einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}"
+}
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 7791eccd29b4..71d53124f2fa 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -12,12 +12,10 @@ AUX texinfo-0.patch 369 BLAKE2B 55d543054f7e50f9fe8a123eaaede8bdfebf256675b19f3b
 AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f93b949a05de9226d19d7898daf998cbedc61a77556c923f3f6f8e57508b73f3cae117f62d214d SHA512 110db85899241e1f9ea8427ffb397737aefe0bb6286d037c2c04cfad9726838521ef6403242aeb1e4246d06f13cf83af84bba38567a99b00ed6a081f17b38ead
 AUX xdg-utils-0.patch 1090 BLAKE2B 7a342a9e0bfd5b3aae1e3f8c45046c4fcaffea277cb68193e92fce4b23e03a0430ae095891183497e5deb969f1ba5e68f2423a9576c7465b137300bc2b096803 SHA512 31b121a2d6f1c24e5f2fa3e6129f661a891660665bf45a2907146e3bae9309d185f83d7001287df92a73aff81562a7011ad6b92e03516883bc0ae0730570fa38
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
-DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
 DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
 DIST maxima-5.42.2.tar.gz 41840181 BLAKE2B bca8a94366f1fe2f508436fdef8de80107b19c9b267a4b72dc6f56870078d35b3feb7dbdda384589b38c5351d6eeede1b9738a5ec2152063de2afacd1ced48c4 SHA512 5033b02272121f6aacff5ededf90eaad5e644a06d0c62aafd745401c08429da979ecd8274f7aa12596a0e32ddb614659af14e4273f59d372fe1ecbec081e7829
 DIST maxima-5.43.2.tar.gz 40871773 BLAKE2B a00a6ca06159d5acde195d9dc0f59d3a4b72738b2690997c18a9d1b2c642983b3a2005aee98544d4f45d8bc9ee5d9c6b0e43e4be40df4224b0174662bd75f71d SHA512 b2503440b2c4d515de9a39dd6acbe1c8dfae5daf083c47b6af2ffce381ad48923d1fa4e5f25ec1dc0621ad592b23cebc4c456b8ee2ee52bea958df6fb9df26fd
 DIST maxima-5.44.0.tar.gz 34976354 BLAKE2B d6870b6fb0581d9e60d6ed97c7daed8ce12b8b1ae49d0edb7b8d31dd723f9b879eb70440659ff958f53cee16d8d2a92f80dcaa3898d9f6dbabd79a5059073a65 SHA512 1e043bebb7c6d002c113d8de20a98d58d1a8e7bedfc9bcf52819e7c7554655991dc2f42f0333889706574249736db833a237b3e59b967e7e42ede28262e31f2f
-EBUILD maxima-5.38.1.ebuild 4811 BLAKE2B 8293968748eaa4f0cfbefda5bb33e6c7ee15b30b51a2b37380399f1d7b46b4b062832f35a75952b732ab238dc7e45649efb0df07d91a1b9a12d806040be108cc SHA512 e9a43d569928453e41bffd6d59a44517d433fc0fc7c1462e623ab82fdfed73bc21a2e7830a5d7b99d094d644b84f23f7b41921130e74c41624ad86836654f44a
 EBUILD maxima-5.42.1.ebuild 4895 BLAKE2B dd388cfe14cef36137a91ff71912c23390e176d796ce02c36f59cbb1e8993a03b16ee32b4e6d792e59d95bad3bcd90e3e9ded23abb1e3c371f466bd53f44502c SHA512 64c8a759525fff99c99831be56ea268b213392c65b1ef2e9db133addfaefead39710264c6a599eee7c53262ef16f75fbdbb35a9516a7054f0934d6fd46303520
 EBUILD maxima-5.42.2.ebuild 4898 BLAKE2B e3ff4af436e237e7bfb3d0fa45a730e87b5e0d90b479893f10ef089e04b884f555db98a41cd0f65c58f6e530dc8d02fddb0c6ebca82a139c596d9ff0dcee3d90 SHA512 f49e865243b9a8bbbfe51b7131dc9afcc3f312138b540c8617e396f72ea50a2ae61412a251dd002c8c9dd43a2166a621d6a10d3f50e189bff33e112cf2266048
 EBUILD maxima-5.43.2.ebuild 4959 BLAKE2B 0034cefd2c30e8adcfd4e278fa5ff4192cc5eaac75ea3f0c759b6cf0b396e1afe1625f66ad3b923c55d69e582debdf7ffacdbdd564c12dbf55f8fe17111cf528 SHA512 bf67bd46fe364e533ddfc80c145b6dfcd12c6b84ee54afc44ddf9d22e59e011471af338602c375806083bdaddf364c5addec8f76db87d4bd3c68e1128364830f
diff --git a/sci-mathematics/maxima/maxima-5.38.1.ebuild b/sci-mathematics/maxima/maxima-5.38.1.ebuild
deleted file mode 100644
index 5725c52e4060..000000000000
--- a/sci-mathematics/maxima/maxima-5.38.1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools elisp-common eutils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-# Supported lisps
-LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
-# <lisp> supports readline: . - no, y - yes
-SUPP_RL=(   .    .     y               .    .         y     )
-# . - just --enable-<lisp>, <flag> - --enable-<flag>
-CONF_FLAG=( .    .     .               ecl  ccl       .     )
-# patch file version; . - no patch
-PATCH_V=(   2    1     .               2    2         1     )
-
-IUSE="emacs tk nls unicode X ${LISPS[*]}"
-
-# Languages
-LANGS="de es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} l10n_${lang/_/-}"
-done
-
-# texlive-latexrecommended needed by imaxima for breqn.sty
-RDEPEND="!app-emacs/imaxima
-	X? ( x11-misc/xdg-utils
-		 sci-visualization/gnuplot[gd]
-		 tk? ( dev-lang/tk:0 ) )
-	emacs? ( >=app-editors/emacs-23.1:*
-		virtual/latex-base
-		app-emacs/auctex
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latexrecommended )"
-
-# generating lisp dependencies
-depends() {
-	local LISP DEP
-	LISP=${LISPS[$1]}
-	DEP="dev-lisp/${LISP}:="
-	if [ "${SUPP_RL[$1]}" = "." ]; then
-		DEP="${DEP} app-misc/rlwrap"
-	fi
-	echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	LISP=${LISPS[${n}]}
-	RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
-	DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-
-# default lisp
-DEF_LISP=0 # sbcl
-ARM_LISP=2 # gcl
-DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
-	local n=${#LISPS[*]}
-
-	for ((n--; n >= 0; n--)); do
-		use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
-	done
-
-	if [ -z "${NLISPS}" ]; then
-		use arm && DEF_LISP=${ARM_LISP}
-		ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
-		NLISPS=${DEF_LISP}
-	fi
-}
-
-src_prepare() {
-	local n PATCHES v
-	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-0 )
-
-	n=${#PATCHES[*]}
-	for ((n--; n >= 0; n--)); do
-		epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
-	done
-
-	n=${#LISPS[*]}
-	for ((n--; n >= 0; n--)); do
-		v=${PATCH_V[${n}]}
-		if [ "${v}" != "." ]; then
-			epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
-		fi
-	done
-
-	# bug #343331
-	rm share/Makefile.in || die
-	rm src/Makefile.in || die
-	touch src/*.mk
-	touch src/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local CONFS CONF n lang
-	for n in ${NLISPS}; do
-		CONF=${CONF_FLAG[${n}]}
-		if [ ${CONF} = . ]; then
-			CONF=${LISPS[${n}]}
-		fi
-		CONFS="${CONFS} --enable-${CONF}"
-	done
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "l10n_${lang/_/-}"; then
-				CONFS="${CONFS} --enable-lang-${lang}"
-				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf ${CONFS} \
-		$(use_with tk wish) \
-		$(use_enable emacs) \
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		pushd interfaces/emacs/emaxima > /dev/null
-		elisp-compile *.el
-		popd > /dev/null
-		pushd interfaces/emacs/imaxima > /dev/null
-		BYTECOMPFLAGS="-L . -L ../emaxima"
-		elisp-compile *.el
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	docompress -x /usr/share/info
-	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
-
-	if use emacs; then
-		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
-
-		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-
-		insinto /usr/share/${PN}/${PV}/doc/imaxima
-		doins interfaces/emacs/imaxima/README
-		doins -r interfaces/emacs/imaxima/imath-example
-	fi
-
-	# if we use ecls, build an ecls library for maxima
-	if use ecls; then
-		ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
-		insinto "${ECLLIB#${EPREFIX}}"
-		doins src/binary-ecl/maxima.fas
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index ba001605187c..520f273a4cac 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -3,5 +3,5 @@ AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
-EBUILD octave-5.2.0.ebuild 5460 BLAKE2B 42e812d4d982eaf4cfd9a08b041ef5bc46450e0c481caaa82590e93798e2b5d3df4db7ac6e06ed4e881e6dd1dc8c582d39499243894e4c837025a7af5613ac90 SHA512 1a58e2e58814ebf34e6fd698c8fffe46a73c55df4a345ba02bacca4120b23b4ac6ce18b729c1b4b949d1fabfff61ff0813393e50b25a451d9492b9ab4f504163
+EBUILD octave-5.2.0.ebuild 5465 BLAKE2B 4334c91112a379067fb32b5e0a3ceb78400752711d32c9bcd1c7367f14663d26303f2102890596fbb000b0e9167c2a8d2e63fae9d57d2392991cab4221748dd1 SHA512 afd895fc8d2cad63ad70a637ecc3d68acf2c12627b2f50fe33713ad6286a023e09acdeaa6689477dbe8e58817619bbacc9714fa857d8115daf1366c7b3537cec
 MISC metadata.xml 1046 BLAKE2B 1f3b62ee1553ab0cfd1a176b5e79a49e86341cb379ee7ef95e9d0b6efc0d621c68f0f8fd2cf1ec85a351d14964d5038e373a88a713a3078e782e8e8392a6ee7f SHA512 2debc123655a81c380f212467820e464eb1e2184d542a183e07633d82fa410cc802a2a49f7071df1ae5df1a16e73b867975edb44c9cda94484732cd66454798b
diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild b/sci-mathematics/octave/octave-5.2.0.ebuild
index 1fe5608b0c30..873ea617a81f 100644
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/bzip2
diff --git a/sci-mathematics/otter/Manifest b/sci-mathematics/otter/Manifest
index 87defdf2c54c..96546f192e51 100644
--- a/sci-mathematics/otter/Manifest
+++ b/sci-mathematics/otter/Manifest
@@ -1,5 +1,5 @@
 AUX otter-3.3-build.patch 3072 BLAKE2B 818cced4cea1d1ded0762143c2c3a81a328426b5847fbd30a6d3bd2610c13e0c65f4ee75cb651628dd7b97cc989feab353c01dc1982e0d03d3b763edb4d7fcd7 SHA512 6f961b9fc629fd7ddc0092f12286d6361503e540dd5a9ff2e48a33b95e6122b2ac78a438e1abd765ee4d269062734c28ec2fc997a1b00011e2fdd34812dd228d
 AUX otter-3.3-gold.patch 503 BLAKE2B daddf108d12dfec68eb07583697982a62e68413f533ff2c1fc9e27912f3d761704849e7afa776109def5b361b246d1e7a339da496998044695d40607c4dd5dca SHA512 66e4d3f246a1d4efbfdc8b3442bd269990d9c23b90426123ba2ef04b181179fe3a20f39e49bc67c2ad9158946fb0611e4b5700825b27b1af5226ab66fdee16c8
 DIST otter-3.3.tar.gz 2809092 BLAKE2B cd98fa71a43671a4f1346cb98dd677e99bc51fcdf8ea71662ba991b84c17e732438e4e1a2ffad7a564034b735acf829d7ac4446b52d79d6b4e154fcc0baccedf SHA512 c33d0f89cec647567cb84467a0adff2cd6023d7713f207ceca1736567b40be4ed6ab98f2ded151fa8dac7184a653cd00358ef8b18cf407ac8387d200e6dc073f
-EBUILD otter-3.3-r3.ebuild 782 BLAKE2B afad1573f617ccfdc9ec3008d7f2cf91c2bac53aa67c9a57acf1c8bbf4caa00c9b3619ff833ce1f1089008cbce3b8d439fabee3da398dece35fd412f612f5434 SHA512 52786e5b9a7893321503e885a0d4f84cf1a8f3ba0bf6ea5ba0947d052270f662d4fec3f53f86d99a65a15b76e693f2aeb06c7701743b8ca3a399cb774a6ecfd0
+EBUILD otter-3.3-r3.ebuild 829 BLAKE2B 94ca11acd8836e36c6f4712f754d332e5990f3fa8e1cd109cc032c7331c1a577dd5982066940a20617beb1529d6a75580d3a708367c9e0c966faef2cf18ec155 SHA512 336fe09eb00c5f4d1dcfa994b93ea2d92f7cf7e9a13f3bd898b14c2327814a2c42ea3fdb2a1d759ea1e61059474c15a367244937679f865e31686db934b0c14e
 MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
diff --git a/sci-mathematics/otter/otter-3.3-r3.ebuild b/sci-mathematics/otter/otter-3.3-r3.ebuild
index eec8a1d25164..6eb0dc06c302 100644
--- a/sci-mathematics/otter/otter-3.3-r3.ebuild
+++ b/sci-mathematics/otter/otter-3.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An Automated Deduction System"
 HOMEPAGE="http://www.cs.unm.edu/~mccune/otter/"
@@ -12,7 +12,6 @@ SRC_URI="http://www.cs.unm.edu/~mccune/otter/${P}.tar.gz"
 LICENSE="otter"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libX11
@@ -25,6 +24,10 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gold.patch
 )
 
+src_configure() {
+	append-cflags -fcommon
+}
+
 src_compile() {
 	tc-export CC
 
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index d0365faad5c1..67c6766fb24c 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -5,5 +5,7 @@ AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.11.4.tar.gz 4445000 BLAKE2B e910783186eeb71e74a369681c113b77271abd7f87d7a9f366aea83f36ab984f02e312cd451fad7ee6efb2fa285780e8fa78540bb1fd4b135a62d265176c80e0 SHA512 1312f452244cd1d814a1e43e108378c956669b614845f21199b7039fe6462881168983d4badb8a80bb1bac202cd82d92788a2b4f3c23d16f993cae6e251c4fe1
+DIST pari-2.13.0.tar.gz 4758091 BLAKE2B 21a008fbca9af60c7298daf2db5c596cf881fbf4748899f417e317b2e2c0a951d152ffdab061a5f7da73db65345134a90d91e57069d9f0d0ac6eb2ad470a7a98 SHA512 671bed101be0ba0eef2c4aa4d9580477f2492f2cd354f04773df00c2fa1456d1d6d8e568d617675dc4adce3e6d1f8cbaafae45452891ceb10eba60cd669b529f
 EBUILD pari-2.11.4.ebuild 3294 BLAKE2B 8656b6ec3b21763250c075f024c27786756a693c4ba365aa216547134734f91103c5ad38a03cf1ee0ee34c6564823d3f8deb2f75b1c3dd35aed1bf33ced1ee2b SHA512 fcc513c16a48d2d8cdc4b47f7f5d8799fe59b03fe593379b8c4b5f4ab60d9d5d6f6bd75de09cfccbd5a04783b36ef7ad93ccbfd0c8a57d0cca29ceb69db4cb07
+EBUILD pari-2.13.0.ebuild 3391 BLAKE2B 98ea133d0afa58bf2a2327d139a73567900fc52d93b98f579e34df1a879157f9559fcf2f4885401b9b50cc7555910b7dcdff9801e62650a5097de3d805e2570e SHA512 74235c32b2eb4731d62f603427aa1c031f8205a765173ae4814973b204c2a17ce343eaae4df912880497def8af75096d8cfbf7f9f9e853969819f6248aa863d2
 MISC metadata.xml 1734 BLAKE2B ffb61a9e3818ed778cd30e0b41279413fec1e624aef0c490e71f501b9797703bbd24413b180b588896d6d74af988e6102f58a04fc1c645f2b876ac2731a399c1 SHA512 b5caa3c3b98405d89681fb25c97dabb3302e971c68fda94e337b10dfc14761963ea548b4689ccb4ac59661425a85a53ea0d424b6acb35a475f42ef145ce9060e
diff --git a/sci-mathematics/pari/pari-2.13.0.ebuild b/sci-mathematics/pari/pari-2.13.0.ebuild
new file mode 100644
index 000000000000..af9b5c717ca8
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.13.0.ebuild
@@ -0,0 +1,118 @@
+# 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="Computer-aided number theory C library and tools"
+HOMEPAGE="https://pari.math.u-bordeaux.fr/"
+SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+# The subslot is the value of $soname_num obtained from
+# upstream's config/version script.
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="data doc fltk gmp test threads X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( virtual/latex-base )"
+DEPEND="
+	sys-libs/readline:0=
+	data? ( sci-mathematics/pari-data )
+	doc? ( X? ( x11-misc/xdg-utils ) )
+	fltk? ( x11-libs/fltk:1= )
+	gmp? ( dev-libs/gmp:0= )
+	X? ( x11-libs/libX11:0= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.9.4-strip.patch
+	"${FILESDIR}/${PN}"-2.9.4-ppc.patch
+	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
+	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
+	"${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch
+	"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
+)
+
+src_prepare() {
+	default
+
+	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
+	sed -i \
+		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
+		-e 's:"acroread":"xdg-open":' \
+		doc/gphelp.in || die "Failed to fix doc dir"
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# Workaraound to "asm operand has impossible constraints" as
+	# suggested in bug #499996.
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# need to force optimization here, as it breaks without
+	if is-flag -O0; then
+		replace-flags -O0 -O2
+	elif ! is-flag -O?; then
+		append-flags -O2
+	fi
+
+	# sysdatadir installs a pari.cfg stuff which is informative only.
+	# It is supposed to be for "architecture-dependent" data.
+	# It needs to be easily discoverable for downstream packages such as gp2c.
+	# We set LD to "" so that it is set to the value of the compiler used
+	# which is how a normal end user is expected to configure it. pari's build
+	# system do not cope very well with a naked linker, it is expecting a
+	# compiler driver. See https://bugs.gentoo.org/722090
+	LD="" ./Configure \
+		--prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}/usr/share/${PN}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sysdatadir="${EPREFIX}"/usr/share/pari \
+		--mandir="${EPREFIX}"/usr/share/man/man1 \
+		--with-readline="${EPREFIX}"/usr \
+		--with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_with fltk) \
+		$(use_with gmp) \
+		--without-qt \
+		$(usex threads "--mt=pthread" "" "" "") \
+		|| die "./Configure failed"
+}
+
+src_compile() {
+	local mymake=""
+	use hppa && \
+		mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
+
+	emake ${mymake} gp
+
+	if use doc; then
+		# To prevent sandbox violations by metafont
+		VARTEXFONTS="${T}/fonts" emake docpdf
+	fi
+}
+
+src_test() {
+	# Welcome to the jungle, where the tests fail if you make your
+	# terminal bigger.
+	emake COLUMNS=80 test-all
+}
+
+src_install() {
+	DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
+	default
+
+	if use doc; then
+		docompress -x "/usr/share/doc/${PF}"
+		emake \
+			DESTDIR="${D}" \
+			EXDIR="${ED}/usr/share/doc/${PF}/examples" \
+			DOCDIR="${ED}/usr/share/doc/${PF}" \
+			install-doc
+	fi
+}
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index a32da981ad70..f64e0971f795 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,4 +1,12 @@
 AUX 50pspp-gentoo.el 171 BLAKE2B 32091c8c9db265cb3c37cae7a718128df3d187e01b6c0685ff929e7dbe1bf92b8759f0920264c786ad250e9c72724fba6ec0b22ee1c39802fc3aaf3b51720665 SHA512 3e50a08018a0892df4beb400041ec682c94446b4e05ce7d5907ef20eace5426245e684160e85c8629650b8a911e92ef98200638dea1f12d0304fb4e1a8db5883
+AUX pspp-1.2.0-CVE-2018-20230.patch 4896 BLAKE2B efd7e53d2632a6214ef6be4888c1172b365637afe5ad8740a2dab7b461f170505f8cca37a86c94f08a8b2f2eb9be8113829ea6165003a9809a02e044e804cba2 SHA512 fa689231dd764d0b65338967264dad1e3ec8c8e14f5f6594963c2e154f7d6d2dc4b09952dacd00c75a220cd0ca27061702d66cf1c52a259d54a310ce0243440c
+AUX pspp-1.2.0-CVE-2019-9211.patch 2534 BLAKE2B 5e1e62c322fb3fcc92dd0e7d709325f0d9c7beed05f472bb3107a0d8f8076e669e1b8dc76040dfe3e865e2646909f633757935083431e59c2f4936728444db9a SHA512 96efe84da4e78a2d4530b50ffb6d3bf399ddc8d13ea63afab250f4357ccde0e6de723945848b9c9da0f17bc07861e671e57afd45c38d19928104dd1656a3a2b5
+AUX pspp-1.2.0-fix-gcc10.patch 972 BLAKE2B ae8472cfdefa9bccc97b4872d3435377323bcec0508044b2e69b49f32c7318c0a0b7465cc3de3d1791bd5d97acccb9a4d3f6c0cb456ce564819b0ce34fcfbd88 SHA512 2e4da6e091837436cf5071494d23eb8441ba038b79e59c6ca5c8d52247e5c30155157e0bafd8bb834a15aa4c140e95e8cd71a56e91f8d0aa77f79d9d4487726c
+AUX pspp-1.2.0-fix-overflow.patch 1136 BLAKE2B 0cf7f1039d003a4072ea47ab0f9dc55ecc3d350cb37180fa473095b7cd317d32771bcdf39715244307bcd0ef4a4c0a7658101cdedccf63f430872de49810c47e SHA512 4671bed9fad63dea2597fff97473bc5c4352eacfa7f39bbfd4c0782862a51a286c87d64c999805ad51b4faec15c3367d57bff26990e92c2b873afa9ed9d3a179
+AUX pspp-1.2.0-fix-segfaults.patch 1452 BLAKE2B a5760dfc45149526a67829ec38b0d78208bea982108a29f18742c8b1e3895b0f8e8f960d5789b4962ab60cdbbf301c2476ef158f758357cded65a17680405529 SHA512 c57e01b714ee8daf031beef0f670ff892d844834a53e55e1c326293c49efa7b51ffa6cbbbe3c6bde37a91e342261dcfaf1448839fe3280bab8b104f97c63a5af
+AUX pspp-1.2.0-fix-tests.patch 2217 BLAKE2B 20a2ca51c7bb792ec66281e2c6d10ca1345d5565b62696cf8a40051eacb43456242aa13d566224ee68267650209501d16c87dd57524a4b1386e68c96404159d7 SHA512 742b6acd7611dfce2eab9e246084528e4b80b0ef9f8713f4233f7c8c000c9772c8f62df1ad83cd5adfef2c5fc213fa75f6b2950ce3e9d61786353df034925e74
+AUX pspp-1.2.0-py3.patch 1619 BLAKE2B 5bb9264f5e064860380c79c64641c31f09bb171ff39a188eaab5b8d1fe21a8243b1c72ff77e82447af05db63434a53bfa9cede60f08330cf470c8c70ebfa3cdd SHA512 a7a189fd7e7e0209b50ac655449d59888a5b2bad74b8b76e843916f47c9ca4405362af80fced7291af4b446f070c534f6688662fae6e2f03b2c6e6e0ea18c362
 DIST pspp-1.2.0.tar.gz 7213194 BLAKE2B f468c6e025f996c9f806fb03e94a4497f02b774c509457cc6295bbefe37abc7e2ecf10d2876c8cff9a979d7a4264c7c185e1cec5fd1d5f2f00f1c6eae4da775e SHA512 49eed2b55f10584abba18ff7d2020fd08691bbc1a3c2f332e6d283e32aa84e0abdae6092d17db9c1a539c63d85ecdfcc2dad40c94a06904b8893a1976e5e48d3
+EBUILD pspp-1.2.0-r1.ebuild 2307 BLAKE2B 82668363eec7ea88f9b6c7509c50bd52e7fb20ae96bc60fae0fa933789984fc6320a2d3749f526e90e55e98aaeaaae61db1336a054d199d4f9026cae1ffc8759 SHA512 3f7f8bf4864997c0fbdb0ed85c836605e05224672ff9650b79f7118f6f51e8efbaaccbc730f1302d4dfbe5b47f79ecb57349021c3f9fdf30cd5deecd95913b53
 EBUILD pspp-1.2.0.ebuild 1710 BLAKE2B ee6f1612b3ff8719d970517409f092f881df857b8d75499648022b200001dd8271bb97a34b74f95d568cc3e17078abd7994965940eff618454e001f31253fe08 SHA512 9f68f47e4a31e75dcb23c5eed5b1170defb2cf83aaa96900b0d9dfb0b985a7733d939776f07ebed3305778480db44039ad8768f9ccdacd53c5a3c7b702a15dca
 MISC metadata.xml 711 BLAKE2B a8a82a6226fd60e70e8f0c4af6fd1e84545e46d0743f3b13d29c54461bf62ca2b890c718482fee2aa26ca4eb86300b3a11b01e659584942b9bb57ea70ee42882 SHA512 51b64f0c307003cfea98971696f7b26f4770171768a4b90c44f6233696749fe4cce0bf09b0392ad079abff8235fb3680668534cb407df75e6626aab6167ffd34
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2018-20230.patch b/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2018-20230.patch
new file mode 100644
index 000000000000..f0fee070deb6
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2018-20230.patch
@@ -0,0 +1,134 @@
+Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=abd1f816ca3b4f382bddf4564ad092aa934f0ccc
+Bug: https://bugs.gentoo.org/679392
+
+From abd1f816ca3b4f382bddf4564ad092aa934f0ccc Mon Sep 17 00:00:00 2001
+From: Ben Pfaff <blp@cs.stanford.edu>
+Date: Tue, 1 Jan 2019 08:36:05 -0800
+Subject: pspp-dump-sav: Issue error message for too-large extension records.
+
+CVE-2018-20230.
+---
+ NEWS                      |  2 ++
+ utilities/pspp-dump-sav.c | 30 ++++++++++++++++++------------
+ 2 files changed, 20 insertions(+), 12 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 3263062ca..191a9804b 100644
+--- a/NEWS
++++ b/NEWS
+@@ -9,6 +9,8 @@ Changes since 1.2.0:
+  * Plain text output is no longer divided into pages, since it is now
+    rarely printed on paper.
+ 
++ * Bug fix for CVE-2018-20230.
++
+ Changes from 1.0.1 to 1.2.0:
+ 
+  * New experimental command SAVE DATA COLLECTION to save MDD files.
+diff --git a/utilities/pspp-dump-sav.c b/utilities/pspp-dump-sav.c
+index aeb648665..b0001ac61 100644
+--- a/utilities/pspp-dump-sav.c
++++ b/utilities/pspp-dump-sav.c
+@@ -37,6 +37,7 @@
+ #include "gl/progname.h"
+ #include "gl/version-etc.h"
+ #include "gl/xalloc.h"
++#include "gl/xsize.h"
+ 
+ #define ID_MAX_LEN 64
+ 
+@@ -99,7 +100,7 @@ static void read_simple_compressed_data (struct sfm_reader *, int max_cases);
+ static void read_zlib_compressed_data (struct sfm_reader *);
+ 
+ static struct text_record *open_text_record (
+-  struct sfm_reader *, size_t size);
++  struct sfm_reader *, size_t size, size_t count);
+ static void close_text_record (struct text_record *);
+ static bool read_variable_to_value_pair (struct text_record *,
+                                          char **key, char **value);
+@@ -735,7 +736,7 @@ read_extra_product_info (struct sfm_reader *r,
+   const char *s;
+ 
+   printf ("%08llx: extra product info\n", (long long int) ftello (r->file));
+-  text = open_text_record (r, size * count);
++  text = open_text_record (r, size, count);
+   s = text_get_all (text);
+   print_string (s, strlen (s));
+   close_text_record (text);
+@@ -749,7 +750,7 @@ read_mrsets (struct sfm_reader *r, size_t size, size_t count)
+ 
+   printf ("%08llx: multiple response sets\n",
+           (long long int) ftello (r->file));
+-  text = open_text_record (r, size * count);
++  text = open_text_record (r, size, count);
+   for (;;)
+     {
+       const char *name;
+@@ -909,7 +910,7 @@ read_long_var_name_map (struct sfm_reader *r, size_t size, size_t count)
+ 
+   printf ("%08llx: long variable names (short => long)\n",
+           (long long int) ftello (r->file));
+-  text = open_text_record (r, size * count);
++  text = open_text_record (r, size, count);
+   while (read_variable_to_value_pair (text, &var, &long_name))
+     printf ("\t%s => %s\n", var, long_name);
+   close_text_record (text);
+@@ -926,7 +927,7 @@ read_long_string_map (struct sfm_reader *r, size_t size, size_t count)
+ 
+   printf ("%08llx: very long strings (variable => length)\n",
+           (long long int) ftello (r->file));
+-  text = open_text_record (r, size * count);
++  text = open_text_record (r, size, count);
+   while (read_variable_to_value_pair (text, &var, &length_s))
+     printf ("\t%s => %d\n", var, atoi (length_s));
+   close_text_record (text);
+@@ -1004,7 +1005,7 @@ read_datafile_attributes (struct sfm_reader *r, size_t size, size_t count)
+   struct text_record *text;
+ 
+   printf ("%08llx: datafile attributes\n", (long long int) ftello (r->file));
+-  text = open_text_record (r, size * count);
++  text = open_text_record (r, size, count);
+   read_attributes (r, text, "datafile");
+   close_text_record (text);
+ }
+@@ -1196,7 +1197,7 @@ read_variable_attributes (struct sfm_reader *r, size_t size, size_t count)
+   struct text_record *text;
+ 
+   printf ("%08llx: variable attributes\n", (long long int) ftello (r->file));
+-  text = open_text_record (r, size * count);
++  text = open_text_record (r, size, count);
+   for (;;)
+     {
+       const char *variable = text_tokenize (text, ':');
+@@ -1389,18 +1390,23 @@ struct text_record
+     size_t pos;                 /* Current position in buffer. */
+   };
+ 
+-/* Reads SIZE bytes into a text record for R,
++/* Reads SIZE * COUNT bytes into a text record for R,
+    and returns the new text record. */
+ static struct text_record *
+-open_text_record (struct sfm_reader *r, size_t size)
++open_text_record (struct sfm_reader *r, size_t size, size_t count)
+ {
+   struct text_record *text = xmalloc (sizeof *text);
+-  char *buffer = xmalloc (size + 1);
+-  read_bytes (r, buffer, size);
++
++  if (size_overflow_p (xsum (1, xtimes (size, count))))
++    sys_error (r, "Extension record too large.");
++
++  size_t n_bytes = size * count;
++  char *buffer = xmalloc (n_bytes + 1);
++  read_bytes (r, buffer, n_bytes);
+   buffer[size] = '\0';
+   text->reader = r;
+   text->buffer = buffer;
+-  text->size = size;
++  text->size = n_bytes;
+   text->pos = 0;
+   return text;
+ }
+-- 
+cgit v1.2.1
+
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2019-9211.patch b/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2019-9211.patch
new file mode 100644
index 000000000000..eb0b84414e88
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2019-9211.patch
@@ -0,0 +1,74 @@
+Source: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=0b842a84353790534a401e09a8d3bdd3d25bc3a6
+Bug: https://bugs.gentoo.org/679392
+
+From 0b842a84353790534a401e09a8d3bdd3d25bc3a6 Mon Sep 17 00:00:00 2001
+From: Ben Pfaff <blp@cs.stanford.edu>
+Date: Wed, 27 Feb 2019 20:11:06 -0800
+Subject: sys-file-writer: Remove assertions based on file position.
+
+These assertions can fail if the underlying file is not a regular file,
+e.g. if it is a device such as /dev/null.
+
+CVE-2019-9211.
+See also https://bugzilla.redhat.com/show_bug.cgi?id=1683499.
+See also https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-9211.
+See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923417.
+---
+ src/data/sys-file-writer.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c
+index df5108e2a..bbe58aecd 100644
+--- a/src/data/sys-file-writer.c
++++ b/src/data/sys-file-writer.c
+@@ -953,7 +953,6 @@ write_long_string_value_labels (struct sfm_writer *w,
+   const char *encoding = dict_get_encoding (dict);
+   size_t n_vars = dict_get_var_cnt (dict);
+   size_t size, i;
+-  off_t start UNUSED;
+ 
+   /* Figure out the size in advance. */
+   size = 0;
+@@ -985,7 +984,6 @@ write_long_string_value_labels (struct sfm_writer *w,
+   write_int (w, 1);             /* Data item (byte) size. */
+   write_int (w, size);          /* Number of data items. */
+ 
+-  start = ftello (w->file);
+   for (i = 0; i < n_vars; i++)
+     {
+       struct variable *var = dict_get_var (dict, i);
+@@ -1022,7 +1020,6 @@ write_long_string_value_labels (struct sfm_writer *w,
+           free (label);
+         }
+     }
+-  assert (ftello (w->file) == start + size);
+ }
+ 
+ static void
+@@ -1032,7 +1029,6 @@ write_long_string_missing_values (struct sfm_writer *w,
+   const char *encoding = dict_get_encoding (dict);
+   size_t n_vars = dict_get_var_cnt (dict);
+   size_t size, i;
+-  off_t start UNUSED;
+ 
+   /* Figure out the size in advance. */
+   size = 0;
+@@ -1058,7 +1054,6 @@ write_long_string_missing_values (struct sfm_writer *w,
+   write_int (w, 1);             /* Data item (byte) size. */
+   write_int (w, size);          /* Number of data items. */
+ 
+-  start = ftello (w->file);
+   for (i = 0; i < n_vars; i++)
+     {
+       struct variable *var = dict_get_var (dict, i);
+@@ -1087,7 +1082,6 @@ write_long_string_missing_values (struct sfm_writer *w,
+           write_bytes (w, value_str (value, width), 8);
+         }
+     }
+-  assert (ftello (w->file) == start + size);
+ }
+ 
+ static void
+-- 
+cgit v1.2.1
+
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch
new file mode 100644
index 000000000000..d228ccc42596
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch
@@ -0,0 +1,30 @@
+Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=614bbfbc4be1f4f47d55d3fbee9ae20f3a9955bb
+Gentoo Bug: https://bugs.gentoo.org/708548
+
+commit 614bbfbc4be1f4f47d55d3fbee9ae20f3a9955bb
+Author: Ben Pfaff <blp@cs.stanford.edu>
+Date:   Fri Nov 16 20:27:30 2018 -0800
+
+    psppire: Fix multiple definitions of align_enum_type and two others.
+    
+    These were defined in both psppire-dict.c and widgets.c, which causes a
+    problem building with -fno-common (which is desirable because it allows
+    Address Sanitizer to work better).
+
+diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c
+index 26a5dac4f..6ce129249 100644
+--- a/src/ui/gui/widgets.c
++++ b/src/ui/gui/widgets.c
+@@ -171,9 +171,9 @@ enum_to_string (const GValue *src, GValue *dest)
+ 
+ 
+ 
+-GType align_enum_type;
+-GType measure_enum_type;
+-GType role_enum_type;
++extern GType align_enum_type;
++extern GType measure_enum_type;
++extern GType role_enum_type;
+ 
+ 
+ extern const GEnumValue align[];
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-overflow.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-overflow.patch
new file mode 100644
index 000000000000..8c31c5f87020
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.2.0-fix-overflow.patch
@@ -0,0 +1,32 @@
+Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=be42ce976006feed2a7ba7599ee417c28887af52
+
+From be42ce976006feed2a7ba7599ee417c28887af52 Mon Sep 17 00:00:00 2001
+From: Ben Pfaff <blp@cs.stanford.edu>
+Date: Fri, 22 Feb 2019 17:16:40 -0800
+Subject: pspp-dump-sav; Fix write past end of buffer in corner case.
+
+If count == 0 and size > 0, then n_bytes is 0, buffer is a 1-byte
+allocation, and the assignment to buffer[size] would write to buffer[1]
+(or past it), which is past the end of the allocation.
+
+Found by Address Sanitizer.
+---
+ utilities/pspp-dump-sav.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utilities/pspp-dump-sav.c b/utilities/pspp-dump-sav.c
+index 1d8d78c87..70687ebc8 100644
+--- a/utilities/pspp-dump-sav.c
++++ b/utilities/pspp-dump-sav.c
+@@ -1403,7 +1403,7 @@ open_text_record (struct sfm_reader *r, size_t size, size_t count)
+   size_t n_bytes = size * count;
+   char *buffer = xmalloc (n_bytes + 1);
+   read_bytes (r, buffer, n_bytes);
+-  buffer[size] = '\0';
++  buffer[n_bytes] = '\0';
+   text->reader = r;
+   text->buffer = buffer;
+   text->size = n_bytes;
+-- 
+cgit v1.2.1
+
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-segfaults.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-segfaults.patch
new file mode 100644
index 000000000000..03b9d00fe73a
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.2.0-fix-segfaults.patch
@@ -0,0 +1,45 @@
+Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=df8cf077b2aacb7fe7b33dd8cb90ba57c8681aa0
+
+From df8cf077b2aacb7fe7b33dd8cb90ba57c8681aa0 Mon Sep 17 00:00:00 2001
+From: John Darrington <john@darrington.wattle.id.au>
+Date: Sat, 2 Mar 2019 15:29:39 +0100
+Subject: PSPPIRE: Avoid some segmentation faults when corrupt data is
+ encountered.
+
+---
+ src/ui/gui/psppire-data-store.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
+index f97b8eaf1..3c2765f5d 100644
+--- a/src/ui/gui/psppire-data-store.c
++++ b/src/ui/gui/psppire-data-store.c
+@@ -183,6 +183,8 @@ psppire_data_store_value_to_string (gpointer unused, PsppireDataStore *store, gi
+   g_return_val_if_fail (variable, g_strdup ("???"));
+ 
+   GVariant *vrnt = g_value_get_variant (v);
++  g_return_val_if_fail (vrnt, g_strdup ("???"));
++
+   union value val;
+   value_variant_get (&val, vrnt);
+ 
+@@ -231,12 +233,14 @@ __get_value (GtkTreeModel *tree_model,
+   if (NULL == variable)
+     return;
+ 
+-  g_value_init (value, G_TYPE_VARIANT);
+-
+   gint row = GPOINTER_TO_INT (iter->user_data);
+ 
+   struct ccase *cc = datasheet_get_row (store->datasheet, row);
+ 
++  g_return_if_fail (cc);
++
++  g_value_init (value, G_TYPE_VARIANT);
++
+   const union value *val = case_data_idx (cc, var_get_case_index (variable));
+ 
+   GVariant *vv = value_variant_new (val, var_get_width (variable));
+-- 
+cgit v1.2.1
+
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-tests.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-tests.patch
new file mode 100644
index 000000000000..1b92572cc820
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.2.0-fix-tests.patch
@@ -0,0 +1,61 @@
+Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=fe94912b9c8682c4666873b84c83cda88f4c135d
+
+commit fe94912b9c8682c4666873b84c83cda88f4c135d
+Author: Ben Pfaff <blp@cs.stanford.edu>
+Date:   Mon Nov 26 06:54:52 2018 -0800
+
+    segment: Fix behavior when #! line is not new-line terminated.
+    
+    The code here is supposed to maintain a invariant that, when it returns a
+    nonnegative value, it initializes *type, but it failed to do that when a
+    #! line did not end in a new-line.  This fixes the problem.
+    
+    Bug #55101.
+    Thanks for Friedrich Beckmann for narrowing down the problem.
+    Found by the Debian buildd: https://buildd.debian.org/status/fetch.php?pkg=pspp&arch=arm64&ver=1.2.0-1&stamp=1543183214&raw=0
+
+diff --git a/src/language/lexer/segment.c b/src/language/lexer/segment.c
+index c0a09973c..c607c4bd1 100644
+--- a/src/language/lexer/segment.c
++++ b/src/language/lexer/segment.c
+@@ -92,21 +92,26 @@ segmenter_parse_shbang__ (struct segmenter *s, const char *input, size_t n,
+         {
+           if (input[1] == '!')
+             {
+-              int ofs;
+-
+-              for (ofs = 2; ofs < n; ofs++)
+-                if (input[ofs] == '\n')
+-                  {
+-                    if (input[ofs] == '\n' && input[ofs - 1] == '\r')
+-                      ofs--;
+-
+-                    s->state = S_GENERAL;
+-                    s->substate = SS_START_OF_COMMAND;
+-                    *type = SEG_SHBANG;
+-                    return ofs;
+-                  }
++              for (int ofs = 2; ; ofs++)
++                {
++                  if (ofs >= n)
++                    {
++                      if (!eof)
++                        return -1;
++                    }
++                  else if (input[ofs] == '\n')
++                    {
++                      if (input[ofs - 1] == '\r')
++                        ofs--;
++                    }
++                  else
++                    continue;
+ 
+-              return eof ? ofs : -1;
++                  s->state = S_GENERAL;
++                  s->substate = SS_START_OF_COMMAND;
++                  *type = SEG_SHBANG;
++                  return ofs;
++                }
+             }
+         }
+       else if (!eof)
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-py3.patch b/sci-mathematics/pspp/files/pspp-1.2.0-py3.patch
new file mode 100644
index 000000000000..d2bf940eae64
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.2.0-py3.patch
@@ -0,0 +1,38 @@
+Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=123c3f55a80630655e84f97c9df558d988fa0055
+
+commit 123c3f55a80630655e84f97c9df558d988fa0055
+Author: Ben Pfaff <blp@cs.stanford.edu>
+Date:   Mon Nov 19 08:35:23 2018 -0800
+
+    test-date-input.py: Make compatible with Python 3.
+
+diff --git a/tests/data/test-date-input.py b/tests/data/test-date-input.py
+index 6ccc2f8f4..cdab260d6 100644
+--- a/tests/data/test-date-input.py
++++ b/tests/data/test-date-input.py
+@@ -50,8 +50,8 @@ def print_all_formats(date, template, formatted, exp_y, exp_m, exp_d,
+         global n
+         n += 1
+         year, month, day, julian, hour, minute, second = date
+-        quarter = (month - 1) / 3 + 1
+-        week = (julian - 1) / 7 + 1
++        quarter = (month - 1) // 3 + 1
++        week = (julian - 1) // 7 + 1
+         if year >= 1930 and year < 2030:
+             years = ('%d' % year, '%d' % (year % 100))
+         else:
+@@ -163,10 +163,10 @@ def print_all_formats(date, template, formatted, exp_y, exp_m, exp_d,
+         EPOCH = -577734         # 14 Oct 1582
+         expected = (EPOCH - 1
+                     + 365 * (exp_y - 1)
+-                    + (exp_y - 1) / 4
+-                    - (exp_y - 1) / 100
+-                    + (exp_y - 1) / 400
+-                    + (367 * exp_m - 362) / 12
++                    + (exp_y - 1) // 4
++                    - (exp_y - 1) // 100
++                    + (exp_y - 1) // 400
++                    + (367 * exp_m - 362) // 12
+                     + (0 if exp_m <= 2
+                        else -1 if exp_m >= 2 and is_leap_year(exp_y)
+                        else -2)
diff --git a/sci-mathematics/pspp/pspp-1.2.0-r1.ebuild b/sci-mathematics/pspp/pspp-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..f76533116cc8
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-1.2.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit elisp-common python-any-r1 xdg-utils
+
+DESCRIPTION="Program for statistical analysis of sampled data"
+HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="cairo doc emacs examples gtk ncurses nls perl postgres test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( cairo )"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	sci-libs/gsl:0=
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libiconv
+	cairo? (
+		x11-libs/cairo[svg]
+		x11-libs/pango
+	)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/gtksourceview:3.0=
+		x11-libs/spread-sheet-widget
+		cairo? ( dev-util/glib-utils )
+	)
+	postgres? ( dev-db/postgresql:=[server] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+	test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2018-20230.patch
+	"${FILESDIR}"/${P}-CVE-2019-9211.patch
+	"${FILESDIR}"/${P}-fix-overflow.patch
+	"${FILESDIR}"/${P}-fix-segfaults.patch
+	"${FILESDIR}"/${P}-fix-gcc10.patch
+	"${FILESDIR}"/${P}-py3.patch
+	"${FILESDIR}"/${P}-fix-tests.patch
+)
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable nls) \
+		$(use_with cairo) \
+		$(use_with gtk gui) \
+		$(use_with perl perl-module) \
+		$(use_with postgres libpq)
+}
+
+src_compile() {
+	default
+	if use doc; then
+		emake html pdf
+		HTML_DOCS=( doc/pspp{,-dev}.html )
+	fi
+	use emacs && elisp-compile *.el
+}
+
+src_install() {
+	default
+
+	use doc && dodoc doc/pspp{,-dev}.pdf
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	if use emacs; then
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 6bad81e556a9..d58fddf1017d 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,3 +1,3 @@
-DIST rkward-0.7.1b.tar.gz 4618168 BLAKE2B cccd0409d6609aee500d4a96bbe9d94fe7c3b8c7ee77d0b80e0b4e62445bf9eb46f9a1c2ff82a11c304d3c58c8ef32f33b2aaf2a96faa9e69adb10f1fb6a5746 SHA512 e2fef6db00153a67e03ef6a4e8152eceee45738394758042df1248053c1473a362cf70615bd4d8451b6594a252e16875d9248c1a358f33a8f1917503e22b4cf8
-EBUILD rkward-0.7.1b.ebuild 1085 BLAKE2B cf73b465ea4dd14aff0752383756dce6f10c2c410f6fbe976fb13d9a1aca2ff9e188f244f882215884d2fc508823d2b7c91c392c9f2f4941dbd4c3e51557be8e SHA512 e4b7b317499b43ef31d7f6e3148f7c6c9fdcf50d525826a2ec2bb5d6ab1fcc5ae781749f5281834ee822f40c4588aa9eb5418c1a25f65c694dc46c944f9f6b31
+DIST rkward-0.7.2.tar.gz 6307769 BLAKE2B df72d5d03ecbb57cb08787cc27e66cfacca517a08ca10190c1bb0d627f991dab6b79e9399b0b6c38a545d370d0ecdc8fc5796c1e046a0aac20c0485405a2d72c SHA512 af872b59dea8535eb6ddc0b3db56c45114fc64b0b657e5c8373eb2f7b3a63aa13f9e3c8f6050ff3eff0126df595ed30e1d1e66b91c19b7ba950838613798cb6d
+EBUILD rkward-0.7.2.ebuild 1215 BLAKE2B 3a0fe910d159cf55895df19970c3cd2ea646270a94e72f3437db04c7898ef24621c397a1e32c79a8a8b823b7110b1f6a7069655a0ed7c855c15554c9d8d0917b SHA512 76e040fb98b5c670e62ca9659ab17de19d8cab6fe354188430b1eb69e6bf41439f520bb5ed2dc210b64c52bd2c95f02268ff3536b7fc35deb1b4939df332944a
 MISC metadata.xml 379 BLAKE2B 7121b146f3459161739381e46701bdbdcdea98aee6f77e28d4a6d1628abb6b391800991aa23db4df4355850e04aa5efd80f2ea2fc0d500f48cf0377760eab8ee SHA512 02e0755c6d71955276d5a3f1adfa69a4056820e99c0d5e815ce1966c3d474dd61573fee137056d67bc64ebfc01297223a2f8f523c9c6d9b5eb9755104fc0915a
diff --git a/sci-mathematics/rkward/rkward-0.7.1b.ebuild b/sci-mathematics/rkward/rkward-0.7.2.ebuild
index d9b8f8cc9ce9..a76b8cd6a799 100644
--- a/sci-mathematics/rkward/rkward-0.7.1b.ebuild
+++ b/sci-mathematics/rkward/rkward-0.7.2.ebuild
@@ -4,15 +4,18 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="IDE for the R-project"
 HOMEPAGE="https://rkward.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="GPL-2+ LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="
@@ -24,7 +27,7 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtscript:5
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	kde-frameworks/kcompletion:5
@@ -32,7 +35,6 @@ DEPEND="
 	kde-frameworks/kconfigwidgets:5
 	kde-frameworks/kcoreaddons:5
 	kde-frameworks/kcrash:5
-	kde-frameworks/kdewebkit:5
 	kde-frameworks/ki18n:5
 	kde-frameworks/kio:5
 	kde-frameworks/kjobwidgets:5
@@ -44,6 +46,10 @@ DEPEND="
 	kde-frameworks/kwindowsystem:5
 	kde-frameworks/kxmlgui:5
 "
-RDEPEND="${DEPEND}
-	virtual/libintl
-"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "kate plugins support" kde-apps/kate:${SLOT}
+	ecm_pkg_postinst
+}
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index f5b4713c87a8..af114c8b14bb 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -4,10 +4,12 @@ DIST wxmaxima-20.01.3.tar.gz 14221966 BLAKE2B cdaf62f5456446fe6edf1247323faa9f0a
 DIST wxmaxima-20.02.4.tar.gz 15242422 BLAKE2B ea9dc613fa94d046a9d461c56a9d1564001f4fa28d90a553040e85b7dd442df025521dd9501257d12c808a2e9285b7f34b04c9f10d4ce658bc6d423055c9fbd7 SHA512 d5eb0e09de55c3e6ebafeaa95957ca8bbdacac9ec1d99f6041fa99b7fa59364b3228336675f9bffa71b879b17268b80c695f16c9259bee6d5cab9ef7ed86294b
 DIST wxmaxima-20.04.0.tar.gz 15313618 BLAKE2B 04a9544aeb1a7084250696fad99c51be21bf0b119581cebdf62b8dece3034ebcc1469b9d07576bfed8d72efe77ce6db47b5a29c4185a5e85114b552d3385caf9 SHA512 8caf9effa0167c3307eff4a6895a3b19b41aab37f845e4cdc139f3cdd03d9a061adc9ea4ad8ca7e0f28d83faf34d15f828f03c86d05ad7d83f0e28aee82aba70
 DIST wxmaxima-20.07.0.tar.gz 15723971 BLAKE2B cdec59e8ca17d0f4577a316a68e90795424d3d31829130e1854d908d76e54c02b125d20ce3a41ad5b4b06d57d918156bbbce7dead114b05daade34845d045124 SHA512 7272df5314ac79248154ee899397361da0570a6188ddc464b0479d2d6ac556ddf3941cf1ac17c9e6642e77d79a8458b902e70513dfdea15bc6a6d36d76b0bec2
+DIST wxmaxima-20.09.0.tar.gz 16159536 BLAKE2B 758537f9d35ecbec1405318465ccce91b172f0e6fb00c71b926224f1cb90ed31263d8ae69a14a437c05e9e489e5143fb2e010ccb44e3fd9d7cf29785dbac9dfa SHA512 952fdfec3f07904e3385657b43f5ad669a3149307843d352aa4d78c6ff88fb51aa31f301964a13c86faece5d4a2acce5af91338e7de57599d7414da447564fe8
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
 EBUILD wxmaxima-20.01.1.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.01.3.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.02.4.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.04.0.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.07.0.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
+EBUILD wxmaxima-20.09.0.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild
new file mode 100644
index 000000000000..9a2b704c52cf
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0"
+PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
+inherit cmake-utils wxwidgets l10n xdg
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
+SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+S="${WORKDIR}"/${PN}-Version-${PV}
+
+DEPEND="
+	dev-libs/libxml2:2
+	x11-libs/wxGTK:${WX_GTK_VER}"
+RDEPEND="${DEPEND}
+	media-fonts/jsmath
+	sci-visualization/gnuplot[wxwidgets]
+	sci-mathematics/maxima"
+
+src_prepare() {
+	setup-wxwidgets
+	cmake-utils_src_prepare
+
+	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
+		|| die "sed info/CMakeLists.txt failed"
+
+	# locales
+	rm_po() {
+		rm "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
+		rm -f "${S}"/locales/manual/${1}.po
+		rm -f "${S}"/locales/wxwin/${1}.po
+		rm -f "${S}"/info/${PN}.${1}.md
+		rm -f "${S}"/info/${PN}.${1}.html
+	}
+	l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po'
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}
+	cmake-utils_src_install
+}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index d189667f5fe4..3c880a7fb5c3 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,5 +1,3 @@
-DIST z3-4.8.8.tar.gz 4520119 BLAKE2B 8d3d9fac61ac7d5a9d8c44323db9f67a7b24ee510b12e67867b249062cbcfe9a3bd0fa3b24c03c9eccd2aaf90451083ff5e9a9253a87c3e8e943fc5cf08a1893 SHA512 a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f
 DIST z3-4.8.9.tar.gz 4624159 BLAKE2B ff97a688ef3f977cd1204ddafaf6b4ef5824fc8f9f38f0ce9a31657b99b8cb08ee5834893ac67056eb4d7f7df67585933029292eed41d140a93c10b9daa8e100 SHA512 a50da5c3f9e27d3e804c1b71f648a3dbd5a55223b7344d66f191a1b34a4d787810abd976840d3ab3878aaf5c96d89f5a517cac0781b82aa927a9d8d54836d54f
-EBUILD z3-4.8.8.ebuild 2414 BLAKE2B f20a02f52a68dcc203acaa79b39efac293b45e142798c0ed362845b4897e4400be4816fd37f26f7fb54d7a824b7d7da074bf9824f76e8a8b305a789d8dfec263 SHA512 f4feff2c7c64feefa4a54c65d1c135cd2924daeb4c5276d34d3c4f2e1b4224aad0a45abf9fe4a56eea6947679938fe1e0a77b47e34d11448ddb629fc9a195f0f
-EBUILD z3-4.8.9.ebuild 2418 BLAKE2B 9d3b018ddedad2d1161fa998a783c23f1fdd385f001a963899d8a7e89827ed427dcfe6dc00b9657ecce8e7c18b39b6c246cccf0d9c222359e994b7c54ff2e266 SHA512 dc0f5b4fec387fff0d8471b11fc18d6fceb47245cbc91b8b5b0299475123a9a1ccf33f638986d309d48cb62f815922ebf28248592e1ad51b69cc641a9a60d923
+EBUILD z3-4.8.9.ebuild 2413 BLAKE2B 0c8dc765d4de1af2418f5bc85a445f367663b87162759cf8d9f5a4d368b90176a1c813fc9676d5d4573357a56d0052bca9917a9b9b7e1fcd231a679d3e93a7b9 SHA512 c4be47b21f3ae4b333d0413140f1dc4fd43f82210f67f835808faec1eb7b9e0da291f5a3b58dd641127fa2818a8c549e6e8b65f49cfc213383b0ee1501bb997e
 MISC metadata.xml 616 BLAKE2B aeef1be6d9c4a94062310c6e2c3ac7fb1efe39bb608d96c143a01e9a01585f11ee25aa56d8f67d0a96d880b543882f2cb781247c034eda75e7f6f030767bf660 SHA512 aed4bbc517cc4f9e78ad3f5d50af5837757efa2985aa61a3faf40e39203179d356830a1d6fd4712422257eb244a67ae5eb5c4b2db76ab75769f5fe5e6d045a0c
diff --git a/sci-mathematics/z3/z3-4.8.8.ebuild b/sci-mathematics/z3/z3-4.8.8.ebuild
deleted file mode 100644
index 7ca54108075f..000000000000
--- a/sci-mathematics/z3/z3-4.8.8.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )"
-BDEPEND="
-	doc? ( app-doc/doxygen )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md RELEASE_NOTES
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.8.9.ebuild b/sci-mathematics/z3/z3-4.8.9.ebuild
index 3570ae1f1e49..b4a56e60b2bc 100644
--- a/sci-mathematics/z3/z3-4.8.9.ebuild
+++ b/sci-mathematics/z3/z3-4.8.9.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /sci-mathematics
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)