gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-mathematics
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
103 files changed, 241 insertions, 5193 deletions
diff --git a/sci-mathematics/4ti2/4ti2-1.6.2.ebuild b/sci-mathematics/4ti2/4ti2-1.6.2.ebuild
deleted file mode 100644
index ff06ac620cf9..000000000000
--- a/sci-mathematics/4ti2/4ti2-1.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-# The swig subdir is not used, so we can skip running autotools in it. #518000
-AT_NO_RECURSIVE=1
-
-inherit autotools-utils toolchain-funcs
-
-DESCRIPTION="Software package for algebraic, geometric and combinatorial problems"
-HOMEPAGE="http://www.4ti2.de/"
-SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-DEPEND="
-	sci-mathematics/glpk:0[gmp]
-	dev-libs/gmp[cxx]"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.2-gold.patch
-	)
-
-src_prepare() {
-	sed \
-		-e "s:^CXX.*$:CXX=$(tc-getCXX):g" \
-		-i m4/glpk-check.m4 || die
-	autotools-utils_src_prepare
-}
diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest
index e450e0df1a03..48be983b098e 100644
--- a/sci-mathematics/4ti2/Manifest
+++ b/sci-mathematics/4ti2/Manifest
@@ -1,8 +1,6 @@
 AUX 4ti2-1.3.2-gold.patch 652 BLAKE2B a3b47b440f9417d883df52356e58267b096a273ddd725c29e97a969eb3e2281edc8ecd9342bfc1a187464b4d476c22dc095ca8060f433cd2c793c22e5a181ae0 SHA512 60b14d7b287b69adbce420f37dad5d83ce21bfa4329ea0810c67f054d35a71f6795b0a8206b268ec9cfa08f796a4cd80a34d816c691e8e3e77adcbc5217b43a7
-DIST 4ti2-1.6.2.tar.gz 5531651 BLAKE2B 1e55f8e0df242a6eeff3b66f2a4a0f6508fc5fb722ec86558c289d6c8d295b169b60c9b3172f7e672f9fc341e767221138819c6534aba9695aa43ecbf61e1ab3 SHA512 ff68f767b8677ce0ce94cca39fa3ef87835d77a951f0ec6ae28ab171bf09ae25c551d88c2cdf5bf3115b33bd32366b063533a1c22576130a00f542f9370bcd7b
 DIST 4ti2-1.6.6.tar.gz 5640126 BLAKE2B e52fdfd9b406b86236795b1ba2494d9686f3c93961359bf409ddcdfeb0067e3b0904473b66268315795c8941ba0cb93dbe5e4c3cea402379bd07ee65a1951e5d SHA512 89f36aaf3d8f41bb31b37b44a013ea966d9664880473ad0d6d1825ffb00afec1eff3139c09ac6b684f0679e2ae0d201a84396bb721aa1f63dc1deca592392c41
 DIST 4ti2-1.6.7.tar.gz 5649869 BLAKE2B ab0e7da1de88e5e99ead0b8fa7f7a72773b84ae903a31dc3134e83364ea45069889f8ce9812bb471cf72b824fe013756d557489b4d2ab31216141d5b6347acfc SHA512 38d638fe01ff3cef1aebae1eefd276cf02f808978851b4465e132f77d3ab34ea51d512e2ea28a42ac65263b458c43cf420dc5f8ac930f959dd0c14916cef9841
-EBUILD 4ti2-1.6.2.ebuild 791 BLAKE2B 77d7e48246e7b3cc47242299457e411c020bffc8018c31c323d3551937682b15d07941805be6a718becf5fdb6397ab4cec9329de7a56553630d7d9f5c3956ca9 SHA512 01e5d5fecc98d0a320e1b56bf95308ba4fd43c068958b06717be221ee7a7149e2515a37fc7e819550246a94f4b286de6ecd946afa0675317bfbf2bb7793a67f2
 EBUILD 4ti2-1.6.6.ebuild 800 BLAKE2B df8476dc0f7617d68027bad16b76f9aa74708d2d21d7858ce95fca8b31e6077a2d5c4edfdade3e4efe35354c17b0ea7ac45bd119e1a1cf4b7a928481c95c2c71 SHA512 3c086bc2381b313e6ad4ee263739eaf2ccf6d752063f6ba6bc58b306a9b91256e9500fbf2346fe180ad295aff5b67b298808fcdbd8c02f0ed433b40e74f8c593
 EBUILD 4ti2-1.6.7.ebuild 905 BLAKE2B 8c7e27c7348adfcc660346ed683ad27cad8f93efdc4e13267bf27151e3b5bf0464b01cc4d07a0818fc6d5602655c476cd5db24a35fa5f3b60deaa03ed4ef92de SHA512 59321fb3f4a8e47a51263b4a43cce541926e37907f4789da9bdba4fb769f70e4e8faf8a16f8802c340eea7949f77ef765f79f1af5a58586e6a106ecd01bed54a
 MISC metadata.xml 446 BLAKE2B ce737e287f6b8f420aee86ca0ce72aa4952474a3ba717239dc8d10261038faddbc9b06f93a04bc8f8c48b36606254780865bbc5038564d4fb9252241e45a7a4b SHA512 2c7950b353c54597eebcff1f50e5045f792ef37cfe59f0142160bdf5ea47ff6be57bd698b051e6c56863b109fde983c1aeeca87827289abde96838af1aa3f7d1
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index b168f49ea237..2798179ec9cf 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/agda-lib-ffi/Manifest b/sci-mathematics/agda-lib-ffi/Manifest
deleted file mode 100644
index 38b1c5199d4d..000000000000
--- a/sci-mathematics/agda-lib-ffi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST agda-stdlib-2.4.2.3.tar.gz 252558 BLAKE2B 2373b9d395a64fe7f23bbb583d8cfc5b2572f5aa3ea98b687e8f122ae1accae835e4ed1ebfe7252a5bc5e519898b9ca39e1f19e16bb9f4195246f9904cc2c9af SHA512 d503fc2abd18ab8c367a1947301e0302a6ff9fcbb6376a01f016aa2ab7a9a967e5adb96c5013db1892f4acd9fab62bead11c58c4d443784aff1e42ee4ffd4aa9
-DIST lib-0.7.tar.gz 226400 BLAKE2B 4203486fa35d6dbfdcdfa227da43c771e8e2c78d906c06dae8cc3eb473c6ac0029554b98a0a665de80f1d1b5806a82ef68491050b0f90e80065a08ab91dba7c1 SHA512 557aa7b9b143f2e4a2249881a98c753035962bc5d9222241e6b4fe86aab8642986aa9db7ca6fc2b2da8486f9294ff30c4c2edfa0222ba95d9216ed2d0e00c114
-EBUILD agda-lib-ffi-0.0.2-r2.ebuild 731 BLAKE2B 84aacabeb83f81b599b457e62d3541c17d2f5e7d5880264a27a560c79a57490666771c602b127e3812fe671dccce21af7f0ea3531b1ad50ac5c90d27821481c1 SHA512 a7870a30ca78b00f3fb4645d394fbbdf881f4e87b189cd590f4587212f1f46dbcb60a73511278305f54768eaf2a4b9d8a52f94d4f2701dc9cfa391f4f1dc724a
-EBUILD agda-lib-ffi-0.0.2.ebuild 655 BLAKE2B cbdf24bdcd0027509b5cee43224f9b1c5e65c4c67263334a683ce848118c05967ebb8751da3742cd90678fe34b8fb06eec77fb33fd9e07f1a8bf02cce91d824e SHA512 ebeed8e5ae98c0a1b2f18bed48cb63cdd8c56d402ee7b61ea513ebd52c1cee744974133dfe3c00a255623c878726f89c871b9a7a94edf2d8406d31e39777a739
-MISC metadata.xml 330 BLAKE2B 6b8e9f614657955a82b93edde0ac6370bce3599a9abc1535da4b599f9fbaa666733aaa937d978026886708a8962bc30ff00b424d1c10295e250954ea83381a56 SHA512 1908170de455fb8967c973cd7aadfbe638813d41d0e52e6c4d762f44f1c75eaf8762c500a88293506982f881edc870e0e449270f45db499d230c356bc01e2d7e
diff --git a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild b/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild
deleted file mode 100644
index 9f4b8f627c6c..000000000000
--- a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild
+++ /dev/null
@@ -1,35 +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.3.5
-
-CABAL_FEATURES="lib"
-inherit haskell-cabal
-
-AGDA_PN="agda-stdlib"
-AGDA_PV="2.4.2.3"
-AGDA_P="${AGDA_PN}-${AGDA_PV}"
-
-DESCRIPTION="Auxiliary Haskell code used by Agda's standard library"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://github.com/agda/${AGDA_PN}/archive/${AGDA_PV}.tar.gz -> ${AGDA_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${AGDA_P}/ffi"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.5.0.0 && < 4.9' 'base >= 4.5.0.0'
-}
diff --git a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2.ebuild b/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2.ebuild
deleted file mode 100644
index a547e511ba11..000000000000
--- a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2.ebuild
+++ /dev/null
@@ -1,33 +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.3.5
-
-CABAL_FEATURES="lib"
-inherit haskell-cabal
-
-AGDA_P="lib-0.7"
-
-DESCRIPTION="Auxiliary Haskell code used by Agda's standard library"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://www.cse.chalmers.se/~nad/software/${AGDA_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${AGDA_P}/ffi"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 3.0.3.1 && < 4.7' 'base >= 3.0.3.1'
-}
diff --git a/sci-mathematics/agda-lib-ffi/metadata.xml b/sci-mathematics/agda-lib-ffi/metadata.xml
deleted file mode 100644
index bf5543388935..000000000000
--- a/sci-mathematics/agda-lib-ffi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">agda/agda-stdlib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-mathematics/agda-stdlib/Manifest b/sci-mathematics/agda-stdlib/Manifest
index 32cb093ede72..e66b2c2f43f5 100644
--- a/sci-mathematics/agda-stdlib/Manifest
+++ b/sci-mathematics/agda-stdlib/Manifest
@@ -1,4 +1,3 @@
-AUX 50agda-stdlib-gentoo.el 58 BLAKE2B e9b9bef913e26c63e4b0e19a1e4b5c0e370959689ae18e74ed54e7a8c1415c19fb517af9be59feee3e636042bc22fb68f1fd5457f551a436b920b42685aec1f4 SHA512 f45f0e59a1becd5d2b13b452219cc77b553dad9480a848ea62f276e106ab911ed1594e826fe487b886fe9b6e8aadcfde47de4fb1b0ab144ae98b6ac9eb385cfd
 AUX standard-library.agda-lib 55 BLAKE2B 057e933b07b291fd505f2e64f43b087c2aa4f4828ba2a03b5a53b9cac0f0fd0ab1f523c91efd6090e34e376dcc61d90bc5193063b6f07280c0eb2d688a07dedc SHA512 b1e2cbffe4b99157661fe6f4685580c7524890735db0a20ae1942e076b00d0df13624f587ea7584319e5665484da63beb3e0e5c77226bdbe02a4a80fa33a17b4
 DIST agda-stdlib-2.6.1.2.1.4.tar.gz 816654 BLAKE2B c8e6b6f86f32dd2e3d57da4a21066be4a441e71bc3a7cb96d8000f28c56cbb114a00e5df2777b00a8a9fc1a0f94b00bdf4b72eb46f0245ab482a41b6a9d772ee SHA512 90c05d54eaf1d7c78d00f73044afa1f3b4d99df622d40b3cea88fe280f0770ccaeddd787d8fb384c150123f592bb6a7ec24b842a9fcc2936f581d847928223ca
 EBUILD agda-stdlib-2.6.1.2.1.4.ebuild 2129 BLAKE2B 11076c1eb8fc55fb03ce65f8d2016da39eeaed2bfc0ed02a9aeec3266a000cee1a9be5a503af8df108f8ac36b1416ba9d6897e187554a5ef74d194171003f462 SHA512 8e63daeed5284581872533700ca043fd627fa39ec81962f92fa82083b907745d05c0049458af194cc0e5d838eddff6b3ab9c2b8aab4a9ac1be507ee23ab461e1
diff --git a/sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el b/sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el
deleted file mode 100644
index 62264a4451a0..000000000000
--- a/sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(setq agda2-include-dirs '("." "/usr/share/agda-stdlib"))
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index b57b041d11e6..36a12938fc46 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,5 +1,3 @@
-DIST alt-ergo-1.30.tar.gz 380329 BLAKE2B fab16757ed110474cf8f9d01ab53f76b6a300eb478b32bbfd6bb79d7603b1f5c2fc5c97bf44358eb138283f3487ef90febd23865723a4721b01bd870cfdd6507 SHA512 6ac6abdc6602b0ba89ee58eb96c66ac93e8195e0b4f75595381eded86365c2dd881251de2b77e2f1137684651ddc7fd94f922509de0be2964d81f52a6fb0f2f2
 DIST alt-ergo-2.3.0.tar.gz 455577 BLAKE2B 1836782be452df5147fc3041517fd267f3ce7facd15ad460c3e1dfba2b6ea455fee79ad8264ccb12cf21622c21a54c186c9943e7bffb392daab15d046ff93863 SHA512 a2f209b62b8494bfefe84328cdc786185e0534c5e224e212b83045b078352a51d2ab02622f72c22c74c7de95c7a554cbdae2a9a8a0c41f3f26c841f8c72f6b21
-EBUILD alt-ergo-1.30.ebuild 705 BLAKE2B 2ed4bdb55ba084ae8364cf49200a61b9b4c64941817acc1a448ebb5124eaaac264c8d895e5d98e4093fca05a9b7d6db638cf89a808d95af313c49a79cc94f9b9 SHA512 aa1f48cb7fb8d99d7745d77edbc9f69f9f591029c354018243d309f6d27be7e595758ae2f46a7854e82b456afc5405205e31d5f84e974949ad6e9248dc48cd39
-EBUILD alt-ergo-2.3.0.ebuild 1192 BLAKE2B d67021c7185ee7c260941dd90e704e707c06d45c042fb49b7e621875cde88155d01e94f32a2e9a76d72e639c6a54644b8bc57901b52ffe45e1b67ec734c9dbc1 SHA512 feec299d55489c1ee62bd30428effd73c421ee960e08621b0e3989a8f5c6690e85005b803fe934e9bd8c89ef3b97bc414d7eaea6f7ea8b09c0b012af6307f96a
-MISC metadata.xml 670 BLAKE2B 5f03c359cb298cc9a0fea6ef3a5deb092e5ccca7acfb2b7a5630303659bfd853fe86277ebbfb1fb7b6677d45dde2d5c68d55fffa8d3d8187acac3765f52df7c9 SHA512 9e514e4da2b92aa1e8e8e084450f478b51947172b689664dfe6c0fe0eb139e278e13689c8ba53825cb3bc32140cfd4cd7a68fede0d013cd065d5339d34931e8d
+EBUILD alt-ergo-2.3.0.ebuild 1207 BLAKE2B 395779b3fa2c360a9162ee18b5a8266f978ac96ac09e4da308efbb3f3eabc1cff770c2404dd1e2c0531d8b74b40b82e11331b5a5a69ef92bfe589ddcd7fbfa05 SHA512 d4611afe608836003b93f7e6942da711799116cffaed63ccbbbd1b36a8d8de638a5fee103d3cc751df8cb332e54e28bcaff72142b1be2a3fa1ba4bea1349b257
+MISC metadata.xml 752 BLAKE2B f01d0f3db111709d36917dafe391a9c6c95d9b814efe638ece98750b5fb69275b38cc1c0161820d11fcc8a9e4bbc757e892c6dff0272e30851c2effc2e6067c5 SHA512 0c8a0a93610fb79a3d54611182af60f77e77594caa212e1d8b91b6d9aed240f3a55f5078ddd1e991d07909c610983bc6a4f56934fa51085e96109991d7746a12
diff --git a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild b/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
deleted file mode 100644
index 197ea8a7f2dd..000000000000
--- a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Automatic theorem prover"
-HOMEPAGE="https://alt-ergo.ocamlpro.com"
-SRC_URI="https://alt-ergo.ocamlpro.com/http/${P}/${P}.tar.gz"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples gtk +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-3.12.1[ocamlopt?]
-	dev-ml/zarith
-	gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] )
-	dev-ml/camlzip
-	<=dev-ml/ocplib-simplex-0.3"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES INSTALL.md README.md )
-
-src_compile() {
-	emake
-	use gtk && emake gui
-}
-
-src_install() {
-	default
-	use gtk && emake DESTDIR="${D}" install-gui
-	use examples && dodoc -r examples
-}
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
index 7f950f433a25..bbe4688b7840 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,16 +12,16 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="examples gtk +ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt?]
-	dev-ml/zarith
-	dev-ml/lablgtk:2[sourceview,ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=]
+	dev-ml/zarith:=
+	dev-ml/lablgtk:2=[sourceview,ocamlopt=]
 	dev-ml/camlzip
 	sci-mathematics/psmt2-frontend
-	>=dev-ml/ocplib-simplex-0.4
-	>=dev-ml/menhir-20181006
-	dev-ml/seq
-	dev-ml/dune
-	dev-ml/num"
+	>=dev-ml/ocplib-simplex-0.4:=
+	>=dev-ml/menhir-20181006:=
+	dev-ml/seq:=
+	dev-ml/dune:=
+	dev-ml/num:="
 RDEPEND="${DEPEND}"
 
 DOCS=( CHANGES INSTALL.md README.md )
diff --git a/sci-mathematics/alt-ergo/metadata.xml b/sci-mathematics/alt-ergo/metadata.xml
index 8e305fa324a8..f428be9bb600 100644
--- a/sci-mathematics/alt-ergo/metadata.xml
+++ b/sci-mathematics/alt-ergo/metadata.xml
@@ -13,4 +13,7 @@
 		various domains such as hardware design, software verification and
 		formal testing.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">OCamlPro/alt-ergo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index 9f10ce0c12d4..aa44db3e56ac 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -1,8 +1,4 @@
-AUX 2.12.4.0-ldflags.patch 4026 BLAKE2B 75aecbb3d8e3cc03ff8e2ef248d7b54adf7417c2de730fb8e1957a159e16d62b76a1116e08cfd13039a5770d216c962cd257f9ea07034ac6c2d1094dc8ba9bfe SHA512 d0e6ca66504962e9c6b037a598b06239475c8a1b2e9152945ebec70be60f3b4e43dfbec95ac46bcc15d79ea5f81622a499807d523ee3f4ffb2b1134a00829433
-AUX calc-2.12.4.13-prefix.patch 3189 BLAKE2B 888798c53afbbd85375ab01a0cbbf0e790de52f82481a4e26a1c54d349789662484e3def5a0d2fedb4c81bb36d7219f295354ea3cda33e1019cb5cd2928da61f SHA512 aedaf30a8837cc1ff545b502e60e3284e4d8df37dd9d98516fbed17788f3d9a497aa3ba66f4613bd237de6152c041b339f26c89ff20ccdc1fb15387f9dba166e
 AUX calc-2.12.5.4-as-needed.patch 6226 BLAKE2B cb75c4ffbc5fd916e6d94d00bd32f8170be6eb82f47f1fde3d2d5968853ac7c7719883844563df6b545aa7226b178f9f54f7adb89a843fdd9ab7b92701193276 SHA512 fd65cdc727b9859d8d1a55e4140bb74301dc1941f647f5d52026818a1da56f90d21eea26a578bfd4fb0988cb3c516985239e8a06a3de15a9109fbe77b9536466
-DIST calc-2.12.4.13.tar.bz2 970778 BLAKE2B 0e34df7d445a84de89e2c662ea7e8da4a350eaeef984b5027befe5947bf8e863180dd07bbe525c4bc04a6e3aa53bfbb2f3d719c8bfff3c238b16941b701d4b4d SHA512 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534
 DIST calc-2.12.5.4.tar.bz2 956258 BLAKE2B 47c2ab46c47baf0d1f1d202a36e0d42cf0b25f7eecf61815814081b2f76aa65dc8cc4e970078a5176266ce1332751169424d1c6d2c16ff148a1b014986b56d47 SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f
-EBUILD calc-2.12.4.13-r1.ebuild 1324 BLAKE2B a4d8ae6c4997d8199cdbe5963fff227afb614ce2d38b454b0f67d62d9b47e070fdad784af9fc6e2fee608dfc68ebb069f7d22e2353ea7357d61717601b66b00d SHA512 0b71f653135b3c9241243110f1387d8bfa3ff80e5d12bc41dde8c7354d1dc00a7fe0dd1716772e22f8a9959aef621bdbdb78c3c7c8988d6353e8e090d47ae3b3
 EBUILD calc-2.12.5.4.ebuild 1313 BLAKE2B 5add771307505fdf9715f931306a7d2787e12650d0a2e934d9a7965ca7324ae3a6d90cca2b391f63985337afe48d3d9df9b9bea823fcecbca0ecebc8027f99c8 SHA512 ccbb388e68777c4a674504324e1dfaf0ca67c4a3125350a3ebe06c8f0f75989c6edae559475b0152e6a8200f74b04ce29eb50dad383a7a6c2eb17ee335cdfc43
 MISC metadata.xml 711 BLAKE2B 6c2e8e29413c40ccc3226b0e90f181b0ef4dea5d26bed5acc054c05576ca3c339ea433b4aaa45e940515346e83fffaf93d210a0eaecd55a64b822b425b54798f SHA512 8d88980b122ab65162de6d7038f4fc3744f741dabaf543d3edb6a013b61c3c6b53e30643174064c14fadc6d85d08c141aae0336f347b95caa78019c4e6fa8290
diff --git a/sci-mathematics/calc/calc-2.12.4.13-r1.ebuild b/sci-mathematics/calc/calc-2.12.4.13-r1.ebuild
deleted file mode 100644
index 7e43d678ca58..000000000000
--- a/sci-mathematics/calc/calc-2.12.4.13-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Arbitrary precision C-like arithmetic system"
-HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
-SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.12.4.13-prefix.patch\
-		"${FILESDIR}"/2.12.4.0-ldflags.patch
-	ln -sf libcustcalc.so.${PV} custom/libcustcalc.so || die
-	sed -i -e "/DIR/s:/usr:${EPREFIX}/usr:g" Makefile || die
-}
-
-src_compile() {
-	# parallel compilation hard to fix. better to leave upstream.
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		DEBUG="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CALCPAGER="${PAGER}" \
-		USE_READLINE="-DUSE_READLINE" \
-		READLINE_LIB="-lreadline -lhistory -lncurses -L\"${S}\"/custom -lcustcalc" \
-		all
-}
-
-src_test() {
-	if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
-		ewarn "Can't run check when running in sandbox - see bug #59676"
-	else
-		emake chk
-	fi
-}
-
-src_install() {
-	emake \
-		T="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-	dodoc BUGS CHANGES LIBRARY README
-}
diff --git a/sci-mathematics/calc/files/2.12.4.0-ldflags.patch b/sci-mathematics/calc/files/2.12.4.0-ldflags.patch
deleted file mode 100644
index 0f2b67d2c084..000000000000
--- a/sci-mathematics/calc/files/2.12.4.0-ldflags.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b526442..baa8273 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1144,11 +1144,13 @@ BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
- LD_SHARE=
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- else
--LIBCUSTCALC_SHLIB=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- endif
- #
- CC_STATIC=
-@@ -1227,9 +1229,9 @@ BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
- LD_SHARE=
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1267,9 +1269,9 @@ BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
- LD_SHARE= 
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1304,9 +1306,9 @@ CC_SHARE= -fPIC
- DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
- LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
-     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1340,8 +1342,8 @@ BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
- LD_SHARE= 
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- #
- CC_STATIC=
- LD_STATIC=
-@@ -1394,9 +1396,9 @@ BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
- LD_SHARE= 
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1431,9 +1433,9 @@ CC_SHARE= -fPIC
- DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
- LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
-     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -2002,7 +2004,7 @@ calc-static-only: ${STATIC_FIRST_TARGETS} ${EARLY_TARGETS} \
- 
- calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
- 	${RM} -f $@
--	${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
-+	${CC} ${LDFLAGS} ${CALCOBJS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
- 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
- 
- libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
diff --git a/sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch b/sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch
deleted file mode 100644
index 727618c3fe71..000000000000
--- a/sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/Makefile b/Makefile
-index cc84386..b526442 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1143,9 +1143,7 @@ ifeq ($(target),Linux)
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
-+LD_SHARE=
- LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
- LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-@@ -1177,9 +1175,8 @@ ifeq ($(target),Darwin)
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
- LD_SHARE= ${DARWIN_ARCH}
--LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
-+LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION}
- ifdef ALLOW_CUSTOM
- LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
- else
-@@ -1196,7 +1193,7 @@ CCWERR=
- CCOPT= ${DEBUG}
- CCMISC= ${DARWIN_ARCH}
- #
--LCC= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} gcc
-+LCC= gcc
- CC= ${PURIFY} ${LCC} ${CCWERR}
- #
- # Darmin dynamic shared lib filenames
-@@ -1211,7 +1208,6 @@ LDCONFIG:=
- # DARWIN_ARCH= -arch i386		# Intel binary
- # DARWIN_ARCH= -arch ppc		# PPC binary
- DARWIN_ARCH=				# native binary
--MACOSX_DEPLOYMENT_TARGET=10.8
- #
- endif
- 
-@@ -1230,9 +1226,7 @@ ifeq ($(target),FreeBSD)
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
-+LD_SHARE=
- LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
- LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-@@ -1272,9 +1266,7 @@ ifeq ($(target),OpenBSD)
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
-+LD_SHARE= 
- LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
- LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-@@ -1347,9 +1339,7 @@ ifeq ($(target),simple)
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
-+LD_SHARE= 
- LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- #
-@@ -1403,9 +1393,7 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
-+LD_SHARE= 
- LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
- LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index a0aa977db6e9..f33959c32726 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -4,5 +4,4 @@ DIST coq-8.9.1.tar.gz 6001970 BLAKE2B f65498e2485c59f4f95d2afeac35750ebf85b5af6d
 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
 MISC metadata.xml 999 BLAKE2B 04e27cb6563eca4cfab69c0a73a12e2ea5cb3ccb6dc711400ebbfb4790c896ab8f7efff0da1f985596333a4f32cd6d8278e750ef90cb5f0d61728d8f453095fa SHA512 0c78334d0d352fbe268804040a4f7765fba09055e316fd67739d052fbb4048817e3136065939f763248a3cbe27daf5884f2953b887690a7593aed6b5dc7157a6
diff --git a/sci-mathematics/coq/coq-8.9.1-r2.ebuild b/sci-mathematics/coq/coq-8.9.1-r2.ebuild
deleted file mode 100644
index 75d3af58a1fc..000000000000
--- a/sci-mathematics/coq/coq-8.9.1-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.0.7:=[ocamlopt?]
-	dev-ml/camlp5:=[ocamlopt?]
-	dev-ml/num:=
-	gtk? ( dev-ml/lablgtk:=[sourceview,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}
-		-lablgtkdir ${ocaml_lib}/lablgtk2
-		)
-
-	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 CHANGES.md
-
-	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 4cfc106d2631..1c63bfc667ba 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,6 +1,4 @@
 AUX cvc4-1.7-gentoo.patch 1665 BLAKE2B db98e67fb3b152e0c78019b21b32c99d06377f1b1c1cc6a3ac2edea5e27d6f8ba082fc209c3694e1144a94d9d3b1897418af250252ff40a26e521bbf72d7da0f SHA512 b6b7af8c48c0398375343c8fa72f3e15d8f9031848cf94e6e2880f04b5e8d695691dcf67b84daa1706464289f7db0300046af4c93adcf278f7951eccc734af89
-DIST cvc4-1.6.tar.gz 7815893 BLAKE2B 626e0dd49f911384e64d7e8ecf635aa12dad32830b2032bdcb96afd1a17c3566f56df51f75e9193cf365b562855733d0ea4ff3311ac99fc86e928a956298d2ad SHA512 0887b3f74a4b9e51e634591c7cf39d730110ca5d930149bab4816a49e383eeea8ccadf8474d22f5529cc03ddd045acacf8a2b92434b882adf352f4de4075fcd4
 DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
-EBUILD cvc4-1.6.ebuild 552 BLAKE2B 56a743e61a330551b7d17598019747a1bda37872f0e6f5d9e677caa07e01d5f4182e3cef7252ffd04050667b43fec563d548694188444355f5476442232664db SHA512 f8a8cd128057964e7db3749c4ae32575dfbe9b44414d8d7dc1e05aa8ee23ec6feeb624064fa34c9b21675507541b830b29cb14c536bd8121e428c6fbf5df29ba
-EBUILD cvc4-1.7.ebuild 1344 BLAKE2B b1c187f77296c5bba332a4795b990fb3df340a10c9acc9de6397e64b883b48e56ba3d0b42fef398cdfa8151799eeb2a59fae644466a2a605de6183cf84844c85 SHA512 34b1d046465f6cac1e8e098c743f79042fff0ad0eb051b68da0a0f6ca78bb27cf6ddbfe6ce8b1ba94eb779fc3faf69a7c79a42f3ddff34167ef7b28acd096fb1
+EBUILD cvc4-1.7-r1.ebuild 1418 BLAKE2B 6e93c224a331492380f8895ddcd0747be19d85cf720890a14a19d6783933a54bf59a9bc4c4fccf792aabca944071e19821d359c1ba5c941d26432b46756013a6 SHA512 2bd6c813ae75ebf1f0387f74f0b49f1b11be8b25119d774f19384561aa667647155769970ea55d7b75ba0905884634ac4635ec161ed8e82199540e9efe0fa47e
 MISC metadata.xml 801 BLAKE2B a8dffba2bb9a740412d4193911d1ab118336993d12d6d7e42c758af438d297baf6798e2ce9c6aa9be4282678e366087d54b8d3f8c46b43be6d73bcf421ee318a SHA512 d90e35c93e5defc5599f5e9d9b88a757a4a845574684270f1aab0cb8194c50b31fa3135ea221f63d0d71f867619c039f32cfb46b63fa370289e8eb5205d3b25d
diff --git a/sci-mathematics/cvc4/cvc4-1.6.ebuild b/sci-mathematics/cvc4/cvc4-1.6.ebuild
deleted file mode 100644
index d77a2ea6aaa1..000000000000
--- a/sci-mathematics/cvc4/cvc4-1.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems"
-HOMEPAGE="http://cvc4.cs.stanford.edu/web/"
-SRC_URI="http://cvc4.cs.stanford.edu/downloads/builds/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cln"
-
-RDEPEND="dev-libs/antlr-c
-	dev-libs/boost
-	cln? ( sci-libs/cln )
-	!cln? ( dev-libs/gmp:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf --enable-gpl \
-		$(use_with cln)
-}
diff --git a/sci-mathematics/cvc4/cvc4-1.7.ebuild b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
index 09aab161f76d..a35698d4920a 100644
--- a/sci-mathematics/cvc4/cvc4-1.7.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1 cmake-utils
 
 DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems"
 HOMEPAGE="http://cvc4.cs.stanford.edu/web/"
@@ -21,6 +23,7 @@ RDEPEND="dev-libs/antlr-c
 	cln? ( sci-libs/cln )
 	!cln? ( dev-libs/gmp:= )"
 DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 S="${WORKDIR}"/CVC4-${PV}
 
diff --git a/sci-mathematics/dataplot/Manifest b/sci-mathematics/dataplot/Manifest
index 671a7500058e..4b89516a9e8b 100644
--- a/sci-mathematics/dataplot/Manifest
+++ b/sci-mathematics/dataplot/Manifest
@@ -1,12 +1,8 @@
 AUX 90dataplot 75 BLAKE2B 598b5c51aee36823bcd1e97505ece68046091d8d343a7c6919a9ae9d740bfd4a749b45c5bcb98add18d51cd32f8c871cc408933f6bc83e1763aa5892833964d9 SHA512 5791dee87c98c13da3454d530f4290a130f426175e15efe1b8803d0436f867f49bdff13040df30168279d8eedf5268066f53d242a59ebd6bf7fd34d2e96073ac
-AUX Makefile.am.20090821 1360 BLAKE2B 132908ee84e750dcd163318574e075922595cc7112432be89681de5ac6a701c75e5bd05ae2a26978e069ba5976ce4c5318e7d98bf190750568bfa0a28a20c28c SHA512 0e6dc0595318bd411217093f36c4de47929d97102afe18869602f0866e1e07810814c483f5091ac3e511104defaaec6f1595826c5245d8086ee697bef2817c81
 AUX Makefile.am.20131220 1370 BLAKE2B 03a4a743ed2c38ab687602a9f85eb128a13d91696c592d32950d0a9b36c1d388a763653ca29d7372da3f593094d8206eaad9c89a365d8178643a978afac5bffc SHA512 d6081620833d3bf739b03c50f873c48f88acb2c10802f3ad0a946449f861eb3022f57e5536b90c71183dbca5c075ab230419be437e18e57c200a3f9d9a52dbed
-AUX configure.ac.20090821 2282 BLAKE2B 3cbbf42a99f8c0cc81ef5c12982d716e02ba986f22c94d492c831913835459504ff908cb362ec48211493ef67754e5114c0e2cb1f0d03406b30b1af6a80dbee1 SHA512 85f187133a6e38a491b4c998a51d01308e68e94dff99e04fba291debca2f20ce349cf864b47778f4e01c88ae5dcb8a18ef077209a4e446c00159c6343aaeb17a
 AUX configure.ac.20131220 2282 BLAKE2B 1ee098443f8aaba696b93948d62b6ed31fae8d14eecbac5fa4f9295f76ebd3e8447d409782a66ef911415cbb652f7275ccf09b4e5ea6743ee27f8b6583fbc61d SHA512 db4742468d9530c8103e54b4ccb4f0b3435e90bde6d692ed26f4677244bf7ce0b1f31bd5ee6fc58a493e3676693cef2513e42685881eabe48ff4ff1c94ff165e
 AUX dataplot-20090821-opengl.patch 1678 BLAKE2B 9b45ca716ba2ad053eac04942ee174a9ac6a5e6f6d451eedee03e18e6ebc0b13de866827a16eb9dce7de00881b1d7e53e61c99e8630c25c8eb0005696f9b8cf1 SHA512 cff8c08458c6d7ae57faa9e32ccf42b42adb9797b6b514aa597c34d5067935fefb5d1da9abf14ea2a74c17d3862d6b844f2e244895fb167fbce0b7b352f5dc07
 DIST dplib.2009_07_15.tar.gz 7507367 BLAKE2B 5eec49feb1e90d479547955e5717e8e49eed18f78bae5942881511becf517986c8ba8e2f7513000c52fbb1686cc31fadf38ac61fb1f0822283f6b4fa9dd6431b SHA512 5e4e6c866a5690c3f67b322d53b6bf1bec33c488a99c95f360ce74785a57286541945fdcab5cbbacb04039046f5ba94aeaf8112b80aa34ed2c2cf04abc6f7d40
-DIST dpsrc_2009_08_21.tar.gz 6656048 BLAKE2B 69f5a141cc17ec6c9d8b52fc0dfd546be6cbc06b859cac0fd318f80f31829ae76596c430ec0ae61eaf7d557fca728af9ef9efd88ee2213c4908976d2c91689c4 SHA512 1e655c6832b724b9f69692f28f5497fb4064d208cde5462c4bd73c8d255605ba62b9b703f5ea32bbe7506b18ccd0ad5c4c2556381fbebdb6e05ce51625a4a339
 DIST dpsrc_2013_12_20.tar.gz 6761551 BLAKE2B 029d278ebc025d0e902b2b37743f0ad53c567463d7929d69c7c1fe291b9355c29766035b9747f184ca28035eac2954ad391a7039da7151e7a5391ba123c6ac3f SHA512 a62df14f3ec59ccae4ead52b34adfc6e881ade1397e5a31b8a73c9740e7a2245317fef4f9756224c8d2fb57799c2247b15f6c4d65777de6302553fd138bb4083
-EBUILD dataplot-20090821.ebuild 1995 BLAKE2B f4025d89184c2e8e342e54702050a4e9d9a2649cbb4b4205010a23f986e725e3e8a776daf7f96adc59fc80eb3f0b48b975f3a679fc5de5cdaf035bcf7034f922 SHA512 e0e6d3d4612b43cf6f645dcee1334834f5ce6039c32c5365ec012837ff095fdf1d353a86fdd6044a9be8d160cf225e54dc9a81510ddfeb801d67378691c1f226
 EBUILD dataplot-20131220.ebuild 2020 BLAKE2B 8f124e353fda5b06a4b019198ec359994ba76251bd855ea545df8e4cc4c58a2a8de5561a6f73e378b5dfc3ff9139a88e8d30ebbfb38142c77b3aebf8d2b4f617 SHA512 070dac0662c6bd1a6c985d983c48c9bf730b4de20162c466c8719129c6348263a3bee0b754827816f6b5131288ae5aa21395b6fee1177ddb0f1e6cdcf44a8e06
 MISC metadata.xml 729 BLAKE2B acf75410378db42d3283a67d95504885f28b80c206ca171645f296f0a77d03a3ab559bb31e37fd543c4c38a3b7ff9051f79a2b7fe09a3d495d214d271f2c98b4 SHA512 9e3ff791dba6c01cf997c725c10b4dc614c2785faba67504b68d9295eed65110be5cde92588ba9a3d89842a62709ac4ff69fda03f87e8929b21e5ec1335beb19
diff --git a/sci-mathematics/dataplot/dataplot-20090821.ebuild b/sci-mathematics/dataplot/dataplot-20090821.ebuild
deleted file mode 100644
index bf52682525e4..000000000000
--- a/sci-mathematics/dataplot/dataplot-20090821.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fortran-2 toolchain-funcs autotools
-
-#     YEAR         MONTH    DAY
-MY_PV=${PV:0:4}_${PV:4:2}_${PV:6:2}
-MY_P=dpsrc_${MY_PV}
-# MY_PV_AUX usually ${MY_PV}
-MY_PV_AUX=2009_07_15
-MY_P_AUX=dplib.${MY_PV_AUX}
-
-DESCRIPTION="Program for scientific visualization and statistical analyis"
-HOMEPAGE="https://www.itl.nist.gov/div898/software/dataplot/"
-SRC_URI="
-	ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P}.tar.gz
-	ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P_AUX}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples gd opengl X"
-
-REQUIRED_USE="opengl? ( X )"
-
-COMMON_DEPEND="
-	media-libs/plotutils
-	opengl? ( virtual/opengl )
-	gd? ( media-libs/gd[png,jpeg] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	X? ( x11-misc/xdg-utils )"
-
-S="${WORKDIR}/${MY_P}"
-S_AUX="${WORKDIR}/${MY_P_AUX}"
-
-src_unpack() {
-	# unpacking and renaming because
-	# upstream does not use directories
-	mkdir "${S_AUX}" || die
-	pushd "${S_AUX}" > /dev/null || die
-	unpack ${MY_P_AUX}.tar.gz
-	popd > /dev/null || die
-	mkdir ${MY_P} || die
-	cd "${S}" || die
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-opengl.patch
-	cp "${FILESDIR}"/Makefile.am.${PV} Makefile.am || die
-	cp "${FILESDIR}"/configure.ac.${PV} configure.ac || die
-	sed -e "s:IHOST1='SUN':IHOST1='@HOST@:" \
-		-e "s:/usr/local/lib:@datadir@:g" \
-		dp1_linux.f > dp1_linux.f.in || die
-	sed -e "s/(MAXOBV=.*)/(MAXOBV=@MAXOBV@)/" \
-		-e "s:/usr/local/lib:@datadir@:g" \
-		DPCOPA.INC > DPCOPA.INC.in || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gd) \
-		$(use_enable opengl gl) \
-		$(use_enable X)
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S_AUX}"/data/*
-	fi
-	insinto /usr/share/dataplot
-	doins "${S_AUX}"/dp{mes,sys,log}f.tex
-	doenvd "${FILESDIR}"/90${PN}
-}
diff --git a/sci-mathematics/dataplot/files/Makefile.am.20090821 b/sci-mathematics/dataplot/files/Makefile.am.20090821
deleted file mode 100644
index e10cf41ebd54..000000000000
--- a/sci-mathematics/dataplot/files/Makefile.am.20090821
+++ /dev/null
@@ -1,46 +0,0 @@
-bin_PROGRAMS = dataplot
-dataplot_SOURCES = dp1_linux.f \
-	dp2.f dp3.f dp4.f dp5.f dp6.f dp7.f dp8.f dp9.f dp10.f dp11.f   \
-	dp12.f dp13.f dp14.f dp15.f dp16.f dp17.f dp18.f dp19.f dp20.f dp21.f \
-	dp22.f dp23.f dp24.f dp25.f dp26.f dp27.f dp28.f dp29.f dp30.f dp31.f \
-	dp32.f dp33.f dp34.f dp35.f dp36.f dp37.f dp38.f dp39.f dp40.f dp41.f \
-	dp42.f dp43.f dp44.f dp45.f dp46.f \
-	dpcalc.f dpdds2.f dpdds3.f dpdds.f edinit.f edmai2.f edsear.f edsub.f \
-	edwrst.f fit3b.f starpac.f tcdriv_nopc.f aqua_src.f cluster.f compgeom.f \
-	optimi.f libplot_src.c rldp.c main.f
-
-if ENABLE_GD
-dataplot_SOURCES += gd_src.c
-else
-dataplot_SOURCES += gd_src.f
-endif
-
-if ENABLE_GL
-dataplot_SOURCES += gl_src.c
-else
-dataplot_SOURCES += gl_src.f
-endif
-
-if ENABLE_X11
-dataplot_SOURCES += x11_src.c
-else
-dataplot_SOURCES += x11src.f
-endif
-
-dataplot_CFLAGS = @GL_CFLAGS@
-dataplot_LDADD = @GD_LIBS@ @GL_LIBS@ @X11_LIBS@ $(FLIBS) -lreadline
-
-# this is to remove ambiguity between the similar filenames
-# of the c and f77 version (shortcoming of automake)
-# the f77 versions are forced
-# the c versions objects are called dataplot-gd_src.o etc
-gd_src.o: gd_src.f
-	$(F77COMPILE) -c -o $@ $<
-gl_src.o: gl_src.f
-	$(F77COMPILE) -c -o $@ $<
-aqua_src.o: aqua_src.f
-	$(F77COMPILE) -c -o $@ $<
-libplot_src.o: libplot_src.f
-	$(F77COMPILE) -c -o $@ $<
-rldp.o: rldp.f
-	$(F77COMPILE) -c -o $@ $<
diff --git a/sci-mathematics/dataplot/files/configure.ac.20090821 b/sci-mathematics/dataplot/files/configure.ac.20090821
deleted file mode 100644
index fa9a700aa060..000000000000
--- a/sci-mathematics/dataplot/files/configure.ac.20090821
+++ /dev/null
@@ -1,76 +0,0 @@
-AC_PREREQ(2.59)
-AC_INIT([dataplot], [20090821], [n.heckert@nist.gov])
-AC_CONFIG_HEADER([config.h])
-AC_CONFIG_AUX_DIR(config)
-AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE([foreign])
-
-AC_PROG_CC
-AC_PROG_F77
-AC_F77_LIBRARY_LDFLAGS
-case $F77 in
-    *gfortran*) FFLAGS="${FFLAGS} -w -fno-range-check" ;;
-    *) ;;
-esac
-
-AC_CANONICAL_HOST
-case $host in
-     i?86*linux*) MAXOBV=100000 ;;
-     *64*linux*)  MAXOBV=1000000 ;;
-esac
-AC_SUBST(MAXOBV)
-
-AC_ARG_ENABLE(gd,
-  [AS_HELP_STRING([--enable-gd], [Enable the gd device driver])],
-  [enable_gd=$enableval],
-  [enable_gd=no])
-
-AC_CHECK_LIB(plot, pl_closepl_r, ,
-   	[AC_MSG_ERROR([plotutils libraries not found])])
-
-AC_ARG_ENABLE(gl,
-  [AS_HELP_STRING([--enable-gl], [Enable the OpenGL device driver])],
-  [enable_gl=$enableval],
-  [enable_gl=no])
-
-AC_ARG_ENABLE(X,
-  [AS_HELP_STRING([--enable-X], [Enable the X11 device driver])],
-  [enable_x11=$enableval],
-  [enable_x11=no])
-
-if test x"$enable_gd" = x"yes"; then
-   AC_CHECK_PROG(enable_gd, [gdlib-config],,
-   	[AC_MSG_ERROR([GD driver requested but gdlib-config not found])])
-   GD_LIBS="`gdlib-config --libs` -lgd"
-   GD_CFLAGS="`gdlib-config --cflags`"
-   AC_SUBST(GD_LIBS)
-   AC_SUBST(GD_CFLAGS)
-fi
-AM_CONDITIONAL(ENABLE_GD, [test x"$enable_gd" = x"yes"] )
-
-if test x"$enable_gl" = x"yes"; then
-dnl hardcoded opengl libs (should be host/implementation dependent)
-   AC_CHECK_HEADER(GL/gl.h,,
-   	[AC_MSG_ERROR([OpenGL driver requested but header gl.h not found])])
-   AC_CHECK_HEADER(GL/glu.h,,
-  	[AC_MSG_ERROR([OpenGL driver requested but header glu.h not found])])
-   GL_CFLAGS="-DUNIX_OS -DAPPEND_UNDERSCORE -DSUBROUTINE_CASE"
-   AC_SUBST(GL_CFLAGS)
-
-   AC_CHECK_LIB(GL, glXCreateContext, GL_LIBS="-lGL",
-   	[AC_MSG_ERROR([OpenGL driver requested but libraries not found])])
-   AC_CHECK_LIB(GLU, gluPerspective, GL_LIBS="-lGL -lGLU",
-   	[AC_MSG_ERROR([OpenGL driver requested but libraries not found])])
-   GL_LIBS="-lGL -lGLU"
-   AC_SUBST(GL_LIBS)
-fi
-AM_CONDITIONAL(ENABLE_GL, [ test x"$enable_gl" = x"yes" ])
-
-if test x"$enable_x11" = x"yes"; then
-   PKG_CHECK_MODULES(X11, x11,,
-     [AC_MSG_ERROR([X11 driver requested but pkgconfig module not found])])
-fi
-AM_CONDITIONAL(ENABLE_X11, [ test x"$enable_x11" = x"yes" ])
-
-AC_CONFIG_FILES([Makefile DPCOPA.INC dp1_linux.f])
-AC_OUTPUT
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 880ce72acb81..406ba3b3423b 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -4,9 +4,7 @@ AUX flint-2.5.2-utf8.patch 625 BLAKE2B ab76e01125f0f483b09c22a30656019963a98629c
 AUX flint-2.6.0-multilib-strict.patch 622 BLAKE2B d383ce45fb82fabd62530cc15a8bda65f1b088a115985469cd5bfd13d96d0bb9a21d9a073d78aa7ee98f08bd3f75f81445f274777562bca8f317b553cb8483cd SHA512 d360d3d57427d66dedb2f12b2dad03dbbe8530b0bec4184829eed7d8ba534eb8d6e24b302b149dfb852e0415d2612ec9e6312f8f2ac6f0f6a264b8a1f0a66a78
 AUX flintxx-include.patch 507 BLAKE2B 250e54de1ab5b70cffdac7348b78db543cbdb366efa419dea62ffed2b0b5f95b787019e96fb95b9253b5289d58a2322b41f660f1719516e410e4245b09accb7b SHA512 144dc23d8706e22c6ac5d50bc2ce6c9e2eb8016155bec48a809bceec435d07781105c073b669302132963f063ab1c311e7381f78cc29a0141ca78eceb25aa0dc
 DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
-DIST flint-2.6.3.tar.gz 4526340 BLAKE2B d663b44166cd857f83c2752eb4d4f6dc45eb8de535089e5dbe9939ac1464f1d69f66b62184644fff1ecd1d171f389d5ab874873def670c702733a0eba17bfd13 SHA512 8e71570364c789b1d4eaaa5f5adf10212cab47bf1a9f45c333211035ed021a86bb7b1de1feec51e83b2e113e8168853e370f127d2d2b1e941a12aec71fe8ae9e
 DIST flint-2.7.0.tar.gz 4943210 BLAKE2B a23b79195c71ef4691a450a82daded3de56eb51df1b3c850e13200527fff08da668281f350d7278ff52187eba8b7d9b27f4e69fafcaf771d8a01d72c6925b062 SHA512 6eac3d6fc306cacf482379074cba0d109aae4fbe8f907c17bcfe0afc2e8603c0fbe80e88a1ac374d9fa6d87aa59eb2b973f225a69da6dcc647255f060ad8711f
 EBUILD flint-2.5.2-r1.ebuild 1714 BLAKE2B e1e6770c375f95ac1bb5d4284ffc205ba4a95d9933799718862ab31a12c87c3da9ed0c46509b808856a3663eef1d4bbd0c7334d9b1f76a192d66e196a2eb1683 SHA512 4ee441362d871807a93a9e9ab8d5a4d261f1c87ae0802525a780855ceb93666f3ca721a0fcbfc7d341522a0c8d81e3b28765ba6a1246a3535881e35e20ec24dd
-EBUILD flint-2.6.3.ebuild 1155 BLAKE2B 5297af3acffb38e372b910766b6c4bd18c03779f2a36c4fd26ea6585a26a7c0201386e550b5ebc69dbb97a1e705470fa6ddaecd435e49fe85d2c527413af6b98 SHA512 1294c25101affbeb28c4a42110516e0f376344153c2b67b87300ea73f5aeaca12ee137051dce0983c2dc47d198dbc8a359a70fae46befb209a7b7aca20deff1b
 EBUILD flint-2.7.0.ebuild 1190 BLAKE2B 58b110471c0df4a259995a710b692ff4552e55e0e6e0b12e23421557a6773443115388b17a90bc5ba86e42f5007edf22797e582d5fb9ee0570537b92c77639bf SHA512 140c49b72df14f36c01f6e6c51f2fc370b33ca65c4716932022996afdec4a0ed10edee67b1fddd8a51f8a0ba5986ad7f94fa02e704cedbc3864281f01280bb64
 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
deleted file mode 100644
index d943d1c39050..000000000000
--- a/sci-mathematics/flint/flint-2.6.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/14"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="doc ntl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? (
-	dev-python/sphinx
-	app-text/texlive-core
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	)
-	${PYTHON_DEPS}"
-DEPEND="dev-libs/gmp:=
-	dev-libs/mpfr:=
-	ntl? ( dev-libs/ntl:= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-multilib-strict.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_NTL="$(usex ntl)"
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_DOCS="$(usex doc)"
-	)
-
-	cmake-utils_src_configure
-
-	if use doc ; then
-		HTML_DOCS="${BUILD_DIR}/html/*"
-		DOCS=(
-			"${S}"/README
-			"${S}"/AUTHORS
-			"${S}"/NEWS
-			"${BUILD_DIR}"/latex/Flint.pdf
-		)
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cmake-utils_src_make html
-		cmake-utils_src_make pdf
-	fi
-}
diff --git a/sci-mathematics/form/Manifest b/sci-mathematics/form/Manifest
index d49d5f6b02cb..3b80aadc3707 100644
--- a/sci-mathematics/form/Manifest
+++ b/sci-mathematics/form/Manifest
@@ -1,7 +1,3 @@
-DIST form-4.1.tar.gz 1260530 BLAKE2B ec279a069ea096089e9180541888f3212c6406311745a73cfd3f2e6da74f2fc88a93eea6d0d4af838fac6583e1eed5562455a40aca4cf502602552929453dfee SHA512 39ab2fa1e448d6d5e427cc2c92285cc27f84724addffc378f3b799fc2b3f6381b8dceb87cb980062b980885d8d81591c5c7ff7b0dbeae7b6d9a3cf0b03d58aae
-DIST form-4.2.0.tar.gz 1386285 BLAKE2B 3f50fe992df2c5b0e36b278de4e65a353a75c4b2c57be0c55f9973a8177577ed76ee40f8628b13ae9c2b7d73f38a7b4710b96db38639faa8ff002f42a8ec32f8 SHA512 7566b89c1c1b74da58da92426f5e4beee271d4273df6cbe1d1de1a17377125b745103852c363dfe8ff1b0e9cb9ba4c84187406e8f77b23f5198fd592f5dfe341
 DIST form-4.2.1.tar.gz 1444257 BLAKE2B 27ac9ee1412e6f478324b170e37e6e31822b74f902a5739d5fa00558aa4c9f7a977bd5fe3d6982313f1232a774c592d44af07fec8a290266c31bf3a100e87d1a SHA512 5569ae3e487194b0d082f4a032fb4b8d57238218d92d9b04d5f51db2a73e065eb1efdc26011bda46723e902fa3f324010ca2f8e91ba9a077e87b0a07b40cf594
-EBUILD form-4.1.ebuild 1733 BLAKE2B f214a218449fc02e7fbacb0d733600a81c6ecd972d29a145b2985e5d210ceb93cee8f0fcf2ee3356727890b61769675f96e8e59c90dcc71120356790b7bae56d SHA512 88d7a8d0b7d28aeb95f09af8aa4303114b5030ef2b522945443e42278f654e3ed4da0378f03b728c6b7243bca5cd920535fd245e18411311bd535fe397ea7534
-EBUILD form-4.2.0.ebuild 1749 BLAKE2B 92c0a913f4b27c4ad90d1af467b46e2dc7f624a873a02f6b72d96a0a3d88c4430aa50b1e4b95c1f4266cddd0eeddf04387848103517992e73f2bfe878989b693 SHA512 38c457d06c80b7905e6c370a58720465101f04d37650c5b3b70303aa6d908a7d9a2c1693fef34bbe24eaac0ccc01259980c6989548ece6b1215002dd6afb1798
 EBUILD form-4.2.1.ebuild 1746 BLAKE2B 571d9e4b9903bed7104ce42acbfb28d905d904e64d06c20de432f187fc9d6808f1d7b5e171cbe51b3e187bf40b3cccdfb2b8eeaeeeb9055854347122f45de782 SHA512 a659fc5b39b04562dce5a3fc2c9cb507fc209abb3b6009bdd8787ac547a3d14e3a0e6998489d3fbfee057458d9af6ae8de33df3f938e930a8e6bd1bd711b640e
 MISC metadata.xml 514 BLAKE2B 04dd10ac173df4f395621637069a41429c490904a53d67e695ea8cb342fcf8a7d46fdb32dab86f782ac7484cbe6b290ec7430505ac41bb6ca27bb8bc81171b98 SHA512 7bc96abda48843132dc49e3de58417f3349254de336e363b127856cf5700a0d4a6e7e30b516a0b0006dec1f20ec162e30b66e66ef9f55c80c6ac0666d13393f5
diff --git a/sci-mathematics/form/form-4.1.ebuild b/sci-mathematics/form/form-4.1.ebuild
deleted file mode 100644
index 16c8683ed40d..000000000000
--- a/sci-mathematics/form/form-4.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Symbolic Manipulation System"
-HOMEPAGE="https://www.nikhef.nl/~form/"
-SRC_URI="https://www.nikhef.nl/~form/maindir/binaries/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="devref doc doxygen gmp mpi threads zlib"
-
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	devref? ( dev-texlive/texlive-latex )
-	doc? ( dev-texlive/texlive-latex )
-	doxygen? ( app-doc/doxygen )"
-
-src_prepare() {
-	sed -i 's/LINKFLAGS = -s/LINKFLAGS =/' sources/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-scalar \
-		--enable-largefile \
-		--disable-debug \
-		--disable-static-link \
-		--with-api=posix \
-		$(use_with gmp ) \
-		$(use_enable mpi parform ) \
-		$(use_enable threads threaded ) \
-		$(use_with zlib ) \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}"
-}
-
-src_compile() {
-	default
-	if use devref; then
-		pushd doc/devref > /dev/null || die "doc/devref does not exist"
-		LANG=C emake pdf
-		popd > /dev/null
-	fi
-	if use doc; then
-		pushd doc/manual > /dev/null || die "doc/manual does not exist"
-		LANG=C emake pdf
-		popd > /dev/null
-	fi
-	if use doxygen; then
-		pushd doc/doxygen > /dev/null || die "doc/doxygen does not exist"
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-	if use devref; then
-		insinto /usr/share/doc/${PF}
-		doins doc/devref/devref.pdf
-	fi
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/manual/manual.pdf
-	fi
-	if use doxygen; then
-		dohtml -r doc/doxygen/html/*
-	fi
-}
diff --git a/sci-mathematics/form/form-4.2.0.ebuild b/sci-mathematics/form/form-4.2.0.ebuild
deleted file mode 100644
index 6d627fb717dc..000000000000
--- a/sci-mathematics/form/form-4.2.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Symbolic Manipulation System"
-HOMEPAGE="https://www.nikhef.nl/~form/"
-SRC_URI="https://github.com/vermaseren/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="devref doc doxygen gmp mpi threads zlib"
-
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	devref? ( dev-texlive/texlive-latex )
-	doc? ( dev-texlive/texlive-latex )
-	doxygen? ( app-doc/doxygen )"
-
-src_prepare() {
-	sed -i 's/LINKFLAGS = -s/LINKFLAGS =/' sources/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-scalar \
-		--enable-largefile \
-		--disable-debug \
-		--disable-static-link \
-		--with-api=posix \
-		$(use_with gmp ) \
-		$(use_enable mpi parform ) \
-		$(use_enable threads threaded ) \
-		$(use_with zlib ) \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}"
-}
-
-src_compile() {
-	default
-	if use devref; then
-		pushd doc/devref > /dev/null || die "doc/devref does not exist"
-		LANG=C emake pdf
-		popd > /dev/null
-	fi
-	if use doc; then
-		pushd doc/manual > /dev/null || die "doc/manual does not exist"
-		LANG=C emake pdf
-		popd > /dev/null
-	fi
-	if use doxygen; then
-		pushd doc/doxygen > /dev/null || die "doc/doxygen does not exist"
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-	if use devref; then
-		insinto /usr/share/doc/${PF}
-		doins doc/devref/devref.pdf
-	fi
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/manual/manual.pdf
-	fi
-	if use doxygen; then
-		dohtml -r doc/doxygen/html/*
-	fi
-}
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index 791f10ae61fb..82a650843c54 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,8 +1,4 @@
 AUX 64fricas-gentoo.el 101 BLAKE2B 7d2499931132bd7bf32b528cbc6b09127af060b879ebea93421206f6f5fbe685b070624e507390902d7cfc7cd06a5988ca2df9959b2549736be912b731990c21 SHA512 be36ef5bfb525aa054cd3881ece83d47ee3a9cb7ef1b0c26215d449ddcad8f9f57045b29ab9063a62f43caa764abb251e5fcd04cf1d15bcc423e40d9e69239ef
-DIST fricas-1.3.4-full.tar.bz2 10381144 BLAKE2B caff50ef2b2d8e9ef76448c265316ac8878010c505f9d871aa5579210ab2de3915f56a44687d3f96aba1f857efc8b3ec182b9b6c5c390e38dbdaf7cdba188dcc SHA512 efee0d8a05979c806182e9e45f81b56037d1a660909971d6b94af1f97732cfb7b689709d8af4229b7f649506860b1ed915dd5afb91378f4c9d8a6e960a248170
-DIST fricas-1.3.5-full.tar.bz2 10477848 BLAKE2B 2431e6dacbe1fc9069baa4335876809ee334b677d3d1bd9ddfbb6c23f6bdaaf2307ec994956c736d9dbbe07915cb1e51a235ef58d6307bdd239dca1c19d65552 SHA512 b800a9b3793506e49a4c5a63bd12a20f00b183d00ed9bd0061865f6cea39b05c026975458dcb3bb7da652fb75b3ce6417bbe1c16312da08cd6a366428ae9eaf9
 DIST fricas-1.3.6-full.tar.bz2 10422732 BLAKE2B c406907bbd8be66104db0ba52cfb49740a54daa53cbcb5949c4a4f090c7c978e8a5d345988544d4e93219be8c66a4c50b586ce4d99f32f8d020b1f015fe94b76 SHA512 5732a9645a15886a14b5778c3b2bd813462693e67ef2cd807742b325edd1ac4c3edbd671e25cc568c20e0a01b82d09defdac0b9eb7e355355461316be29d631c
-EBUILD fricas-1.3.4.ebuild 2382 BLAKE2B c4a01a8b8071b730ce265dc0b1dea5e43e9e9f68af96bc21032246ca8cbe04d1e94c4dd553e8d5efb029c1bbb2287d145a9b8126d8ef7cff17b998712be3bee3 SHA512 14723ac33a880819f5c46a6b7a96c4fd50d2eb37d3f92e7588720442249ede46461c6c8913f632ab846a12fa4a943adcaf6fbe3f63483980e581aff9f8f2f039
-EBUILD fricas-1.3.5.ebuild 2382 BLAKE2B c4a01a8b8071b730ce265dc0b1dea5e43e9e9f68af96bc21032246ca8cbe04d1e94c4dd553e8d5efb029c1bbb2287d145a9b8126d8ef7cff17b998712be3bee3 SHA512 14723ac33a880819f5c46a6b7a96c4fd50d2eb37d3f92e7588720442249ede46461c6c8913f632ab846a12fa4a943adcaf6fbe3f63483980e581aff9f8f2f039
 EBUILD fricas-1.3.6.ebuild 2382 BLAKE2B 4ba66ac739fc94f37debc949d6fdb57f838ae664e1a832e8dd24fe14b0cc2457b9e0f6b835cdc92e9f4588c244099adf3b7c7a424d86d27b9354f09c60ead144 SHA512 0799eb9e8ce77b1c75d93fc38c0dddbfd63c93744b7bc1bb376145b556bf78e3b0e73d17f5e04cb8657c979188b211c113768d6def8eb3632d449226fdb39282
 MISC metadata.xml 1061 BLAKE2B 1ee57daa6a688657712b8a917ab1d70bcd67a944133a7b625c8446334c1be03eb2b0ca65bd7c3ef4a54c29e00e6d5767456cb5fe93a9c20c7cf83fdc0df53869 SHA512 7835f6ea9fb94e2ab1ff2385990487802b868418757fb9c701c3081c452ca543716fa4a45f6467ce11144587ea40daf2cccb76345fc428740c225142e7b32291
diff --git a/sci-mathematics/fricas/fricas-1.3.4.ebuild b/sci-mathematics/fricas/fricas-1.3.4.ebuild
deleted file mode 100644
index 31d9696c2d72..000000000000
--- a/sci-mathematics/fricas/fricas-1.3.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib elisp-common
-
-DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
-HOMEPAGE="http://fricas.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl gcl ecls clisp clozurecl )
-# Version restrictions, . means no restrictions
-REST=(  .    .     .   .    .     . )
-# command name: . means just ${LISP}
-COMS=(  .    lisp  .   ecl  .     ccl )
-
-IUSE="${LISPS[*]} X emacs gmp"
-RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gmp? ( dev-libs/gmp:= )"
-
-# Generating lisp deps
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	LISP=${LISPS[$n]}
-	if [ "${REST[$n]}" = "." ]; then
-	    DEP="dev-lisp/${LISP}"
-	else
-	    DEP="${REST[$n]}"
-	fi
-	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
-done
-if [ "${REST[0]}" = "." ]; then
-	DEP="dev-lisp/${LISPS[0]}"
-else
-	DEP="${REST[0]}"
-fi
-RDEPEND="${RDEPEND} ${DEP}:="
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	RDEPEND="${RDEPEND} )"
-done
-
-DEPEND="${RDEPEND}"
-
-# necessary for clisp and gcl
-RESTRICT="strip"
-
-src_configure() {
-	local LISP n GMP
-	LISP=sbcl
-	n=${#LISPS[*]}
-	for ((n--; n > 0; n--)); do
-		if use ${LISPS[$n]}; then
-			LISP=${COMS[$n]}
-			if [ "${LISP}" = "." ]; then
-				LISP=${LISPS[$n]}
-			fi
-		fi
-	done
-	einfo "Using lisp: ${LISP}"
-
-	# bug #650788
-	if [[ ${LISP} = sbcl || ${LISP} = ccl ]]
-	then GMP=$(use_with gmp)
-	else GMP=''
-	fi
-
-	# aldor is not yet in portage
-	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP}
-}
-
-src_compile() {
-	# bug #300132
-	emake -j1
-}
-
-src_test() {
-	emake -j1 all-input
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc README FAQ
-
-	if use emacs; then
-		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
-			-i "${D}"/usr/bin/efricas \
-			|| die "sed efricas failed"
-		elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	else
-		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
-	fi
-	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/fricas/fricas-1.3.5.ebuild b/sci-mathematics/fricas/fricas-1.3.5.ebuild
deleted file mode 100644
index 31d9696c2d72..000000000000
--- a/sci-mathematics/fricas/fricas-1.3.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib elisp-common
-
-DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
-HOMEPAGE="http://fricas.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl gcl ecls clisp clozurecl )
-# Version restrictions, . means no restrictions
-REST=(  .    .     .   .    .     . )
-# command name: . means just ${LISP}
-COMS=(  .    lisp  .   ecl  .     ccl )
-
-IUSE="${LISPS[*]} X emacs gmp"
-RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gmp? ( dev-libs/gmp:= )"
-
-# Generating lisp deps
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	LISP=${LISPS[$n]}
-	if [ "${REST[$n]}" = "." ]; then
-	    DEP="dev-lisp/${LISP}"
-	else
-	    DEP="${REST[$n]}"
-	fi
-	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
-done
-if [ "${REST[0]}" = "." ]; then
-	DEP="dev-lisp/${LISPS[0]}"
-else
-	DEP="${REST[0]}"
-fi
-RDEPEND="${RDEPEND} ${DEP}:="
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	RDEPEND="${RDEPEND} )"
-done
-
-DEPEND="${RDEPEND}"
-
-# necessary for clisp and gcl
-RESTRICT="strip"
-
-src_configure() {
-	local LISP n GMP
-	LISP=sbcl
-	n=${#LISPS[*]}
-	for ((n--; n > 0; n--)); do
-		if use ${LISPS[$n]}; then
-			LISP=${COMS[$n]}
-			if [ "${LISP}" = "." ]; then
-				LISP=${LISPS[$n]}
-			fi
-		fi
-	done
-	einfo "Using lisp: ${LISP}"
-
-	# bug #650788
-	if [[ ${LISP} = sbcl || ${LISP} = ccl ]]
-	then GMP=$(use_with gmp)
-	else GMP=''
-	fi
-
-	# aldor is not yet in portage
-	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP}
-}
-
-src_compile() {
-	# bug #300132
-	emake -j1
-}
-
-src_test() {
-	emake -j1 all-input
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc README FAQ
-
-	if use emacs; then
-		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
-			-i "${D}"/usr/bin/efricas \
-			|| die "sed efricas failed"
-		elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	else
-		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
-	fi
-	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest
index 0cd5d41c801a..b20e33fdf663 100644
--- a/sci-mathematics/genius/Manifest
+++ b/sci-mathematics/genius/Manifest
@@ -1,9 +1,6 @@
-AUX genius-1.0.23-tinfo.patch 772 BLAKE2B 30f93f5ab25e51427d946906e0557c7298b280f1311e2f8f47af980e3035993d5b81c1d96258f08e5f23fcf347d992c2025f5448aa82de6d4134b0cde60bec93 SHA512 7f916124faa5f267c00e6609f0956339644a47db236d1f0d0468e64686f39de263b5a57da873dba09ba3b8967b6c8c35bc2b5fee7441b6af74e736deb5285402
 AUX genius-1.0.24-no_scrollkeeper.patch 1072 BLAKE2B fc05460f03b369e7c867b965a3bd3d6b0ac7722129377106c36358c4a07548f1a5a3c227bca9da2e7d5ad5ecf1290275fa6f46393aadd3865012c317b3f66f61 SHA512 d047ef4f3d253f48cee701f37709230d5c78694f98dcadc9b2bae399c93e9e043fa7bff27c81b8bf529cd83f06155b1059384c73e4647fd19795b5921316bdb9
 AUX genius-1.0.25-vte-conf-fixes.patch 5912 BLAKE2B 440ff10661aed72da46dc2fd1c499dfd9ca29ca70b93d867b23b704aea09b6c66681c829a4c189c6dd98f67c62646769326f459a247784fa7e26815dbc873182 SHA512 df3975480eec31922ba49922c1754f23056e68e40d4f52bf7c08155145863d9e6fefef5b0f1d76bd3bb060f5f9f23aab0e0f65be65c9ff5a1a1bedc591737d41
-DIST genius-1.0.23.tar.xz 2910332 BLAKE2B 8c9822737dfd0b445092c6b96376249093f3cfece4f0b98cb1bf62e9066336875fc014798b301686a9ffcaf5e37c1f324771c5b9e86c1578455874964427cca6 SHA512 8c64235d22734a7653468d39500ebbaa38b0ba7c25e292b4e96ddf825082584bf8c70e7ddc463b685ea01d51d3e08233b4e0cf8816a9a0e3357badb90d8e43c7
 DIST genius-1.0.25.tar.xz 2935920 BLAKE2B 9e5a58e15a1e53a64b10c662f1dea91ec80987d1be3ec208aaff76f59d1f9f5b2f9b2b1a2d6bede9c2cae5258038b2995b3bce6600471d088653b1392a1a8eb1 SHA512 ecd01acceb4cea3cb9796edaebc983ed7c0ee618737d98755882a845ddc07e1307851ef9fba75714bc33868556f03c004e03c3b9c42425293cb59a86b8af17a9
 DIST genius-reference.pdf 1024944 BLAKE2B e0058fbd266a4ed4bf29306520ac64b7ff9a970fa79b5132f5556b61a97dd985fe916c888d0d5a678528ef231a9c66310dc2affe01491c7848451b3d54f58274 SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285
-EBUILD genius-1.0.23.ebuild 1461 BLAKE2B a23dd485bc36ebfae68e6cea6f6b63867b77f521e2e4b636050595b1ef3e7f62e21f3aa76669bcbcc23c9a484fe6acea88af6ca335bd5b9789cf47d0617bc564 SHA512 512066eb09d4fe81722bb3cbe0802e074f1f658b24d0ebbb822b973dae9554934d2c469058dcb24320e290309bec4ab82385897e8f0c131c1a569c0d025f98b3
 EBUILD genius-1.0.25.ebuild 1465 BLAKE2B baba62c17f47fecbe46e14213693bb28d215dd40b42836efd4915c3afd452717783dba503f94eddb73804896b570ff9fe58c3888ec6316a49846d3815e6af4a9 SHA512 844848bd820fef9b3e3acb7a42473e987e4a3f471ae0e49d06b0b03329f1dfa200c80deeae203d40c7f75a92877bb51f874b89912e23dfa1f27edeb613f258ee
 MISC metadata.xml 809 BLAKE2B 9102651076c5b608afc1fbd7a2371d771587fbdc4960e56692f0999ddbfc9bef8096e04e59c491dc7c85ce4f75ec9fb9b093f49a3e53979d62e787e13377c345 SHA512 4259f2ea73e57edc70689d48522cb28ae79443b97b25799bfda21e9114bac15ae77bc27933fd6773c99daeaa060088cb0cb0acae71acd4af81fe7ae408c9e06c
diff --git a/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch b/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch
deleted file mode 100644
index e3250f0817c5..000000000000
--- a/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/675670
-
---- genius-1.0.23/configure.ac
-+++ genius-1.0.23/configure.ac
-@@ -15,6 +15,8 @@
- 
- AC_PROG_INTLTOOL([0.21])
- 
-+PKG_PROG_PKG_CONFIG
-+
- dnl ================= Requirements ================================================
- 
- VTE_REQUIRED=0.26.0
-@@ -64,8 +66,8 @@
- 
- dnl Check for termcap
- AC_CHECK_LIB(termcap, tgetent,[TERMCAP_LIB="-ltermcap"],
--	     [AC_CHECK_LIB(ncurses, tgetent,
--                           [TERMCAP_LIB="-lncurses"
-+	     [PKG_CHECK_MODULES(NCURSES, ncurses,
-+                           [TERMCAP_LIB="$NCURSES_LIBS"
-                             AC_DEFINE(USE_NCURSES,[1], [Use ncurses library])
-                             AC_CHECK_HEADER(ncurses/curses.h, [
- 					    AC_DEFINE(INC_NCURSES,[1],[ncurses include])])], [
diff --git a/sci-mathematics/genius/genius-1.0.23.ebuild b/sci-mathematics/genius/genius-1.0.23.ebuild
deleted file mode 100644
index f13471ac3010..000000000000
--- a/sci-mathematics/genius/genius-1.0.23.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="Genius Mathematics Tool and the GEL Language"
-HOMEPAGE="https://www.jirka.org/genius.html"
-SRC_URI="${SRC_URI}
-	doc? ( https://www.jirka.org/${PN}-reference.pdf )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gnome"
-
-RDEPEND="
-	>=dev-libs/glib-2.16:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	gnome? (
-		>=x11-libs/gtk+-2.18:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/vte-0.26.0:0 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-update-icon-cache
-	dev-util/intltool
-	sys-devel/autoconf-archive
-	sys-devel/flex
-	virtual/yacc
-" # eautoreconf needs sys-devel/autoconf-archive
-# dev-util/gtk-update-icon-cache because configure checks for it for some reason and never calls it with DESTDIR set..
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.23-tinfo.patch"
-	"${FILESDIR}/${PN}-1.0.24-no_scrollkeeper.patch"
-)
-
-src_prepare() {
-	gnome2_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# Unrecognized --disable-scrollkeeper warning comes from gnome2.eclass adding it based on grep, but upstream has them commented out in .ac with "#" instead of "dnl"
-	gnome2_src_configure \
-		$(use_enable gnome) \
-		--enable-nls \
-		--disable-extra-gcc-optimization \
-		--disable-static
-}
-
-src_install() {
-	use doc && DOCS+=" ${DISTDIR}/${PN}-reference.pdf"
-	gnome2_src_install
-}
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 9859e6665865..146379e26933 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,8 +1,6 @@
 AUX ginac-1.5.1-pkgconfig.patch 340 BLAKE2B 4e45d5af711f0a6bb833bd805340527be8972b8587f47ffe34b9e473b2783f6cb98af2b2397b199bfca1c7522250c68249112ac67a750ec59f31e26628978bd0 SHA512 b88c7ef69686733a3e817d9d4961246eb64aebf753b51bf8f6ea5c6fdfef41e52b6a20656e074f0bcc42dfe7965a440642d9036628a139f2c87bbde5f59d76d1
 DIST ginac-1.6.6.tar.bz2 1028211 BLAKE2B 3f939e82cfa833ee5ba6714d4db38edf80de4e380b0bcacfe23992ca3c5eefbd719506cf77f57aebc1517968eff7d26c8d24d14167c596e5e7145458367074e8 SHA512 495ef255dd32e71ee91257a515c0566e56525e0c54c8955c19beaf9e2e55457f7d8171c7e5f6e4f29f555f5d262bbaf4edf4f033166c4904c016987a5029e958
 DIST ginac-1.7.11.tar.bz2 1077491 BLAKE2B 741e9c8adfec15c225c3656b935707f86292b98310b50533269b238d1a9746bf54d186074c879fdbdd23f915dde225d9ee34fdbd87977835e8f9e78af364d77d SHA512 35a029915c946fcc10ba7b78df6fe1ece9a9f2f6bc172816a923c35f5b495154ab356526b904ac2a16a1bd6b0a81c480c5abb39ef40238ca7b32d1acbf97276c
-DIST ginac-1.7.8.tar.bz2 1075317 BLAKE2B 6ae917b442c090fa6c6b28f543eecfc2a8119a63d15494933f0cb1c979f018d6439551e52e92b6d50c8cf83ce2df66aca4bb6be947e5b18cbfab2539c42e0ad2 SHA512 4d5a0e52108aee2438362d66d6b5f3e3a108855fc2c0ab2bc521ddc9a2a87c9b1404ae5304ba7d1dbcf6e985bfe26c730e14f3f46d63d0bdffe242f4a948c6a0
 EBUILD ginac-1.6.6.ebuild 1400 BLAKE2B 7813592727485b9e4ffe56a4f5cbde1250823b239e621fdbbcd9485b25ab0062efc4cd09cdf2556c19fbaee1b34c8ab2b27d001f3b16c19fce5f748ad093b9ec SHA512 363562d721e28744c64b535404e8bab606c040df3d36af53b5e04156401db9c88210ed623317cd52a482b276585dc3741b3233cc0cf942abd2f1d55a790db8a3
 EBUILD ginac-1.7.11.ebuild 1628 BLAKE2B 3810a7bdde0344d086b8c00155a790e4e078aa163d4fb6645705102b97f0359d9ea39255094efec33dcaebf14e78d86c04057e73ed2272879a16773a0b41c41f SHA512 3f8db3ec36c581e6ec15f628fecc19c08816c6a90d0f0d7a279220aa1aa303115f40b5729f4febcf7a8409b42e591b6b82ee254c997c2da8df79268e1b1d139c
-EBUILD ginac-1.7.8.ebuild 1481 BLAKE2B b11bfa56f9fbff4187f0ff576ea5e82b1159ebfc0bef8c5b97f4ef5d7d370bf4fb2db87c6ddbb98c34fe238d063ea164c1bc15048a140d9abb44a0e85b18e5ec SHA512 81a14a67cbc97a05a93493f8502b56f528556b429f89f3f162dcfd73e7ee2ad84b88f88ed8b6124115dd3827c5e865317f2f6ec63dd9d95cf27bd1ba9045d20f
 MISC metadata.xml 685 BLAKE2B 78804186606452771e8b37a00dd41458fd7ffabd1813303528cda8596cebdd54c5daea16f324b7d23dfcf679255e73f1cff84116b0bf8a81cd79bb559dcd77ae SHA512 d0075823063455623b875bf678448b146243347879eb9ca5a4fb9324183d8dcda9c060145d5b874fead55491625ef08289b349b8abf1bf105e09ac9ebc647c37
diff --git a/sci-mathematics/ginac/ginac-1.7.8.ebuild b/sci-mathematics/ginac/ginac-1.7.8.ebuild
deleted file mode 100644
index b8985e5df43e..000000000000
--- a/sci-mathematics/ginac/ginac-1.7.8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="C++ library and tools for symbolic calculations"
-SRC_URI="http://www.ginac.de/${P}.tar.bz2"
-HOMEPAGE="https://www.ginac.de/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND=">=sci-libs/cln-1.2.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		   media-gfx/transfig
-		   virtual/texi2dvi
-		   dev-texlive/texlive-fontsrecommended
-		 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch )
-
-src_configure() {
-	append-cxxflags -std=c++14
-	econf --disable-rpath
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		export VARTEXFONTS="${T}"/fonts
-		pushd doc/reference >> /dev/null || die "pushd doc/reference failed"
-		emake html pdf
-		popd >> /dev/null
-		pushd doc/tutorial >> /dev/null || die "pushd doc/tutorial failed"
-		emake ginac.pdf ginac.html
-		popd >> /dev/null
-	fi
-}
-
-src_test() {
-	pushd ../${P}_build > /dev/null
-	emake check
-	popd > /dev/null
-}
-
-src_install() {
-	default
-	if use doc; then
-		pushd doc > /dev/null || die "pushd doc failed"
-		newdoc tutorial/ginac.pdf tutorial.pdf
-		newdoc reference/reference.pdf reference.pdf
-		docinto html/reference
-		dodoc -r reference/html_files/.
-		docinto html
-		newdoc tutorial/ginac.html tutorial.html
-		docinto examples
-		dodoc "${S}"/doc/examples/*.cpp examples/ginac-examples.*
-		popd > /dev/null
-	fi
-}
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index da8282b2070d..1ee29d1385b4 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,4 +1,7 @@
+AUX gmp-ecm-7.0.4-openmp.patch 795 BLAKE2B 2a857cba5e0bc4e7dfe710c250bcb721dd2fd5e0c9c049987f8505d2efc758ff026b313bc92a2b18472bbebc320c8d1187c8506eaea6d2f1f6d51da284bca3ae SHA512 063d20e5a4cf088aaed31eb79c6b253ef4747d3d449c70936b4079c519480767f4f19dc259894422dc6d5783c9c360fc2c3a9fda4bb9b2a124a0e7bd90c08554
+DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
 DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
 EBUILD gmp-ecm-7.0.4-r2.ebuild 1215 BLAKE2B c018b48131e2baeb0f373993b32c2a1e05b9669932ac54ece52ba30b8e0b63a6e59ff4506cbcd85bcb1d7e3ace665d993d4bae830ecb9f2909530fc41d3a78db SHA512 912183343a5a87f9fb27934de2e729a4eef66dec2a72ef6afbdb59eff91da2e2222647976b4304d186c40ef65a79a3536103527fbf0d9346419a46ddc3e5b476
+EBUILD gmp-ecm-7.0.4-r3.ebuild 1418 BLAKE2B fc3696d5bf04b0263bb3a66f233c53fb969508f1a1ac5e8ac74f6839b8dc20979c82ef61896fc3e9de821c14e498de45b9caff8ddf127f556fdc34842b9c742f SHA512 038497d4f87b17645c9d018b88839c7c1834e7114d270bb0396af13f5601c789ddf44bf34ef88472b8523d616d7f7c36c6490c3ebe3a58bc83d95bc93c3bf3d7
 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/files/gmp-ecm-7.0.4-openmp.patch b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch
new file mode 100644
index 000000000000..e382bf4ed28b
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch
@@ -0,0 +1,25 @@
+# fix for https://bugs.gentoo.org/732032 merged upstream
+diff --git a/pm1fs2.c b/pm1fs2.c
+index 4471bf6..89f8077 100644
+--- a/pm1fs2.c
++++ b/pm1fs2.c
+@@ -1562,17 +1562,16 @@ list_scale_V (listz_t R, const listz_t F, const mpres_t Q,
+ #pragma omp parallel if (deg > 1000)
+   {
+     mpmod_t modulus_local;
+-    long i; /* OpenMP insists on signed loop iteration var :( */
+     
+     mpmod_init_set (modulus_local, modulus);
+     
+ #pragma omp for
+-    for (i = 0; (unsigned long) i <= 2 * deg - 2; i++)
++    for (i = 0; i <= 2 * deg - 2; i++)
+       mpres_mul_z_to_z (H[i], Vt, H[i], modulus_local);
+     mpmod_clear (modulus_local);
+   }
+ #else
+-  for (i = 0; (unsigned long) i <= 2 * deg - 2; i++)
++  for (i = 0; i <= 2 * deg - 2; i++)
+     mpres_mul_z_to_z (H[i], Vt, H[i], modulus);
+ #endif
+ 
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
new file mode 100644
index 000000000000..acc3febe5011
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PN="ecm"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="https://gitlab.inria.fr/zimmerma/ecm"
+SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17f98056/${MY_P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
+
+DEPEND="dev-libs/gmp:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-openmp.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_compile() {
+	default
+	if use custom-tune; then
+		# One "emake" was needed to build the library. Now we can find
+		# the best set of parameters, and then run "emake" one more time
+		# to rebuild the library with the custom parameters. See the
+		# project's README or INSTALL-ecm. The build targets don't depend
+		# on ecm-params.h, so we need to "make clean" to force a rebuild.
+		emake ecm-params && emake clean && emake
+	fi
+}
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable openmp) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable custom-tune asm-redc)
+}
+
+src_install() {
+	default
+
+	# remove .la file
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index 8f4571517d2c..02d077aa1428 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -1,7 +1,4 @@
 AUX 50gretl-gentoo.el 473 BLAKE2B 4c855e4b79629828ba9f3c187550c64d26b93b6547ed8505d8485ade63d0963d04bf7f3de4b8a0b0d679657e93d2d08ff036d9a2ef1b02ec85936f872cc3aa86 SHA512 dff2fd680e295ba8cd722092d5ffe8cb36cd9b79f2ed2be69c8adaa5e414a456abb40c0ec70a6fc0d6b9fb09bf936e3c6ef6804f87bde62d86d3692c34ec595e
-AUX gretl-1.9.14-readline.patch 390 BLAKE2B 2133a732fb9584a4e6be8353a6e30220ab9b0df89bee9d707eddd0b7e2d833476b6c71940853f6e1d07820ba9ea65b1d7fc72a4d43c2eedf73bdb3538dbac486 SHA512 e67dc762b90fa9dee505155452008667916724e669216da09816a2236b863d9798e091237bbb722aea91e42c6ce1fe50deff33cc4148a7b403c1a455f4c74177
-DIST gretl-1.9.14.tar.xz 7564192 BLAKE2B 45af589e18d44f6d9e3e5d27050fe07cb0d7241bc2d40a8ef0b5eeed40839812ea6775001712f7b176c902d968e58c0c6763a9e342ce6063a3773626f04d3f8f SHA512 61ff44cc52f3da971d3cf2cc6e52e0401280521fd761ea098f753acc529c9d35a12fc296b46136d5d257c9a29a83f91a78a77822a00ce3f65776a17f97223ee1
 DIST gretl-1.9.90.tar.xz 7764820 BLAKE2B 1a47c31a62aad662ed3cfb4ad2057000eef14daf1f8cac4125f511f0229e29c1a7f43bc2e6014ec5b971173d9698e842c13e36b0f12faaa2f4fa996e26d984cb SHA512 35ec45fb2ad2dec490567411c1a5d909dc7fc8f0c4a6ca142e6e92b2d95a9efc9581f154a7806cf3f5178b530cdca9508b7c215bca29e1bcaebfa874d476667a
-EBUILD gretl-1.9.14.ebuild 2574 BLAKE2B 13bf84653593a70bb016ae7bed061b5edd5cddd32e2a5070e1cdaa87dc6401323e2cdbd1b330b65653a862a0f4426ce0fbc3539d673f195c12cfc05573a4474b SHA512 f4af7eee20003d246a2a19a2192cf605d54ae603fa92916f92ef0a7f3f92718080134b7ff50ba9e5cc4fc87e599ff29dc40394844fe973d046f1ff0475a34eae
 EBUILD gretl-1.9.90.ebuild 2710 BLAKE2B a976524c5217aa442f0edecff26a947386ef807397bb9350f1f11ce9764559dc15ee963d711718709dc9c7f7484c3be961a40fb7d7d36556a91fa281df259f53 SHA512 7233cd31b2c03f9779774db1057ca4ff5206c524815794ea85365f1d918fd45cdcbd6b5b310258d04e0632a2051572949728a227b37f20748287a5466e4d8dfe
 MISC metadata.xml 1122 BLAKE2B d9d243f2c1ff81869186aa07ad9ced3d6f8e90f0e5747ac745ff3e17c848ddb04281fc01bd6cdbcc756150db6ad28f1c69a4ce1b53f950e8b4d46fb8b9e4f457 SHA512 d5f169c5b22c7991efb2080425f682d51b9c5acd472d3f3155f64a45044c1a9a449ca5d34be9f792d7ce62be41584926c35896ffaf82c07fd6aeca17d0da423d
diff --git a/sci-mathematics/gretl/files/gretl-1.9.14-readline.patch b/sci-mathematics/gretl/files/gretl-1.9.14-readline.patch
deleted file mode 100644
index 9f6996b9c916..000000000000
--- a/sci-mathematics/gretl/files/gretl-1.9.14-readline.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cli/complete.c.ORIG	2007-08-22 16:44:46.000000000 +0200
-+++ cli/complete.c	2014-03-26 16:54:40.463070119 +0100
-@@ -126,6 +126,6 @@
-     rl_readline_name = "gretl";
- 
-     /* Tell the completer that we want a crack first. */
--    rl_attempted_completion_function = (CPPFunction *) gretl_completion;
-+    rl_attempted_completion_function =  (rl_completion_func_t*) gretl_completion;
- }
- 
diff --git a/sci-mathematics/gretl/gretl-1.9.14.ebuild b/sci-mathematics/gretl/gretl-1.9.14.ebuild
deleted file mode 100644
index 633e488873cc..000000000000
--- a/sci-mathematics/gretl/gretl-1.9.14.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_EINSTALL=true
-
-inherit eutils elisp-common toolchain-funcs
-
-DESCRIPTION="Regression, econometrics and time-series library"
-HOMEPAGE="http://gretl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility cpu_flags_x86_avx emacs gnome gtk nls odbc openmp python
-	readline cpu_flags_x86_sse2 R static-libs"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/libxml2:2
-	dev-libs/mpfr:0
-	sci-libs/fftw:3.0
-	sci-visualization/gnuplot
-	virtual/lapack
-	virtual/latex-base
-	accessibility? ( app-accessibility/flite )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gtk? (
-			media-libs/gd[png]
-			sci-visualization/gnuplot[gd]
-			x11-libs/gtk+:3
-			x11-libs/gtksourceview:3.0 )
-	odbc? ( dev-db/unixODBC )
-	R? ( dev-lang/R )
-	readline? ( sys-libs/readline:0 )"
-RDEPEND="${CDEPEND}
-	python? ( dev-python/numpy )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-REQUIRED_USE="emacs? ( gtk )"
-
-pkg_setup() {
-	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-readline.patch
-}
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-shared \
-		--with-mpfr \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable gtk gui) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk xdg) \
-		$(use_enable gtk xdg-utils) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable static-libs static) \
-		$(use_with accessibility audio) \
-		$(use_with odbc) \
-		$(use_with readline) \
-		$(use_with R libR) \
-		${myconf} \
-		LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		cd utils/emacs && emake
-		elisp-compile gretl.el
-	fi
-}
-
-src_install() {
-	# to fix
-	emake -j1 DESTDIR="${D}" install
-	if use emacs; then
-		elisp-install ${PN} utils/emacs/gretl.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	dodoc README README.audio ChangeLog CompatLog
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "To begin using gretl-mode for all \".inp\" files that you edit,"
-		elog "add the following line to your \"~/.emacs\" file:"
-		elog "  (add-to-list 'auto-mode-alist '(\"\\\\.inp\\\\'\" . gretl-mode))"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest
index 44823019b91b..cdb193f2688d 100644
--- a/sci-mathematics/jags/Manifest
+++ b/sci-mathematics/jags/Manifest
@@ -1,9 +1,3 @@
-DIST JAGS-3.4.0.tar.gz 1677450 BLAKE2B 130f2df593852657154825a0f059f805f93bd2631839093953f83dee0b6cc2bfaba31d2b59d6fe6d03150a09a1e3d2d11f7f50c378f8d89711e5ae9c71ba8488 SHA512 7a330ea41eab63b23d8ae3622c6920f0dc3dba653a18256957b9b862bb86b746ff706e9e9bf3f806524250b439161a6df4ad05af682354073f9b0074f9825896
-DIST JAGS-4.0.0.tar.gz 1880476 BLAKE2B 22bb4de85b1d4a9567efb8005fd55ecdda1f201c16278e83ffa6c2239371e4dbfa0b5d70aaa34a1cca96320fcf94753d3571e589b5246d77ae3fe3a0575c3a4b SHA512 bbe4f4600dff0fc1db6f8548b8d386ea804174d69788646681de6d006a0e0ab018fb01257b5737f871d10c8b59865950fb91b6a9cad5d1e6addc415004c6f82c
-DIST JAGS-4.1.0.tar.gz 1872634 BLAKE2B a9611917da3cef38ca8053442fc0563af7c04e62d09692381f4a6ddf3ea28149426ae9babd485213b76217936ac1e469a1d66548eadb2f585f07aace4c54f619 SHA512 76b52764e57e6c4450cc52c7c7c3de384f93bd6e57d8b88f1863b7c329bdd2ec39834902c223d433d263bcf29362b958807a9cb96b9066d4f75832b366339fd8
 DIST JAGS-4.2.0.tar.gz 1875538 BLAKE2B 039cefdb546ec28b905f22a4ec3dfe6d85c64064701283fe38be59f53da971b523d8bb5b7c5efe3e9da81a255b064cb8b66cac2fd4e844883b7fcf89cdabdbb1 SHA512 316483cd1a879c70c9b8ad6f23665196b95b9745da3924a47e14f4b0fd7c1abf9237575561cb31044623594360b6e991de68e1d9746baedeb285c65b77baada8
-EBUILD jags-3.4.0.ebuild 977 BLAKE2B 34828e6556b9611b72b69e323c7b60581c3c418bd5459ee24ffacf58fc769137d88deadc96fd0a1b609aa186fae680a83e45950d782f6c70181c6b787ec83009 SHA512 129dfdb423688686fd0b52f02b6934204a0ac9cb140427e3ba0bf4028ac8d4c6a3e50179e38a08f7533842d5a6e281a2f97693a0df9857ab82980d730697b4ac
-EBUILD jags-4.0.0.ebuild 974 BLAKE2B 7daaf595dc90f9fd3006f070af8836ef53dc1fc0b8449c5833a4df3a3d50f514a80615f984de398c3abde5ffc6488857da9a8bc3a4f18b1e6844c094c04c421d SHA512 962d8374060fc4de2661cf22926e2f31f7fe2b7b24df767e49815f115b45355cd0f1970785121f5d97154c3ae07ae5722b9ca00b13ed6e6860085e936f5191c1
-EBUILD jags-4.1.0.ebuild 890 BLAKE2B e0435cbc5d6693438bff7980c690c43af2f16aa855d29a5223a5f31cf43814306e9943df80324e556a72be55d8b31eeecef94e8237909a17b59f384222542223 SHA512 acebaa9773939b02706a16a55a919fbc57962894620ddac03bef7f9de6bf08cc57b67bee5d2795a122195843013568a4633b8e23755e900ceac1d1e1ff60eb7a
 EBUILD jags-4.2.0.ebuild 888 BLAKE2B ef6d3421456ae16d300cf0d235ccf296d43d0067bdea04c7a2a0ed0b8f9d1118f70aa25cafe6e6d0ed049bafa0e57a39e7d6f069de4bc96241c1061e9e2216a4 SHA512 20bfcb7248b6612271864c8217fbe74e0ae8b36237a20bbb0cea693e777149238708c5761adc509d9edd4d1017d3270a2dccf3eb000528be9c05cab27e4ecad5
 MISC metadata.xml 862 BLAKE2B 4e1fc4e399dfcdbfc828dc577661e28255c94004bb1f16734994d82b34279300b136217effbf545d1c0cdf3bfb9d1510b2549f1edcbe51f036924e7d4bab1416 SHA512 86f27a081286b51ba645006d3c65ec43d69aa4e15218bac97730295e2ebd1cab67c592f1c7fefdbdd9b959b68e54eaf358173f7d599cb1ab5ff13dea7eef3705
diff --git a/sci-mathematics/jags/jags-3.4.0.ebuild b/sci-mathematics/jags/jags-3.4.0.ebuild
deleted file mode 100644
index b7217d8d3027..000000000000
--- a/sci-mathematics/jags/jags-3.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils toolchain-funcs
-
-MYP="JAGS-${PV}"
-
-DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation"
-HOMEPAGE="http://mcmc-jags.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/3.x/Source/${MYP}.tar.gz"
-LICENSE="GPL-2"
-IUSE="doc"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		)"
-
-S="${WORKDIR}/${MYP}"
-
-src_configure() {
-	local myeconfargs=(
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo docs)
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc "${BUILD_DIR}"/doc/manual/*.pdf
-}
diff --git a/sci-mathematics/jags/jags-4.0.0.ebuild b/sci-mathematics/jags/jags-4.0.0.ebuild
deleted file mode 100644
index 5ad4ed026ac1..000000000000
--- a/sci-mathematics/jags/jags-4.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils toolchain-funcs
-
-MYP="JAGS-${PV}"
-
-DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation"
-HOMEPAGE="http://mcmc-jags.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/${MYP}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-	)"
-
-S="${WORKDIR}/${MYP}"
-
-src_configure() {
-	local myeconfargs=(
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(usex doc docs "")
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc "${BUILD_DIR}"/doc/manual/*.pdf
-}
diff --git a/sci-mathematics/jags/jags-4.1.0.ebuild b/sci-mathematics/jags/jags-4.1.0.ebuild
deleted file mode 100644
index df14892fc6fe..000000000000
--- a/sci-mathematics/jags/jags-4.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune toolchain-funcs
-
-MYP="JAGS-${PV}"
-
-DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation"
-HOMEPAGE="http://mcmc-jags.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/${MYP}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-	)"
-
-S="${WORKDIR}/${MYP}"
-
-src_configure() {
-	econf \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-}
-
-src_compile() {
-	emake all $(usex doc docs "")
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/manual/*.pdf
-	prune_libtool_files
-}
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 71d53124f2fa..ce1c318d0255 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -13,11 +13,7 @@ AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f
 AUX xdg-utils-0.patch 1090 BLAKE2B 7a342a9e0bfd5b3aae1e3f8c45046c4fcaffea277cb68193e92fce4b23e03a0430ae095891183497e5deb969f1ba5e68f2423a9576c7465b137300bc2b096803 SHA512 31b121a2d6f1c24e5f2fa3e6129f661a891660665bf45a2907146e3bae9309d185f83d7001287df92a73aff81562a7011ad6b92e03516883bc0ae0730570fa38
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
 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.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
 EBUILD maxima-5.44.0.ebuild 4734 BLAKE2B dcd011520dd59a9d31f0e652c8f6c2d71ab8d4b60ba188c85f87a5c95dc2585edaa9338c8e841c819e5ffc1185e7e5c9817097ac0bebb206105528263efe6435 SHA512 0a996621e2ac31d3104690d1184e18493095f709de2fab773f7a0147cfdbedb4570c8afdfaee4564ad6677ec2076626d7c2a056b17787d4e2ee6e65dc7faba3e
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/maxima-5.42.2.ebuild b/sci-mathematics/maxima/maxima-5.42.2.ebuild
deleted file mode 100644
index 68329d1041c7..000000000000
--- a/sci-mathematics/maxima/maxima-5.42.2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common eutils xdg-utils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~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     .               3    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-1 )
-
-	n=${#PATCHES[*]}
-	for ((n--; n >= 0; n--)); do
-		eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
-	done
-
-	n=${#LISPS[*]}
-	for ((n--; n >= 0; n--)); do
-		v=${PATCH_V[${n}]}
-		if [ "${v}" != "." ]; then
-			eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
-		fi
-	done
-
-	eapply_user
-
-	# 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() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
diff --git a/sci-mathematics/maxima/maxima-5.43.2.ebuild b/sci-mathematics/maxima/maxima-5.43.2.ebuild
deleted file mode 100644
index 4952aea0d09e..000000000000
--- a/sci-mathematics/maxima/maxima-5.43.2.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common eutils xdg-utils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~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     .               3    3         1     )
-
-IUSE="emacs tk nls unicode X test ${LISPS[*]}"
-RESTRICT="!test? ( test )"
-
-# 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="
-	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}
-	test? ( sci-visualization/gnuplot )
-	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-1 texinfo-0 )
-
-	n=${#PATCHES[*]}
-	for ((n--; n >= 0; n--)); do
-		eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
-	done
-
-	n=${#LISPS[*]}
-	for ((n--; n >= 0; n--)); do
-		v=${PATCH_V[${n}]}
-		if [ "${v}" != "." ]; then
-			eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
-		fi
-	done
-
-	eapply_user
-
-	# 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() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
diff --git a/sci-mathematics/minisat/Manifest b/sci-mathematics/minisat/Manifest
index f3619879e285..5308ae7fc652 100644
--- a/sci-mathematics/minisat/Manifest
+++ b/sci-mathematics/minisat/Manifest
@@ -1,8 +1,5 @@
-AUX minisat-2.2.0-header_fix.patch 3879 BLAKE2B 69ff3b53fe640a566f95b8171f4d366b8edb5ccc9caee3c0396d42054938870a41c82ffa44d68b489333ade542991a8e8f0067e1876dd656bc2a68eda8a38ecc SHA512 1a8a00e1a049dfab2c7041043ebc47eb09cac38c634c9fc54725fd262d24ef1f49dd445f2330122623d6464effd2755c36e7d16b3d5681a31ca1da0fcf9491b0
 AUX minisat-2.2.0_p20130925-nusmv.patch 17540 BLAKE2B 4dee908cb3b7f466ea2fa908667d37ebd3298069f6b09dafb1e5fd50a1e4f0bba318151efd38385b7e7571f0aa753dd34191fa3b08f64ad626f777c0df8528db SHA512 cfad7fb104f8630396f745144da7c052b1e6d5eb3ac9f3cc86a71c9d1353664ea9ece3cbd977f12a9d3a18efc245e33eb97bb949516c5620d3f6b76aa3c1586c
 DIST MiniSat.pdf 327416 BLAKE2B 77f77d763c9554680b4c5e1688801e8462102e8ddbcc3b53badccee17a98f935ef0e971a636abeb04021a2b3a3e9d6acfe4828b5dd20e6ef8733d71788cc31b0 SHA512 94e70c721740c0b7fd52621c7a5e43dd9207eed92e60a1c64ee63b541b9861d2580d14ba64c49c6c4f273ac028ded43bc944c71131e51693cdd7d1763af582f6
-DIST minisat-2.2.0.tar.gz 43879 BLAKE2B da4fd7694db0fe7b9a0979de8f2f3f005d7f112e2b2fe9e30b0dd6b5a5fb5bf6c7fd4ef8e8f2dd9fec34f8d5bfebb5be622810e07ca45da6989d2f84a011edc6 SHA512 cf79b05d43ebdc8fd8081899a1f853370de051cafe6e5b143eaff9827efc542b58062782a3ce2a3d1a03561a9ffd780c9cdc645bb50036eb61e80fa729136e64
 DIST minisat-2.2.0_p20130925.tar.gz 49544 BLAKE2B 8c6893fb6c604140609c36cc912c02a73c1f2726d7f399595c50d674aff69c57f9c4914da6d95c37a46fefc218dd4b0550645bd7058d46640d08103e2a4ec333 SHA512 37fc35cc4f3104d7f0e8ee9f7123fc34e175df578658266799d809d71d6cf081e811919f304a02f6cb9c3827d308e59408149d63d1d1e7c6d0b495350f93b3d9
-EBUILD minisat-2.2.0-r4.ebuild 1353 BLAKE2B c2f4e62d3ca9d6e6bd7caeeb851703d8b070192b00011cc200a1082f558c453b657387ed7578368f064becebf249d5ce075aa4d7eaacf41dd119c7dfd20ca9da SHA512 d763d57490d349f400f62c5516d99f14df57cf1aa03ec14d0d1035f5e0042ab17a3007637f336bec520295b388e960c0f67d5a6e81a13c90f984d13a43784f9c
 EBUILD minisat-2.2.0_p20130925-r1.ebuild 1612 BLAKE2B 4198df59696fa88b779ab8ea9954a1f53db39b8e9dfaf1c80897f5a772d9436731579ec2adf59d292bb0d9aa6baab446057333188838ed2a6548efd6ef5990fa SHA512 2bcbf4aeadb12e0998bdc97065c527dbeb29b155e352feaf4b871b89028a1784025c71e8e2f9ee27a135056feeb4fd557967c5d0e130b0b88ef7cfdc396aa438
-MISC metadata.xml 450 BLAKE2B 4e9b1174e1504d8af2b3c28c0bf809ec3e50624ca0e233962580a20470e59ae9592c055d3a99ed373d46a1553bcc3854198996be3ab621bb7285d236c7c677a4 SHA512 28a4189b3bf880bc6b799edc00b31762dfdff1b9a94a55d3939c3105661744a5aa4e89bf34c3faa4942d817d360b1fce318ca1a57e445dc287cfe53d1cb89a25
+MISC metadata.xml 334 BLAKE2B 6c8e245cf94929f31acefff32066440d934671086ef08654895633847c2a9fd9621b0a3d50e1bf8e492e56759c52a6f562436ccfde4f9eb5b5080670411b2355 SHA512 37b0bae5480c1fa58f5ceaa1cc7576899514923efa9fd7838faa9c4160a10cd19b640530313bc8d96936581c7842e27432e87ace63f4ae64d86d067f9a9e7dcc
diff --git a/sci-mathematics/minisat/files/minisat-2.2.0-header_fix.patch b/sci-mathematics/minisat/files/minisat-2.2.0-header_fix.patch
deleted file mode 100644
index 486c012fe2a4..000000000000
--- a/sci-mathematics/minisat/files/minisat-2.2.0-header_fix.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- ./utils/System.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./utils/System.h	2011-04-12 18:33:41.000000000 -0700
-@@ -25,7 +25,7 @@
- #include <fpu_control.h>
- #endif
- 
--#include "mtl/IntTypes.h"
-+#include <mtl/IntTypes.h>
- 
- //-------------------------------------------------------------------------------------------------
- 
---- ./utils/Options.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./utils/Options.h	2011-04-12 18:34:38.000000000 -0700
-@@ -25,9 +25,9 @@
- #include <math.h>
- #include <string.h>
- 
--#include "mtl/IntTypes.h"
--#include "mtl/Vec.h"
--#include "utils/ParseUtils.h"
-+#include <mtl/IntTypes.h>
-+#include <mtl/Vec.h>
-+#include "ParseUtils.h"
- 
- namespace Minisat {
- 
---- ./core/SolverTypes.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./core/SolverTypes.h	2011-04-12 18:27:58.000000000 -0700
-@@ -24,11 +24,11 @@
- 
- #include <assert.h>
- 
--#include "mtl/IntTypes.h"
--#include "mtl/Alg.h"
--#include "mtl/Vec.h"
--#include "mtl/Map.h"
--#include "mtl/Alloc.h"
-+#include <mtl/IntTypes.h>
-+#include <mtl/Alg.h>
-+#include <mtl/Vec.h>
-+#include <mtl/Map.h>
-+#include <mtl/Alloc.h>
- 
- namespace Minisat {
- 
---- ./core/Solver.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./core/Solver.h	2011-04-12 18:26:56.000000000 -0700
-@@ -21,11 +21,11 @@
- #ifndef Minisat_Solver_h
- #define Minisat_Solver_h
- 
--#include "mtl/Vec.h"
--#include "mtl/Heap.h"
--#include "mtl/Alg.h"
--#include "utils/Options.h"
--#include "core/SolverTypes.h"
-+#include <mtl/Vec.h>
-+#include <mtl/Heap.h>
-+#include <mtl/Alg.h>
-+#include <utils/Options.h>
-+#include "SolverTypes.h"
- 
- 
- namespace Minisat {
---- ./mtl/Vec.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Vec.h	2011-04-12 18:30:50.000000000 -0700
-@@ -24,8 +24,8 @@
- #include <assert.h>
- #include <new>
- 
--#include "mtl/IntTypes.h"
--#include "mtl/XAlloc.h"
-+#include "IntTypes.h"
-+#include "XAlloc.h"
- 
- namespace Minisat {
- 
---- ./mtl/Sort.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Sort.h	2011-04-12 18:31:05.000000000 -0700
-@@ -21,7 +21,7 @@
- #ifndef Minisat_Sort_h
- #define Minisat_Sort_h
- 
--#include "mtl/Vec.h"
-+#include "Vec.h"
- 
- //=================================================================================================
- // Some sorting algorithms for vec's
---- ./mtl/Alg.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Alg.h	2011-04-12 18:32:26.000000000 -0700
-@@ -21,7 +21,7 @@
- #ifndef Minisat_Alg_h
- #define Minisat_Alg_h
- 
--#include "mtl/Vec.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./mtl/Alloc.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Alloc.h	2011-04-12 18:32:18.000000000 -0700
-@@ -21,8 +21,8 @@
- #ifndef Minisat_Alloc_h
- #define Minisat_Alloc_h
- 
--#include "mtl/XAlloc.h"
--#include "mtl/Vec.h"
-+#include "XAlloc.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./mtl/Heap.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Heap.h	2011-04-12 18:32:05.000000000 -0700
-@@ -21,7 +21,7 @@
- #ifndef Minisat_Heap_h
- #define Minisat_Heap_h
- 
--#include "mtl/Vec.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./mtl/Map.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Map.h	2011-04-12 18:31:36.000000000 -0700
-@@ -20,8 +20,8 @@
- #ifndef Minisat_Map_h
- #define Minisat_Map_h
- 
--#include "mtl/IntTypes.h"
--#include "mtl/Vec.h"
-+#include "IntTypes.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./mtl/Queue.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Queue.h	2011-04-12 18:31:18.000000000 -0700
-@@ -21,7 +21,7 @@
- #ifndef Minisat_Queue_h
- #define Minisat_Queue_h
- 
--#include "mtl/Vec.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./simp/SimpSolver.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./simp/SimpSolver.h	2011-04-12 18:35:20.000000000 -0700
-@@ -21,8 +21,8 @@
- #ifndef Minisat_SimpSolver_h
- #define Minisat_SimpSolver_h
- 
--#include "mtl/Queue.h"
--#include "core/Solver.h"
-+#include <mtl/Queue.h>
-+#include <core/Solver.h>
- 
- 
- namespace Minisat {
diff --git a/sci-mathematics/minisat/metadata.xml b/sci-mathematics/minisat/metadata.xml
index 7c2c5eb3b390..42c0e14a3f43 100644
--- a/sci-mathematics/minisat/metadata.xml
+++ b/sci-mathematics/minisat/metadata.xml
@@ -5,9 +5,6 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<use>
-		<flag name="extended-solver">Build extended version of SAT solver with additional features.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">niklasso/minisat</remote-id>
 	</upstream>
diff --git a/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild b/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild
deleted file mode 100644
index 2bbc706d240a..000000000000
--- a/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Small yet efficient SAT solver with reference paper"
-HOMEPAGE="http://minisat.se/Main.html"
-SRC_URI="http://minisat.se/downloads/${P}.tar.gz
-	doc? ( http://minisat.se/downloads/MiniSat.pdf )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT"
-
-IUSE="debug doc extended-solver"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( README doc/ReleaseNotes-2.2.0.txt )
-PATCHES=( "${FILESDIR}"/${P}-header_fix.patch )
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-	# Remove makefile silencing
-	sed -i -e 's:@\(\$\|ln\|rm\|for\):\1:g'	mtl/template.mk || die
-}
-
-src_configure() {
-	myconf=$(usex debug d r)
-	myext=$(usex debug debug release)
-	mydir=$(usex extended-solver simp core)
-
-	tc-export CXX
-}
-
-src_compile() {
-	export MROOT="$S"
-	emake -C $mydir $myconf
-	LIB="${PN}" emake -C $mydir lib$myconf
-}
-
-src_install() {
-	insinto /usr/include/${PN}2/mtl
-	doins mtl/*.h
-
-	insinto /usr/include/${PN}2/core
-	doins core/Solver*.h
-
-	insinto /usr/include/${PN}2/simp
-	doins simp/Simp*.h
-
-	insinto /usr/include/${PN}2/utils
-	doins utils/*.h
-
-	newbin ${mydir}/${PN}_${myext} ${PN}
-	newlib.a ${mydir}/lib${PN}_${myext}.a lib${PN}.a
-
-	use doc && DOCS+=( "${DISTDIR}"/MiniSat.pdf )
-	einstalldocs
-}
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 6fb2634d7344..d7c503e626f7 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -1,11 +1,8 @@
 AUX fix-version.patch 499 BLAKE2B e4522d29cb5eed0eaad14ba37d9575268721457d607a7e10be571c56fcb016ec58c303df5b0b5f3430acee986d381241c39a8b1bde4eb136867552620b21d0ea SHA512 9ea8b52377cf11e6dc34860d3231dee364a8018d860a25ca25901fc00e948adb11ba767106df67e5769e6328fcb703638a14178666f53f9518c0e07b15d36767
-AUX fix-version2.patch 560 BLAKE2B 1a922dbb933781cceaf89898f8cac7e36caafb5217cf0b0f9c2dbae56d0bdc2ff66df21133a21e09f2c56b78cccda7679aa94c2d33c83623ed0c027accf5bf7f SHA512 c745b63461a76a20d32c3d022c120ed1ee201a05ed372f01381d71f4cc9601d92089acfc07bfe6930180740c4f4711b88b129d126065558d2cf6d7dd81bf78d8
 AUX msieve-1.51-reduce-printf.patch 1598 BLAKE2B 3cce6aab49b9c66fb4f0feede9a56a70ad62f63fdaad76116948133dd1a915d17c0b6887adc936692de1a91e917954a0478ea30d5db0449e3ad43b5d35835da8 SHA512 abd539239b1c289265b523f748dc0838df89d532a21c27040b6bbd0a8c7ef10641fc24a06378d48c45fe2d0156f09de06d10412d1d0ec71583c02123fa6158c6
 AUX msieve-1.53-fix-version.patch 1138 BLAKE2B 110bdba41cc622eb6edbebef641df4f5cbd9c184e87c8ee2824c7a29aa10f4615c98d4e1ef754fea960756d6afc1bf58e66c9f9d561fa3c699b462b216a9aabe SHA512 3133cd9d424328802060578fef60b7e0657b044927ac6a4e677c356f79224ec3d066764ab3ce6a06e5fc203bd8a000cbde47705277dcb6cc5f6a9004200d299d
 AUX reduce-printf.patch 2105 BLAKE2B 3ba089546e8a67100c9ab6849854c91c78a9e74b1385ab89a4c83586a4b774f9bd65f1fa007df32b5c57c80af6c58425742f8611c80746a361fe6d6ec5eb8aeb SHA512 c0ee9ddbbb41a25a48ec4b6cc80cf6a8afee35a723aee74eb7d7bfa01b545eff1713eaf2077ace7d2a9aca97f00aa42bc36e6d23d7d229f339de1f152316af98
 DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12
-DIST msieve151.tar.gz 623885 BLAKE2B a222f49fb1c6a411e1e46a7ed153e1ba24bbb604b70034c2c0632f69096e6a08a6783b25a44ffcd2d6b6962a8713455c893eb9514fb54a13f28a5b6a9aea3867 SHA512 79c03b5d669de7f05e27fc59fa999f416f513e41cba822376b862c31439fc66cf8749034c1f8f967f745955a5271a484b23e950ffede23d3fa2737ae26dbb0d4
-EBUILD msieve-1.51-r1.ebuild 1444 BLAKE2B 41db7580a8949792af750e712d66818d98c449500b7dc6e4ae0e11770db367b052ac7520adbd1c53f39b311d80f09e2703c961c568594224f7cffb72747d4ed4 SHA512 d25740704f94f2e6ceab9643a20d7013ba6c9cfdfec01983795f55596dff3c95836392294b9c86a6af3efeb6405e8bfc8483bb7d15301e4546aeb49f9c01c714
 EBUILD msieve-1.53-r1.ebuild 1457 BLAKE2B f8536704a0fcce0cdc2fc8e66f663cbf981b346ba2b4b91a1ac2e7462fe32eb35f2ba30a1391fd2e3e02124a9a95dbf1dcd0825770d5cf4fcf45ae06c3e37666 SHA512 88fb3b5fbc5357746bc37f4f5bd85d164fa6b54b7aa6b609868492d2c4c8acf8ca4d1befd5cae4460d97b404c0d685bc71b1c1c3594c868233f5edf77356c7ef
 EBUILD msieve-9999.ebuild 1317 BLAKE2B 8cd2cc6925fcecc20e3e78bffbfe2e331c53dcd32e7432be57188f5de1ab081152fc944e5ebd56e1248f9e0dfd0e421e726cf24081c61176556e9ca19bb0f8e8 SHA512 9b7cc2ea8f065e47fcda5b83f043262b59cc6705adf14187d81bd8ec6c05f3d80c08011c7613ab0b040328ba8c5a2f3b6d651916d487fed9c6195f15f8428507
 MISC metadata.xml 417 BLAKE2B ac5b4847814369f3126102ccf20421069b3b7edace1b95951729507d84bd37966d5f02cefff41857d32661fba8353dd29bef4de63097d276018acbf8ace456dd SHA512 a8c43840089c4516cd31bfd2a9fee4202bdb5a264cb28b22dcd7d17cd40669056cdc4a5c7a437b092bc71b1ec9c1bf6d1bc7f0f8f61858818749fad3e93eaf1d
diff --git a/sci-mathematics/msieve/files/fix-version2.patch b/sci-mathematics/msieve/files/fix-version2.patch
deleted file mode 100644
index 6e956897bdf0..000000000000
--- a/sci-mathematics/msieve/files/fix-version2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- demo.c	2011-11-25 00:25:28.000000000 +0800
-+++ demo.c.new	2012-11-30 16:46:50.417333847 +0800
-@@ -81,9 +81,8 @@
- /*--------------------------------------------------------------------*/
- void print_usage(char *progname) {
- 
--	printf("\nMsieve v. %d.%02d (SVN %s)\n", MSIEVE_MAJOR_VERSION, 
--					MSIEVE_MINOR_VERSION,
--					MSIEVE_SVN_VERSION);
-+	printf("\nMsieve v. %d.%02d\n", MSIEVE_MAJOR_VERSION, 
-+					MSIEVE_MINOR_VERSION);
- 
- 	printf("\nusage: %s [options] [one_number]\n", progname);
- 	printf("\nnumbers starting with '0' are treated as octal,\n"
diff --git a/sci-mathematics/msieve/msieve-1.51-r1.ebuild b/sci-mathematics/msieve/msieve-1.51-r1.ebuild
deleted file mode 100644
index 25cedcc0c961..000000000000
--- a/sci-mathematics/msieve/msieve-1.51-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
-HOMEPAGE="https://sourceforge.net/projects/msieve/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="zlib +ecm mpi"
-
-DEPEND="
-	ecm? ( sci-mathematics/gmp-ecm )
-	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# TODO: Integrate ggnfs properly
-	epatch \
-		"${FILESDIR}"/${P}-reduce-printf.patch \
-		"${FILESDIR}"/fix-version.patch \
-		"${FILESDIR}"/fix-version2.patch
-	sed -i -e 's/-march=k8//' Makefile 		|| die
-	sed -i -e 's/CC =/#CC =/' Makefile 		|| die
-	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile 	|| die
-	sed -i -e 's/LIBS += -lecm/LIBS += -lecm -lgomp/' Makefile || die
-}
-
-src_compile() {
-	use ecm && export "ECM=1"
-	use mpi && export "MPI=1"
-	use zlib && export "ZLIB=1"
-	emake \
-		CC=$(tc-getCC) \
-		AR=$(tc-getAR) \
-		OPT_FLAGS="${CFLAGS}" \
-		all
-}
-
-src_install() {
-	mkdir -p "${D}/usr/include/msieve"
-	mkdir -p "${D}/usr/lib/"
-	mkdir -p "${D}/usr/share/doc/${P}/"
-	cp include/* "${D}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${D}/usr/lib/" || die "Failed to install"
-	dobin msieve
-	cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install"
-}
diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest
index d043160eab13..4fb5b5add61b 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -1,7 +1,5 @@
 DIST nauty-popcnt.patch 56034 BLAKE2B 838858a0decf9323217f6b8d7b200b0158db9a02efd278a5d3cf7392ac2201e901b36b963f3f30ca6070fd0ddfa70577a442b795b09fec0d457d33649c6e93c6 SHA512 4931440b6178cb668997539ac2991f0d04758b8750668d4477cb8a456640640c5bb71c2858e423a4ad812e3401151834366e04693bf9a5ecc5ccc211d2e4229c
-DIST nauty25r9.tar.gz 1007323 BLAKE2B 29d8131a5d21d22a0ef5502d8822aefc07022e83eaa9e4660819929809a6f9c318f46d47e80be45882ff0b60cac774fe23ccceadf2a3bdeb5abf169541696474 SHA512 79f9054f1d39406063f4cbab61002b27f260b93fd37d6346efdfcd113c59ebab54320e6e7b6cdf26c7eddc376e4ad558e2cd4e6071d418dce2a6918f3c8f7ca2
 DIST nauty26r7.tar.gz 1660659 BLAKE2B d1d6774dd65cbdb906727324b5008bb962d54d16f99afe68f643f62ab2e7fe297a7cb4ef59b5f50c72c7e59fa9ff8ef2c82f4a77764c7f076b90e8171c7f1370 SHA512 60a724264b43b48338c17240c3cf7156f408267f1b2df995ea7b5ab9fa48852cb11057e83178a364ca028d80dc9124ca9b38cdac34e150a995475140d07c8af6
 DIST nauty_2.6r7+ds-1.debian.tar.xz 30328 BLAKE2B 009d64aa2042f814e55238ff83bde4d205925922c13a46213b933ec0f6364ed9a86aeabc7b4c22fdb717bd3ee7efdf794f3f2637cd08d7921e61cee99e73cf9a SHA512 fadde6a767e43048980842415207613ffeaa38d021fbf6a3f26a4bbe6877a92ddf5950094de517edd0f924deeacc8dec1d6a7334123c2a87d15befcc3876bc63
-EBUILD nauty-2.5.9.ebuild 939 BLAKE2B ea6bfda60603537be9f3ed6ff0fb45fac685acddc7917cdfecd0bd4500f873ec9296854d3971659e5381a72260b964c94d796a9a908247828394e253c95323bc SHA512 730391bfa7a60ba49c4bd42a59e9810f4b6721e4a674915c036f996ec1cc972f7a63aa498edc9825983787bfb518723d86f9d1bdb5b6905ff23cd922154ddac7
 EBUILD nauty-2.6.7.ebuild 1469 BLAKE2B 31dbd03617b358b4881f866c7b0c0863aa808c58433120c215886f23439896fff8f05e4df3e635473a4400a54fea53084cc81a949bc9eb732397d73775e1c831 SHA512 b9d7e3d17636c716e53658b590d37aaf4ed09219fed46b975cbd9ee1d36c17c1c57c3ce430b13f6125baf094e8f748072313c53e63c1e9249f081afe3f535f9b
 MISC metadata.xml 545 BLAKE2B dc773d4acdd458e7dbe5bc8744c847d9ae04eaedff901e4daa1f78cefcd261f158f54d916dcf054f7ba348b3c9d555d6542a421c3cc1ed1feda1276bd798064d SHA512 19b48e8150e6776f4c51f80cc0b4d468cbb320a9468dfe298debe21177e13a2c9a41d7ef2a24b54c5e7986231402f72d7db19c6c8b075ae9a3f103c040dd9262
diff --git a/sci-mathematics/nauty/nauty-2.5.9.ebuild b/sci-mathematics/nauty/nauty-2.5.9.ebuild
deleted file mode 100644
index c193b4436b15..000000000000
--- a/sci-mathematics/nauty/nauty-2.5.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-MY_PV=$(replace_version_separator 2 'r')
-MY_PV=$(delete_version_separator 1 ${MY_PV})
-
-DESCRIPTION="Computing automorphism groups of graphs and digraphs"
-HOMEPAGE="http://pallini.di.uniroma1.it/"
-SRC_URI="http://cs.anu.edu.au/~bdm/${PN}/${PN}${MY_PV}.tar.gz"
-
-LICENSE="nauty"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}${MY_PV}"
-
-src_prepare() {
-	sed \
-		-e "s/^LDFLAGS=.*/LDFLAGS=${LDFLAGS}/" \
-		-e 's:${CC} -o:${CC} ${LDFLAGS} -o:g' \
-		-e 's:${LDFLAGS}$::g' \
-		-i makefile.in || die
-}
-
-src_test() {
-	emake checks
-	./runalltests
-}
-
-src_install() {
-	dobin addedgeg amtog biplabg catg complg copyg countg \
-		deledgeg directg dreadnaut dretog genbg geng genrang \
-		gentourng labelg listg multig newedgeg NRswitchg pickg \
-		planarg shortg showg
-	dodoc README formats.txt nug*.pdf
-}
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index ec9f5a36a074..8347417e56d5 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,12 +1,5 @@
-AUX normaliz-2.12.1-respect-flags.patch 2097 BLAKE2B db826a38c85443a7b54df090fa14c936ca8baf358e1db098d0eff5e8e36c38091437044d9f119613e444675e92395e912a1800806dea40783f483b009d37dc67 SHA512 c5a01a49cd1f61a5eea007b991e44eb39910481a214ea169dbf87904c6bf258c23e6a85391e9584d125935b5b71e0b3285339fdd7f8e1d7e824aca6e953a2d54
-AUX normaliz-2.12.2-gcc49.patch 447 BLAKE2B 15f2a991ffeace1a950bd68a23d78ee5c6dcc3bc5a7159b7d6ecf0670e9e193170ee4011c3660a3b88132ef85e788bce9726ea963de003d0d868f05df11ff097 SHA512 465fc30dac17c2ba6c8f702386556fba21d5d2d6cf3282ac5bd87aa2f578b96c5ec852518ab345742518563e4882b99a58484b70576db36766e66498273449e1
-AUX normaliz-3.0.0-respect-flags.patch 2084 BLAKE2B e605a5e7fac31e964afd867d6d72dc8c8714d3e2b247e29f744f7ffafb812ec2eca548a86e1e496768b8c9ccba0767fa8b67507ae6d08d77b38a13226cef699e SHA512 e9ecc81f6023d098c2f1ba45676462f8fde2469ccf7e4ae86ce8859ea034a0ee3f8c12f9ea6521356b19a949744c9b8fe319a751c31248dfebea82358ad364a1
-DIST Normaliz2.12.2.zip 6432949 BLAKE2B 7c2d68937e1b5ad423aca170f613d3ca5c857b1d61a42e71f0f12e5bc9ec92995d1eee4267ad468e2ceaecd50ccff12147e0b203ee46dd85b2c856940e75f252 SHA512 fd42071cb87b8efbaf9af0885c173a0583e0b38dedb8821a83225eeebb44060a7b5748c44adfc4faeac20c3a1706071bcb9883cb4447e4a1ff3aeb770bd22038
-DIST Normaliz3.1.1.zip 5839858 BLAKE2B 5acb38f335b41e59312edb3dd58687ae139080a7c9965e5cc75996fcee1da991846ee2a7c6c49cdbc8cd3edb3f877a3bd71aa8491ff11715666b5a54dfbd7ef7 SHA512 efa75844542df45d3cff6b6f877f2d6132905b722468b3df5a89468798bf66cbaf33f359000fb462f4d24fb3414f4c293a8ba84112a6712862dd593bb5f314ba
 DIST normaliz-3.1.3.tar.gz 3075453 BLAKE2B 0860b466dfa5335a58a496c21f7567e7e4682b07c73e36dbbd947eb65500e03758577d32355adb02fa4e271ca2f49bc5cb0449e26f1bdd11eab2dd5dbafd8f17 SHA512 c7fb1620e758dc59de88f0d7c55f50db0f67be772a00af27205e478f30c3836b7cf012a16a8adfdee3f0367d3adb4e3f887dc7d03793a7ca1601968ddb1946ce
 DIST normaliz-3.3.0.tar.gz 4243027 BLAKE2B 4785c47a2d815518e98b012dcbfe3cb70aac0ea8e06ad8f15ad6ba73120589e24f82050c25368775299974a43fce42052ffdf49379cd2b14ef4e415f6bb2d8f9 SHA512 3e09be1a265746c2cedf24c6a38de2f3801a906a66a0fa73a98b05916a5e6f412d84f5e38276781b5d99ff779a2db3fc420acdadd036e9822cae41b2ed539be5
-EBUILD normaliz-2.12.2.ebuild 1760 BLAKE2B e3cc7dc61ebde2b17a51661a15a270aa478605b10ec268b391715bc6f0ceae4d0b69e3a2e6d8a503ecc8e038ffeabb733607559c0df3ba75ff3bf12578458688 SHA512 91541ff4a23926ea57d2022d34938bb637d989b5e710a08fefdf86ddc0975fad90c54bd1b486574f83d51eaf5ae1bfc7e4b4f08f003060700fbfcdc94f107e62
-EBUILD normaliz-3.1.1.ebuild 1723 BLAKE2B 8ef50d87b4a8ba5a6a157724529982fe576ae331a6208eb24c2dc34fa98194941c607ccaf4087c51171f18bcb76a6d245d9b9adb41d9041f8b9c649eed1caa82 SHA512 fbb0c55f0705ce0c6d3d6033bb85fe29d6753198481cbcc1ad9bc0e46d8550a3d8462d11490e926365713abd1523bcfd6460034dedb489cc096f67910d2fdad6
 EBUILD normaliz-3.1.3.ebuild 1659 BLAKE2B d50183eef102f41a0db131c387a4a03aa0cf85fc4b076bbafa07969a63d331e0ef71205f3683e174a3b78f4d4bb8b8cd529423a4fba4669670818f7a99b6b2a8 SHA512 01a49bb35e3aa5fec13193d67244396e31e295e3904f4c1e3dbd96ce78a4c6c3aef05d35d3e305b4b055accee30d8cfa67d1fcfbc3c564e64f9493a67ef01880
 EBUILD normaliz-3.3.0.ebuild 1179 BLAKE2B 6171fe91431d006f3db01d4abd2ec3a1957b737101626c1ad247f887c7640e27eff9fd2afb538ae5375d3fb69e9f39c9bf77cdfd79bd20be29fe8e4b37fb1e60 SHA512 cf4d08b810de4167e834aa8f0bf6b2cdd0c478b255f797041f3b82753f69d7aee7f1da4e0f7a7457de89dcb7993a4ab51f7163e6a2fdef70281607a3c42f870b
 MISC metadata.xml 694 BLAKE2B bd87919779ac6083ddaf3f566708eb47baba2a2634e1af1e7c1fbcffef40960cf81c246b979bd800235cbb45707f33fcbbdabba59a0fdde192cc90aaf6e61ff7 SHA512 16995494ba6c269d6a8a437623196d29be82a5edcb9f00218f032deb0198e78061c765e7ac49883a051039a9ffcbe7107a1fc641c380dea3bc8d4df1ce11cc30
diff --git a/sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch
deleted file mode 100644
index d7d83ee79d91..000000000000
--- a/sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -U 3 -dHrN Normaliz2.12/source/Makefile Normaliz2.12.patched/source/Makefile
---- Normaliz2.12/source/Makefile	2014-10-23 15:01:56.000000000 +0200
-+++ Normaliz2.12.patched/source/Makefile	2014-10-25 14:56:39.426295174 +0200
-@@ -17,16 +17,16 @@
- 	@$(MAKE) normaliz
- 
- normaliz.o: $(SOURCES) $(HEADERS) $(LIBHEADERS)
--	$(CXX) $(CXXFLAGS) $(NORMFLAGS) -c Normaliz.cpp -o normaliz.o
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c Normaliz.cpp -o normaliz.o
- 
- normaliz: $(SOURCES) $(HEADERS) normaliz.o libnormaliz/libnormaliz.a
--	$(CXX) $(CXXFLAGS) $(NORMFLAGS) normaliz.o libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) normaliz.o libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz
- 
- normaliz1: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES)
--	$(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1
- 
- normaliz-pg: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES)
--	$(CXX) $(CXXFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg
- 
- 
- #always go down the directory and let the make there check what has to be done
-diff -U 3 -dHrN Normaliz2.12/source/Makefile.configuration Normaliz2.12.patched/source/Makefile.configuration
---- Normaliz2.12/source/Makefile.configuration	2014-10-23 15:01:56.000000000 +0200
-+++ Normaliz2.12.patched/source/Makefile.configuration	2014-10-25 15:18:39.876313342 +0200
-@@ -1,11 +1,9 @@
- ##
- ## Makefile configuration for normaliz
- ##
--CXX = g++ 
- #CXX = linux32 g++ -m32 -march=i686  #compile it for linux32
- CXXFLAGS += -std=c++0x
- CXXFLAGS += -Wall -pedantic
--CXXFLAGS += -O3 -funroll-loops
- #CXXFLAGS += -I /usr/local/boost_1_45_0
- CXXFLAGS += -g       ## debugging
- #CXXFLAGS += -pg      ## profiling
-@@ -19,7 +17,6 @@
- endif
- 
- ## for distributing the executables link static (does not work for mac)
--CXXFLAGS += -static
- ## for almost static compilation on Mac use
- #CXXFLAGS += -static-libgcc
- ## make it compatible with older Mac versions
diff --git a/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch b/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch
deleted file mode 100644
index 35a28c8cf2a3..000000000000
--- a/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -U 3 -dHrN Normaliz2.12/source/libnormaliz/general.h Normaliz2.12.patched/source/libnormaliz/general.h
---- Normaliz2.12/source/libnormaliz/general.h	2014-10-23 15:01:56.000000000 +0200
-+++ Normaliz2.12.patched/source/libnormaliz/general.h	2015-03-01 13:20:01.057017555 +0100
-@@ -27,6 +27,7 @@
- 
- #include <iostream>
- #include <assert.h>
-+#include <cstddef>
- 
- #ifdef _WIN32 //for 32 and 64 bit windows
-     #define NMZ_MPIR //always use MPIR
diff --git a/sci-mathematics/normaliz/files/normaliz-3.0.0-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-3.0.0-respect-flags.patch
deleted file mode 100644
index cfd91d2feaff..000000000000
--- a/sci-mathematics/normaliz/files/normaliz-3.0.0-respect-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -U 3 -dHrN Normaliz3.0.orig/source/Makefile Normaliz3.0/source/Makefile
---- Normaliz3.0.orig/source/Makefile	2015-09-29 14:05:44.960631514 +0200
-+++ Normaliz3.0/source/Makefile	2015-09-29 14:06:06.510346764 +0200
-@@ -19,16 +19,16 @@
- 	@$(MAKE) normaliz
- 
- normaliz.o: $(SOURCES) $(HEADERS) $(LIBHEADERS)
--	$(CXX) $(CXXFLAGS) $(NORMFLAGS) -c Normaliz.cpp -o normaliz.o
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c Normaliz.cpp -o normaliz.o
- 
- normaliz: $(SOURCES) $(HEADERS) normaliz.o libnormaliz/libnormaliz.a
--	$(CXX) $(CXXFLAGS) $(NORMFLAGS) normaliz.o libnormaliz/libnormaliz.a $(LINKFLAGS) -o normaliz
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) normaliz.o libnormaliz/libnormaliz.a $(LINKFLAGS) -o normaliz
- 
- normaliz1: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES)
--	$(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(LINKFLAGS) -o normaliz1
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) Normaliz-impl.cpp $(LINKFLAGS) -o normaliz1
- 
- normaliz-pg: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES)
--	$(CXX) $(CXXFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(LINKFLAGS) -o normaliz-pg
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -pg Normaliz-impl.cpp $(LINKFLAGS) -o normaliz-pg
- 
- 
- #always go down the directory and let the make there check what has to be done
-diff -U 3 -dHrN Normaliz3.0.orig/source/Makefile.configuration Normaliz3.0/source/Makefile.configuration
---- Normaliz3.0.orig/source/Makefile.configuration	2015-09-29 14:05:44.960631514 +0200
-+++ Normaliz3.0/source/Makefile.configuration	2015-09-29 14:07:16.419426513 +0200
-@@ -1,11 +1,9 @@
- ##
- ## Makefile configuration for normaliz
- ##
--CXX = g++ 
- #CXX = linux32 g++ -m32 -march=i686  #compile it for linux32
- CXXFLAGS += -std=c++0x
- CXXFLAGS += -Wall -pedantic
--CXXFLAGS += -O3 -funroll-loops
- #CXXFLAGS += -I /usr/local/boost_1_45_0
- #CXXFLAGS += -g       ## debugging
- #CXXFLAGS += -pg      ## profiling
-@@ -21,7 +19,6 @@
- endif
- 
- ## for distributing the executables link static (does not work for mac)
--CXXFLAGS += -static
- ## for almost static compilation on Mac use
- #CXXFLAGS += -static-libgcc
- ## make it compatible with older Mac versions
diff --git a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
deleted file mode 100644
index 4cbaf8b64afe..000000000000
--- a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator
-
-MYPV=$(get_version_component_range 1-2)
-MYP="Normaliz${MYPV}"
-
-DESCRIPTION="Tool for computations in affine monoids and more"
-HOMEPAGE="http://www.mathematik.uni-osnabrueck.de/normaliz/"
-SRC_URI="http://www.mathematik.uni-osnabrueck.de/${PN}/Normaliz${PV}/Normaliz${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc extras openmp"
-
-RDEPEND="dev-libs/gmp[cxx]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-libs/boost"
-# Only a boost header is needed -> not RDEPEND
-
-S=${WORKDIR}/${MYP}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.12.1-respect-flags.patch"
-	epatch "${FILESDIR}/${PN}-2.12.2-gcc49.patch"
-
-	# Respect users AR tool (Bug 474532)
-	sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile || die
-
-	if use openmp && tc-has-openmp; then
-		export OPENMP=yes
-	else
-		export OPENMP=no
-	fi
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" OPENMP="${OPENMP}" -C source
-}
-
-src_install() {
-	dobin source/normaliz
-	if use doc ; then
-		dodoc doc/"Normaliz.pdf"
-		dodoc doc/"NmzIntegrate.pdf"
-	fi
-	if use extras; then
-		elog "You have selected to install extras which consist of Macaulay2"
-		elog "and Singular packages. These have been installed into "
-		elog "/usr/share/${PN}, and cannot be used without additional setup. Please refer"
-		elog "to the homepages of the respective projects for additional information."
-		elog "Note however, Gentoo's versions of Singular and Macaulay2 bring their own"
-		elog "copies of these interface packages. Usually you don't need normaliz's versions."
-		insinto "/usr/share/${PN}"
-		doins Singular/normaliz.lib
-		doins Macaulay2/Normaliz.m2
-	fi
-}
diff --git a/sci-mathematics/normaliz/normaliz-3.1.1.ebuild b/sci-mathematics/normaliz/normaliz-3.1.1.ebuild
deleted file mode 100644
index 69b0f3c68a98..000000000000
--- a/sci-mathematics/normaliz/normaliz-3.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator
-
-MYPV=$(get_version_component_range 1-2)
-MYP="Normaliz${MYPV}"
-
-DESCRIPTION="Tool for computations in affine monoids and more"
-HOMEPAGE="http://www.mathematik.uni-osnabrueck.de/normaliz/"
-SRC_URI="https://www.normaliz.uni-osnabrueck.de/wp-content/uploads/2016/04/Normaliz${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc extras openmp"
-
-RDEPEND="dev-libs/gmp[cxx]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-libs/boost"
-# Only a boost header is needed -> not RDEPEND
-
-S=${WORKDIR}/${MYP}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.0.0-respect-flags.patch"
-
-	# Respect users AR tool (Bug 474532)
-	sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile || die
-
-	if use openmp && tc-has-openmp; then
-		export OPENMP=yes
-	else
-		export OPENMP=no
-	fi
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" OPENMP="${OPENMP}" -C source
-}
-
-src_install() {
-	dobin source/normaliz
-	if use doc ; then
-		dodoc doc/"Normaliz.pdf"
-		dodoc doc/"NmzIntegrate.pdf"
-	fi
-	if use extras; then
-		elog "You have selected to install extras which consist of Macaulay2"
-		elog "and Singular packages. These have been installed into "
-		elog "/usr/share/${PN}, and cannot be used without additional setup. Please refer"
-		elog "to the homepages of the respective projects for additional information."
-		elog "Note however, Gentoo's versions of Singular and Macaulay2 bring their own"
-		elog "copies of these interface packages. Usually you don't need normaliz's versions."
-		insinto "/usr/share/${PN}"
-		doins Singular/normaliz.lib
-		doins Macaulay2/Normaliz.m2
-	fi
-}
diff --git a/sci-mathematics/num-utils/Manifest b/sci-mathematics/num-utils/Manifest
index e1c92eddc9fd..c5498937f6a1 100644
--- a/sci-mathematics/num-utils/Manifest
+++ b/sci-mathematics/num-utils/Manifest
@@ -1,7 +1,5 @@
 AUX num-utils-0.5-r2-Makefile.patch 1498 BLAKE2B dd113fae4449a4d40d5e2c4aba77e4442dd120b3ead0160963910f3b9c6ed9f14578e3795ea6ba5947bc591eeadf04154e5df2482dbae7c76dba0ec2e8699292 SHA512 a59169a419a8ee5529e28f67b67c231f27da10715ed5e876f2ed8c971e8b12870897c3759f12574f1de82e832947336f788e2b1a060cf594439722f98f43fbd5
 DIST num-utils-0.5.tar.gz 31845 BLAKE2B fe6620dd0cc7c0d0dc03447918b525f57e9360c5d2a44a32afe7879cf8000bbce646dc271fc821531642c209bf6b356783b09e969755eb7c7af785a8a07a2462 SHA512 6f5a2a8304a0ac3cdba342ecfd28ccd926778a5fde5eed4655f973a5c921e558f0986061ec11ba6146382f63a46b1503570576370a28a0f975e361d790f03561
-DIST num-utils_0.5-11.diff.gz 11702 BLAKE2B d0f81877b3dedbd98f89d0e7448739eb6c953cc966a2a49dfc598821802837b7ade4d6ee70586febd0e72218f042dead06bc3750616960862a63c9e8134f1bef SHA512 b461771ba1c8054d83f1aea06cd6beb92945ba929ff71df9e9c02b589c59dce2f2a19e7dab76120d48de7ae2f9e30f0271ae0b873d6e220ea195e160d4347bbf
 DIST num-utils_0.5-15.debian.tar.xz 17436 BLAKE2B 099e22a67b359072789106581c6d3b4fe006eb0064ad70578c0cf07388d1b9a677eb418d8d79ae59d6a9e0f3bff93e3159448e36c965f314c6bc559f5af70921 SHA512 5cbcf0d984e2c87fc16932bbd3e952a2b38c1272e00b55839d42ffaf28e0a8b0f5e4340ae01124ef34507ec4a144df0a48fa2af087f876cef39fdc5ba20ce0d1
-EBUILD num-utils-0.5-r1.ebuild 1106 BLAKE2B 53c6ace76cfd06ec42dc9ef8ffc02c7f2711243f4fc5f2cea0297b974e0e7c68aa42d3dfa67914cbf4c93d96a947f80acf783e3cb49a00ee0f5e311147c43c9b SHA512 a9a7fd1f2d9567a588d0929ef16262c6a734a5380637f358ca737af7af4bd57b5338cb427c7e2db99ac66366cfd0e278de2b115413d0a71b36c7e317fec2800d
 EBUILD num-utils-0.5-r2.ebuild 1202 BLAKE2B 57737675f383834ff0e3c0e897f74c8a6d7ca5f710af62bbd53a5dee80908361289252fe43489b1917192b96370484aedf383971a626089297f3ec2b381f0667 SHA512 46042e90a8b587947b3722eba43284e4731947181389606e74ff529d4804ab38c1c5b33c6246d112f987f02af56673ea48f26e6b3d0cde8d4e0ac39633e62a87
 MISC metadata.xml 269 BLAKE2B 5511cf8f01948aaca0488a6ed41ed923b130bfea9ba90d49f39bff86cfbd1e956b662d07406c76ca8e7e1d2ceb54547740e9f61a0a16041e5fcf18d713f90f03 SHA512 ecf9121172cdf04793bdbf6684060c7f15fb2a25606e53d8fc7dbc78efe24e264affa600c1ee3106ce8216b7093dff66eced3f78dd6ca7bd6ee589d1c7912cd6
diff --git a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
deleted file mode 100644
index cc567101a6ba..000000000000
--- a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DEB_PR=11
-DESCRIPTION="A set of programs for dealing with numbers from the command line"
-HOMEPAGE="https://suso.suso.org/programs/num-utils/index.phtml"
-SRC_URI="
-	http://suso.suso.org/programs/num-utils/downloads/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-PATCHES=(
-	"${WORKDIR}/${PN}_${PV}-${DEB_PR}.diff"
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:../orig/num-utils-0.5/::g' \
-		-i "${S}"/debian/patches/*.diff || die
-
-	eapply -p0 "${S}"/debian/patches/*.diff
-
-	local x
-	for x in average bound interval normalize random range round; do
-		mv $x num$x || die "renaming $x failed"
-	done
-
-	sed \
-		-e 's/^RPMDIR/#RPMDIR/' \
-		-e 's/COPYING//' \
-		-e 's/LICENSE//' \
-		-e '/^DOCS/s/MANIFEST//' \
-		-i Makefile || die "sed Makefile failed"
-}
-
-src_install() {
-	emake ROOT="${ED}" install
-}
-
-pkg_postinst() {
-	elog "All ${PN} programs have been renamed with prefix 'num' to avoid collisions"
-}
diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest
index 7e85b0742583..a272f59450a6 100644
--- a/sci-mathematics/petsc/Manifest
+++ b/sci-mathematics/petsc/Manifest
@@ -2,8 +2,6 @@ AUX petsc-3.13.0-do_not_run_mpiexec.patch 2822 BLAKE2B 6c8e8185c693fdc720c0d8ea8
 AUX petsc-3.13.0-fix_sandbox_violation.patch 1022 BLAKE2B 4883be2a38becba88dd1ceafffae46b775f75a59ce990c2d92808a52fb27e5ab89a14e355599009466be0af58680076e15ae74d82cd243b3bfe867fa90f4f05a SHA512 afd6e4ade2a53941d0211baa78e179de9c8bfead15c4c245d25623cee99fb1c0821d154e58428b3c431654d770689afdec1c2bd631f2fa8eedd99d3c7186656c
 AUX petsc-3.13.0-make_hypre_configure.patch 4055 BLAKE2B e3bc831665fbe2c9a724a13420d1ce7557b7a1a6fcd7537271a6e48622f29f71f72257d649bcbef4aa4f287a804407cdb80579797eb54cfa994ef85d5bcb617f SHA512 47e4971596342c160fc54e1bc6d9fa739ae4bf6a9e3f89659992a3548de0beacdc7ac34a900117c1ee43b6bfaa81e8a58f1c45acea072be612ece3b5d18d7f86
 AUX petsc-3.7.0-disable-rpath.patch 909 BLAKE2B b9b6064886d6c10b382982778398cb7fa254242e5ed0dfb86dd4cd6c094dc51eecfd625f6de5c2779bfc5b3beda351ac44145c69ac246d814a728d7565da8086 SHA512 8241c593d903615feb175bfe8213792ace739a18ac5f4c1d1890155ccea7de30b5ef5d97e2fa3b043e9a1e520e022abedeb038d0b4db671f89045e04edc65a68
-DIST petsc-3.13.0.tar.gz 35080264 BLAKE2B 0ac58e53751dbc6e053e3591cdf2363194e0cf7a493f252d879031e0135da16fa24e66974dd7bf07ce18558a75f8dd794e87f96590ad9e550d11edfeb462f727 SHA512 0590bb63d9c6dfd6ac03b1b88e5a8c11d42a0fd014084603d4d085060b126aa4341b4ec3a4d2b12146b971da327ccc7ede370e5633282bf44f269465aea32953
 DIST petsc-3.13.1.tar.gz 35097687 BLAKE2B fccf64fd3694deffdd0dc561069ffa7e9342fe279b5c9123edeb011df931874083839d27b7b9a0c63faea6487b104b54fd4ce68a88a074c82de91e8baaf270b0 SHA512 41c3138a6ae6c1f2d9077b464c6aeda96287e5a76849582b8f432e2ee93d2594a78ba2181eac0054a77b6165692be5f1a057049313f2be9743d4246383dfdc77
-EBUILD petsc-3.13.0.ebuild 5336 BLAKE2B 860ddcfa4620c552e483b8f581a59e11edba520a240dfa37b18c1fdf69b178b3c275c3fbbfa42b827396fb6e763cc66bb6681cc0c2612a640c4e37e176d97d9b SHA512 1116d684ea0304f07758ecd8cbebfa2f0a9e9b879fd2d22a646c51c4552fb856fdd1b543680137b4a7c44df089e07c0e6be6f90def039e8e671ed85cabde0572
 EBUILD petsc-3.13.1.ebuild 5336 BLAKE2B 860ddcfa4620c552e483b8f581a59e11edba520a240dfa37b18c1fdf69b178b3c275c3fbbfa42b827396fb6e763cc66bb6681cc0c2612a640c4e37e176d97d9b SHA512 1116d684ea0304f07758ecd8cbebfa2f0a9e9b879fd2d22a646c51c4552fb856fdd1b543680137b4a7c44df089e07c0e6be6f90def039e8e671ed85cabde0572
 MISC metadata.xml 1131 BLAKE2B db15101bb24374026158a0b45bab1b4b38ab6869bb13fc1df48eef96ca003cea0a8b9118033a3d53c735cefd5ca7563e074d458aee32e038a39e68a6a91b7364 SHA512 19cf1bcddd8bc1378bf85c47b090dd684474f29896c1877bfbeb53a24b1112ed4bb6e823cbc830ee40c886727c6c90d0852081488b1df63f8b4f071d3d453630
diff --git a/sci-mathematics/petsc/petsc-3.13.0.ebuild b/sci-mathematics/petsc/petsc-3.13.0.ebuild
deleted file mode 100644
index 6823bc877764..000000000000
--- a/sci-mathematics/petsc/petsc-3.13.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="https://www.mcs.anl.gov/petsc/"
-SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="afterimage boost complex-scalars cxx debug doc fftw
-	fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X"
-
-# hypre and superlu curretly exclude each other due to missing linking to hypre
-# if both are enabled
-REQUIRED_USE="
-	afterimage? ( X )
-	complex-scalars? ( !hypre !superlu )
-	hdf5? ( mpi )
-	hypre? ( cxx mpi !superlu )
-	mumps? ( mpi scotch )
-	scotch? ( mpi )
-	superlu? ( !hypre )
-"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	afterimage? ( media-libs/libafterimage )
-	boost? ( dev-libs/boost )
-	fftw? ( sci-libs/fftw:3.0[mpi?] )
-	hdf5? ( sci-libs/hdf5[mpi?] )
-	hypre? ( >=sci-libs/hypre-2.18.0[mpi?] )
-	metis? ( >=sci-libs/parmetis-4 )
-	mpi? ( virtual/mpi[cxx?,fortran?] )
-	mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack )
-	scotch? ( sci-libs/scotch[mpi?] )
-	sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 )
-	superlu? ( >=sci-libs/superlu-5 )
-	X? ( x11-libs/libX11 )
-"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-util/cmake
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.0-disable-rpath.patch
-	"${FILESDIR}"/${PN}-3.13.0-fix_sandbox_violation.patch
-	"${FILESDIR}"/${PN}-3.13.0-make_hypre_configure.patch
-	"${FILESDIR}"/${PN}-3.13.0-do_not_run_mpiexec.patch
-)
-
-# petsc uses --with-blah=1 and --with-blah=0 to en/disable options
-petsc_enable() {
-	use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0"
-}
-# add external library:
-# petsc_with use_flag libname libdir
-# petsc_with use_flag libname include linking_libs
-petsc_with() {
-	local myuse p=${2:-${1}}
-	if use ${1}; then
-		myuse="--with-${p}=1"
-		if [[ $# -ge 4 ]]; then
-			myuse="${myuse} --with-${p}-include=${EPREFIX}${3}"
-			shift 3
-			myuse="${myuse} --with-${p}-lib=$@"
-		else
-			myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}"
-		fi
-	else
-		myuse="--with-${p}=0"
-	fi
-	echo ${myuse}
-}
-
-# select between configure options depending on use flag
-petsc_select() {
-	use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4"
-}
-
-src_configure() {
-	# bug 548498
-	# PETSc runs mpi processes during configure that result in a sandbox
-	# violation by trying to open /proc/mtrr rw. This is not easy to
-	# mitigate because it happens in libpciaccess.so called by libhwloc.so,
-	# which is used by libmpi.so.
-	addpredict /proc/mtrr
-	# if mpi is built with knem support it needs /dev/knem too
-	addpredict /dev/knem
-
-	# configureMPITypes with openmpi-2* insists on accessing the scaling
-	# governor rw.
-	addpredict /sys/devices/system/cpu/
-
-	local mylang
-	local myopt
-
-	use cxx && mylang="cxx" || mylang="c"
-	use debug && myopt="debug" || myopt="opt"
-
-	# environmental variables expected by petsc during build
-
-	export PETSC_DIR="${S}"
-	export PETSC_ARCH="linux-gnu-${mylang}-${myopt}"
-
-	if use debug; then
-		strip-flags
-		filter-flags -O*
-	fi
-
-	# C Support on CXX builds is enabled if possible i.e. when not using
-	# complex scalars (no complex type for both available at the same time)
-
-	econf \
-		scrollOutput=1 \
-		FFLAGS="${FFLAGS} -fPIC" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		LDFLAGS="${LDFLAGS}" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \
-		--with-shared-libraries \
-		--with-single-library \
-		--with-clanguage=${mylang} \
-		$(use cxx && ! use complex-scalars && echo "with-c-support=1") \
-		--with-petsc-arch=${PETSC_ARCH} \
-		--with-precision=double \
-		--with-gnu-compilers \
-		--with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \
-		$(petsc_enable debug debugging) \
-		$(petsc_enable mpi) \
-		$(petsc_select mpi cc mpicc $(tc-getCC)) \
-		$(petsc_select mpi cxx mpicxx $(tc-getCXX)) \
-		$(petsc_enable fortran) \
-		$(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \
-		$(petsc_enable mpi mpi-compilers) \
-		$(petsc_select complex-scalars scalar-type complex real) \
-		--with-windows-graphics=0 \
-		--with-matlab=0 \
-		--with-cmake:BOOL=1 \
-		$(petsc_enable threads pthread) \
-		$(petsc_with afterimage afterimage \
-			/usr/include/libAfterImage -lAfterImage) \
-		$(use_with hdf5) \
-		$(petsc_with hypre hypre \
-			/usr/include/hypre -lHYPRE) \
-		$(use_with sparse suitesparse) \
-		$(petsc_with superlu superlu \
-			/usr/include/superlu -lsuperlu) \
-		$(use_with X x) \
-		$(use_with X x11) \
-		$(petsc_with scotch ptscotch \
-			/usr/include/scotch \
-		[-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \
-		$(petsc_with mumps scalapack \
-			/usr/include/scalapack -lscalapack) \
-		$(use_with mumps mumps \
-			/usr/include \
-			[-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \
-		--with-imagemagick=0 \
-		--with-python=0 \
-		$(use_with boost) \
-		$(use_with fftw)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# add PETSC_DIR to environmental variables
-	cat >> 99petsc <<- EOF
-		PETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc
-		LDPATH=${EPREFIX}/usr/$(get_libdir)/petsc/lib
-	EOF
-	doenvd 99petsc
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/*.html docs/changes docs/manualpages
-	fi
-}
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 82251821778a..ced070bee23d 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -1,18 +1,9 @@
 AUX rsession.conf 1145 BLAKE2B 81e0ba1c273cbebe1fcd95917cbfd9269525e4994f594734207972948ffbda5f500483ea21678dd15f28aed25ca060698f710fc3586522043347e55d3f4890a1 SHA512 90395faac5aa80ce52ae56da3565512b8a880a14ab2acf9a24c7a56c9d03f1e3d5f63ebaca66efa68f5c5c9c831235846df22ca37f20ba071437a2a963b808cf
 AUX rstudio-1.0.44-systemd.patch 1060 BLAKE2B c5417748653b60c85cacfaab08f2baf6936c3c2d76fe0c23702fe006c4f13de9d17a3556c05c0f47be41c6f4629d92da265861b1c689415bbdd59a515d1848af SHA512 3559fc0cb229b50fbfd4361e5be982396d563e41475878f15f870609caa9f85bd50b32f90b8f8d9c432287cb7286920dca21279bc5bfb33f1fd95a0ce68a2c4e
-AUX rstudio-1.2.1335-boost-1.70.0_p1.patch 1771 BLAKE2B eaa29ff256b8ee79c0384075745c53999d2d4ace494c0403cfa805868638921b6b0aa48631c8399bd8f21a4ee5734c6e0f46d2abf5f5111466613fbf7eca73bc SHA512 01a105c269147e256a3a0d2f803809d215c492c22626bf8b7bd5d9b6465db584b8aaa48299a6cc4f7081dd537ffcdedae1e2c328fe9bae0e1dca844f13402586
-AUX rstudio-1.2.1335-boost-1.70.0_p2.patch 1081 BLAKE2B 19e78cfa2620335cdc2f058b84eba48f693d2cd3268813fb226641727c0f622bbe452d29bdd2be85518aaf4268306cd5e985ec5778e08f21bd802bfd5ef2eb2e SHA512 20c57a4eec8e8b333c718578caad1aca525df94090c7528f996077aab4a1a59d77a03e01d8ed2d3a77d444bebcd9744815fc168d2c3263b2f0b7646c5ebc37c0
-AUX rstudio-1.2.1335-core.patch 6336 BLAKE2B 00abd96a9d653fc6c557e9e3bd82227ead2edef5a49ae67ee0ee4ec97b5a80665c999f478516710c437a0148b9e3b372164aa5e4c50813db41de0eb667bdbd41 SHA512 7cda17801efd5afe91d9064c7c24bd285ee1c2bc2df3f2631fe68261194394adb217345be529b5a6880a93a99dd6f4f32a92d449ace30c31f6d85cbf79f039fa
 AUX rstudio-1.2.1335-linker_flags.patch 505 BLAKE2B ac0ebca22f6dfcb799dd151e3c915c387dade30f86a9d335513d75c7c726c362255c745e91949ef3c1f58695d7a76a53550837c9d550113ba81d3d2d36507459 SHA512 221471a6ad720517a0b62563779ee11190f14b2f2f6d39e9e1c0acb32a03e41b9db5bd639c5336a26936d8f71ab5d88274471b00d224c6e31f2662680d6fd71c
-AUX rstudio-1.2.1335-qtsingleapplication.patch 2080 BLAKE2B 3e2c1b5df1c030a0d3f9adb01ad469a7e4032248eca156644aa74fdbf1a4584fd92185c9f3e38cb8ee8afdfd556f40642995702719b4d69fe9342f9e4de85dda SHA512 6b03194d47c7f7a39b13ccf93d02bb154e85b5d46777fbf5306e94da13f22fc83bf91bd923a58dfc9bceda517cda81673deb0f0a7b087d501b82a961174bc9cc
-AUX rstudio-1.2.5033-pandoc.patch 1442 BLAKE2B 28a1070057624fb70a2df6de0312dfa827a075ae481f6433733cdc6136a429fe67c72262d3106c6b00f7411f93d3e33ca69f232cc87aa9d8e50e11cad89d2dd6 SHA512 cdbb97f0705f6b56ce8e285d066c57a9f73ce87ef58d8101362a508cb1cc52a32418a742e84a9a9d6476b253984abe0759b45e824d360d8b550e53a98d2d05ca
-AUX rstudio-1.2.5033-paths.patch 6055 BLAKE2B 1c389cbd2980031080955c104e614d2bbcd0d747fd7d925a9650685bf30ddb84c34b66a4a6bcb58a1b18167e51804df9c22734460255eda866365231cda3e9f9 SHA512 ba213cf13ae15df043215e6b87bf554c9daba4124a1a83ecb2e5ccc8f26fd6f1467798901cc24451f04f4d25482da401cc9cdd5071a4c6ac28d9af37c45f51e5
-AUX rstudio-1.2.5033-prefs.patch 3684 BLAKE2B dfa5f7289a7e752704b6481dd6e02f8e88a91aaa36b25c91e8154f17bf3fbfcb2b674fcc790a82ae14deb0718b1d001f4931de6d6ccb99d1ed4dc9c8e71d6149 SHA512 86436aec19da35d99ec64ad1d4c243efad85a277ee72c2eaf94627c49389ba8d4bc626177a9d599bb95d00bc3e66210472e11a5ff38ed74a7a353a719f64fe4d
-AUX rstudio-1.2.5042-R-4.0.0.patch 3516 BLAKE2B ee54ab84f373c2d89c9bac238cbb500e10e542953522dede105885675e7cae319a5cd99ebd9cbceab903532925b950e827ab218cae8ce91ca58b0221ec223659 SHA512 872335efd1fbd8ec01c812ce652285220dda0ab9b53a0a044758ea7d7798a37ab3969e5c82e909139591f18716b0fd50538ec3ae264946ecd037b6bb1f84af38
 AUX rstudio-1.2.5042-boost-1.73.0.patch 728 BLAKE2B 675e5ff75ce5c3242bff5d92b32ca6391e8ceb68c504c2f161f2f30c083ae842e5e9a9c519e848595704bb6d639c5a8dc13a296dcfa445db19295f8ee78168e0 SHA512 214751fff5b027f407b093f397e70e701ed9016451a3972b240dcd4999d9b27a1309b47fb22a9f4f3944c47dc6de6bd8f1165a70a7046b5133bd88923d1b46a6
 AUX rstudio-1.3.1056-R-4.0.0.patch 1900 BLAKE2B 6429fd40c65a67a8159fda98b517f37133ff070b0b4885e14cbe9acf20516263407e4b5c96833dd6bacaf5f58cf74d65da701e52cf91c38de94c55bfa765647e SHA512 1c7ce8791b6c2f04dbad875433620efacef309b5b84d0c461617b5c52661634ca80e40d9a0fa94e606f992289972f3ce4ae015333de7f4c52b3d498e97746920
 AUX rstudio-1.3.1056-boost-1.74.0.patch 1126 BLAKE2B 289631a75eed12417f0091e20d393ce4687a849bfef47f3665c5cfc4d17da8ed9894e4bbded43c39255d58db021fc765e9f66ea0cdbcfe7cec463e271ee71c8e SHA512 c2ad2c189b845002f2b65dcdf3f7f093381759e294fec70148312a5cc5096ed9a1d47fb57d7e9f6c9b7efe174751c4d94dffd4060fc352a986c5c835d23ac5fa
-AUX rstudio-1.3.959-R-4.0.0.patch 3514 BLAKE2B 9cdadbf402f4f90f9b6e43155ec22d0bf22bcd33c817b7ce67646895b3d5672e5fe412e2ea891d6997ad4eb76dc4c514cb5f8ab06467e4c79c52875476bac7d1 SHA512 59b80b284bac4f1435a160c07a7959a4db4c7c3474d13c1c0e90f5bee34b017fd507618914fd249c14fef41535c06e78dfed22860c104c679e95a4782b1bfac3
 AUX rstudio-1.3.959-core.patch 7302 BLAKE2B eceff2aa67fc1a1cb36433bfa0956a4a45da3a017f80987e14893018737b3fc40cf1bbf9641e900311db3f5182828b11452c960b40c4e20ed83e5c3692e458bd SHA512 cf4e0682e3961c1208f14055bc604c2b8b8cc6db955216858ef4d95ca91154ab4d1eef58fcb5cdea84b2b755c98cd837b9028dad1520dd9dba222a45074a68f8
 AUX rstudio-1.3.959-pandoc-mathjax.patch 1997 BLAKE2B 71d40c2299b0598f9687175fe464d334e821762972dc0c4027f71c124eef2fd6795030c4426cec56c6b4fe81b8b72598f97214bab1d2b2b2a4c0c551cc1421a7 SHA512 6a5a76898500d3a8a20636a3854d459e5b8d806f68b0a4a08fcf3dae98feeebe751c14a7e4f8275c02ad47de9795168d90505d4dada19ccbdfbef0e07229cb66
 AUX rstudio-1.3.959-paths.patch 6142 BLAKE2B ed7ea6025e919e24228ea55679b198496446bc711e0efd355e1bc4ed4822078b8a486fb8390aaf6cf5852447fc9405ca68099e4a566b24521d341744c7e719a7 SHA512 9ee6c13619d6dac9f7af85557be1c4430d801424c3b29cbc73b657686d2cba49476083ae2bf87f7cef0039672116d3385fb51a03e803d9ae02e4a721403e614a
@@ -22,14 +13,6 @@ AUX rstudio-server.conf 1337 BLAKE2B a9a85c76a1c7c5f32f55606c6e3c9b72662dbd25e4b
 AUX rstudio-server.initd 377 BLAKE2B 4f49b9ae2a81cd60565f79f121d60f5531746febd1f6f68cc93863985bd9af28d4ef04f647bd1b492ca69273724c282bcaedcfb5d08b8f2ac237ddb6f5baa438 SHA512 828a485338088d129c57debec6557ad35db5b042c61489ae4341717ce2218bec59a873541c270f964bb9c708b75896f1a3e2e64a4245a1713979d3bd42c9d5c8
 AUX rstudio-server.service.in 161 BLAKE2B 0be9cb83304063c9123c6fa13b7751b2f848adde282fc586acccfa4110f902e4de9962211ca0c871f66f3563319fe195c9f230daa4d4e429357ff74701e4d2d7 SHA512 bcf1f30e460dd5f0562b20489ca5544c6bcfbfb0ee1c636c4365df433e97e02e9e3b233e4159a0c71ad6d319f34f93c22b8fbf6b36463e29f22df2acd71da173
 DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9
-DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf
-DIST rstudio-1.2.5042.tar.gz 20456999 BLAKE2B 3251ab2511daefefa395256fedb273ecc36dbc8118457474e3647f7616baea91301e597896582ad4b191195fc7baf17645c4c25b9a957a0c17a6251151b1dd87 SHA512 e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9
-DIST rstudio-1.3.1056.tar.gz 89584544 BLAKE2B 0e758ad97f9faa2d3932a49dafd92bc21199a5c0a20e2d8480267ebbb7cd11dc38596b4bb697e04add7bfe6b126f7b2ae6675040a0ac8caca5a5cf737f5ad6eb SHA512 8a9077c2ae021e0cf4cca41b374a50534087b35fd2c1e4b18bdd5ba3672e1ab275046e483ec8a3aba729a8e39f961149fb03a053ea005d8a32873b51201baca2
 DIST rstudio-1.3.1093.tar.gz 89554292 BLAKE2B defd68e65a2cbc570aaf6fb14bd16342946154cda7322549d426281aea48d923803f061c1cd7d74b65b000a67ed62713dd06d311617e54130cb7c08147b34694 SHA512 c8a8d2312353e574dc2fb8ff2e64bd46c8aaf889c86f9c81ce22a7275e4cbec436dadfdaee513c3fc47dd3ad003e07a25baac4d8fcf47cc21df919afa084e92e
-DIST rstudio-1.3.959.tar.gz 89639419 BLAKE2B d45b2c1b0e426ddb5a945e59a8127ddfd47f6230ef0929639c4b525382ae57437a273df6ade85cfbf3a29911cf0158ee2e0808bfa94e783d70d4615f6c228f31 SHA512 e5d8bfe16011790ff4723c731043f44070d8fe48f85c5a9ab8389c9a2b7a1d3813e9362063ec4c6a6ca3b0a0857e2190481cbb74191650a129c0d2e10b342fac
-EBUILD rstudio-1.2.5033.ebuild 7256 BLAKE2B 5b6481bbe0d02d6751ab19df0ac2a12e8d71399cb13999d65f1c6b0ce2fab49eb0ad7e55b458933d6c3fc2490f2ecc2a5e4e0c5b41c7e36a978bf825bc27f8c5 SHA512 14a307c42c979fb18c19ccf0bb68322d9382dba785421120c21c77aac666b0517e069cb60f408baa53c349c1f3b6f8ab2a59db442ec377a244ce462b395ddb1c
-EBUILD rstudio-1.2.5042.ebuild 7256 BLAKE2B 24303ced907ff45ff66fbab6638f7bda958849ae977e0b3f37e00eb396b7ff6169ae7e10b2285c804e9cec2131cce8d45bfa8197096774fef06fc859460c5aad SHA512 f5c36843edbd62a80891b1a148081e163254fcdbdc94aafd4c9051992d63704dc360c0ee129ba92b9cc0a63e39c8cf6be258606db3b1a8831f1ee8a7110ad08c
-EBUILD rstudio-1.3.1056.ebuild 7067 BLAKE2B 3e9c18d653602ad25aaa3dfd9bfbdeb34260bfe4464559c9a8ade653e5487f89d0cf043549ae212c68542f6e1fa53fab14a733f1175189af81c9daf0e019906c SHA512 e5450ef5bb210f02f7250bfb21492f94c9a694f5e59e23fe3437da91f18d34d7036de6b64cb7ef14d61f771ee18fe311b421b8dc8204b44c87356fb35f5d5263
 EBUILD rstudio-1.3.1093.ebuild 6980 BLAKE2B 51467f99af427ab86437818788918cdeec384de97b450ea7028ad046edbe259984d3e8158ae86b51e238e4d47bcd9ddef5e110532f3544bc28e6c06a3e64ca83 SHA512 9dd2ac83e838def156fb9fac7c94ccb61fae52f7144acfd924f328077dd0630a455a914dd0c59ff186878ee4ed8f4502296d07f867be2e6003a5f5a6953a4498
-EBUILD rstudio-1.3.959.ebuild 7047 BLAKE2B 78861c03e1b7aff68ba63cc00503e09eca8d67b77df12161f8bed33d226440fc70e76b584cfb4a6236836250791d6d50f127c57c9ffc36add95866db7b19ca5e SHA512 0ae6d91439d4fb22eb27d9e58d9d5bf05f6cb063e947f4431593f9cb5c60b85e9e817cd668cb1a5d8313d74ed6cb6f0136ef370a45ef4da7f1f17a9e7c8ba0ca
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
deleted file mode 100644
index 1ec458bb8698..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp	2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/connection.hpp	2019-08-20 22:38:53.808923305 +1000
-@@ -296,7 +296,11 @@
-      */
-     timer_ptr set_timer(long duration, timer_handler callback) {
-         timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
-+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
-+            *m_io_service,
-+#else
-             lib::ref(*m_io_service),
-+#endif
-             boost::posix_time::milliseconds(duration)
-         );
- 
---- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp	2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp	2019-08-20 22:38:53.822923358 +1000
-@@ -184,7 +184,12 @@
-         m_io_service = ptr;
-         m_external_io_service = true;
-         m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
--            lib::ref(*m_io_service));
-+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
-+            *m_io_service
-+#else
-+            lib::ref(*m_io_service)
-+#endif
-+        );
- 
-         m_state = READY;
-         ec = lib::error_code();
---- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp	2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/security/none.hpp	2019-08-20 22:38:53.823923362 +1000
-@@ -167,7 +167,12 @@
-         }
- 
-         m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
--            lib::ref(*service));
-+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
-+            *service
-+#else
-+            lib::ref(*service)
-+#endif
-+        );
- 
-         m_state = READY;
- 
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
deleted file mode 100644
index eed2c5c955cb..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- rstudio-1.2.1335-orig/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp	2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp	2019-04-09 22:08:45.331273559 +1000
-@@ -77,7 +77,13 @@
-       {
-          // start a timer that will cancel any outstanding asynchronous operations
-          // when it elapses if the connection operation has not succeeded
--         pConnectionTimer_.reset(new boost::asio::deadline_timer(resolver_.get_io_service(), timeout));
-+         pConnectionTimer_.reset(new boost::asio::deadline_timer(
-+#if BOOST_VERSION >= 107000
-+                                   resolver_.get_executor(),
-+#else
-+                                   resolver_.get_io_service(),
-+#endif
-+                                   timeout));
-          pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout,
-                                                    TcpIpAsyncConnector::shared_from_this(),
-                                                    boost::asio::placeholders::error));
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
deleted file mode 100644
index 2c4374bb8045..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- rstudio-1.2.1335-orig/src/cpp/session/SessionClientInit.cpp	2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/session/SessionClientInit.cpp	2019-04-09 18:15:37.746363789 +1000
-@@ -87,13 +87,13 @@
-       boost::shared_ptr<http::Cookie>* pCookie)
- {
-    // extract the base URL
--   json::JsonRpcRequest request;
-+   core::json::JsonRpcRequest request;
-    Error error = parseJsonRpcRequest(ptrConnection->request().body(), &request);
-    if (error)
-       return error;
-    std::string baseURL;
- 
--   error = json::readParams(request.params, &baseURL);
-+   error = core::json::readParams(request.params, &baseURL);
-    if (error)
-       return error;
- 
-@@ -161,7 +161,7 @@
-    }
- 
-    // prepare session info 
--   json::Object sessionInfo ;
-+   core::json::Object sessionInfo ;
-    sessionInfo["clientId"] = clientId;
-    sessionInfo["mode"] = options.programMode();
-    
-@@ -175,8 +175,8 @@
-    }
- 
-    // temp dir
--   FilePath tempDir = rstudio::r::session::utils::tempDir();
--   Error error = tempDir.ensureDirectory();
-+   core::FilePath tempDir = rstudio::r::session::utils::tempDir();
-+   core::Error error = tempDir.ensureDirectory();
-    if (error)
-       LOG_ERROR(error);
-    sessionInfo["temp_dir"] = tempDir.absolutePath();
-@@ -194,12 +194,12 @@
-    sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt");
- 
-    // client state
--   json::Object clientStateObject;
-+   core::json::Object clientStateObject;
-    rstudio::r::session::clientState().currentState(&clientStateObject);
-    sessionInfo["client_state"] = clientStateObject;
-    
-    // source documents
--   json::Array jsonDocs;
-+   core::json::Array jsonDocs;
-    error = modules::source::clientInitDocuments(&jsonDocs);
-    if (error)
-       LOG_ERROR(error);
-@@ -224,7 +224,7 @@
-    if (resumed)
-    {
-       // console actions
--      json::Object actionsObject;
-+     core::json::Object actionsObject;
-       consoleActions.asJson(&actionsObject);
-       sessionInfo["console_actions"] = actionsObject;
-    }
-@@ -290,12 +290,12 @@
-    }
-    else
-    {
--      sessionInfo["active_project_file"] = json::Value();
--      sessionInfo["project_ui_prefs"] = json::Value();
--      sessionInfo["project_open_docs"] = json::Value();
-+      sessionInfo["active_project_file"] = core::json::Value();
-+      sessionInfo["project_ui_prefs"] = core::json::Value();
-+      sessionInfo["project_open_docs"] = core::json::Value();
-       sessionInfo["project_supports_sharing"] = false;
-       sessionInfo["project_owned_by_user"] = false;
--      sessionInfo["project_user_data_directory"] = json::Value();
-+      sessionInfo["project_user_data_directory"] = core::json::Value();
-    }
- 
-    sessionInfo["system_encoding"] = std::string(::locale2charset(NULL));
-@@ -332,20 +332,20 @@
-       sessionInfo["build_tools_bookdown_website"] =
-                               module_context::isBookdownWebsite();
- 
--      FilePath buildTargetDir = projects::projectContext().buildTargetPath();
-+      core::FilePath buildTargetDir = projects::projectContext().buildTargetPath();
-       if (!buildTargetDir.empty())
-       {
-          sessionInfo["build_target_dir"] = module_context::createAliasedPath(
-                                                                 buildTargetDir);
--         sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) &&
-+         sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) &&
-                                       buildTargetDir.childPath("src").exists();
-          sessionInfo["has_pkg_vig"] =
--               (type == r_util::kBuildTypePackage) &&
-+               (type == core::r_util::kBuildTypePackage) &&
-                buildTargetDir.childPath("vignettes").exists();
-       }
-       else
-       {
--         sessionInfo["build_target_dir"] = json::Value();
-+         sessionInfo["build_target_dir"] = core::json::Value();
-          sessionInfo["has_pkg_src"] = false;
-          sessionInfo["has_pkg_vig"] = false;
-       }
-@@ -353,9 +353,9 @@
-    }
-    else
-    {
--      sessionInfo["build_tools_type"] = r_util::kBuildTypeNone;
-+      sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone;
-       sessionInfo["build_tools_bookdown_website"] = false;
--      sessionInfo["build_target_dir"] = json::Value();
-+      sessionInfo["build_target_dir"] = core::json::Value();
-       sessionInfo["has_pkg_src"] = false;
-       sessionInfo["has_pkg_vig"] = false;
-    }
-@@ -364,7 +364,7 @@
-    sessionInfo["presentation_commands"] = options.allowPresentationCommands();
- 
-    sessionInfo["tutorial_api_available"] = false;
--   sessionInfo["tutorial_api_client_origin"] = json::Value();
-+   sessionInfo["tutorial_api_client_origin"] = core::json::Value();
- 
-    sessionInfo["build_state"] = modules::build::buildStateAsJson();
-    sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled();
-@@ -375,7 +375,7 @@
- 
-    // console history -- we do this at the end because
-    // restoreBuildRestartContext may have reset it
--   json::Array historyArray;
-+   core::json::Array historyArray;
-    rstudio::r::session::consoleHistory().asJson(&historyArray);
-    sessionInfo["console_history"] = historyArray;
-    sessionInfo["console_history_capacity"] =
-@@ -447,14 +447,14 @@
- 
-    sessionInfo["multi_session"] = options.multiSession();
- 
--   json::Object rVersionsJson;
-+   core::json::Object rVersionsJson;
-    rVersionsJson["r_version"] = module_context::rVersion();
-    rVersionsJson["r_version_label"] = module_context::rVersionLabel();
-    rVersionsJson["r_home_dir"] = module_context::rHomeDir();
-    sessionInfo["r_versions_info"] = rVersionsJson;
- 
-    sessionInfo["show_user_home_page"] = options.showUserHomePage();
--   sessionInfo["user_home_page_url"] = json::Value();
-+   sessionInfo["user_home_page_url"] = core::json::Value();
-    
-    sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson();
-    sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload();
-@@ -491,7 +491,7 @@
- 
-    // create response  (we always set kEventsPending to false so that the client
-    // won't poll for events until it is ready)
--   json::JsonRpcResponse jsonRpcResponse;
-+   core::json::JsonRpcResponse jsonRpcResponse;
-    jsonRpcResponse.setField(kEventsPending, "false");
-    jsonRpcResponse.setResult(sessionInfo);
- 
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
deleted file mode 100644
index a59fa02f1d2c..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- rstudio-1.2.1335-orig/src/cpp/desktop/CMakeLists.txt	2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/desktop/CMakeLists.txt	2019-04-09 18:04:57.783616412 +1000
-@@ -140,6 +140,13 @@
- get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib"     ABSOLUTE CACHE)
- get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.."         ABSOLUTE CACHE)
- 
-+find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication
-+  PATH_SUFFIXES QtSolutions
-+  PATHS
-+  /usr/include/qt5)
-+find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6
-+  libQt5Solutions_SingleApplication-2.6)
-+
- # disable clang warnings for qt sources
- if(APPLE)
-    add_definitions(-Wno-unused-private-field
-@@ -158,7 +165,6 @@
- 
- set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
- list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
--  ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
-   ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
-   ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
-   ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
-@@ -224,8 +230,6 @@
-   DesktopSlotBinders.cpp
-   DesktopSubMenu.cpp
-   DesktopSynctex.cpp
--  3rdparty/qtsingleapplication/qtsingleapplication.cpp
--  3rdparty/qtsingleapplication/qtlocalpeer.cpp
- )
- 
- if(WIN32)
-@@ -280,6 +284,7 @@
-   ${CORE_SOURCE_DIR}/include
-   ${CMAKE_CURRENT_SOURCE_DIR}
-   ${CMAKE_CURRENT_BINARY_DIR}
-+  ${QTSINGLEAPPLIB_INCLUDE_DIR}
-   ${TESTS_INCLUDE_DIR}
- )
- 
-@@ -384,6 +389,7 @@
-    # set link dependencies
-    target_link_libraries(rstudio
-       ${RSTUDIO_QTMODULES}
-+      ${QTSINGLEAPPLIB}
-       ${QT_LIBRARIES}
-       ${Boost_LIBRARIES}
-       rstudio-core
---- rstudio-1.2.1335-orig/src/cpp/desktop/DesktopPosixApplication.hpp	2019-03-28 16:08:20.000000000 +1100
-+++ rstudio-1.2.1335/src/cpp/desktop/DesktopPosixApplication.hpp	2019-04-09 18:01:39.333920927 +1000
-@@ -16,7 +16,7 @@
- #ifndef DESKTOP_POSIX_APPLICATION_HPP
- #define DESKTOP_POSIX_APPLICATION_HPP
- 
--#include "3rdparty/qtsingleapplication/QtSingleApplication"
-+#include <QtSingleApplication>
- 
- #include "DesktopApplicationLaunch.hpp"
- 
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch
deleted file mode 100644
index b4f611063e17..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- rstudio-1.2.5033-orig/src/cpp/session/CMakeLists.txt	2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/cpp/session/CMakeLists.txt	2020-01-07 12:29:20.174304185 +1100
-@@ -25,9 +25,6 @@
- if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
-   message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)")
- endif()
--if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
--  message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
--endif()
- 
- # we often install embedded versions of these packages but don't do so currently
- 
-@@ -490,19 +487,6 @@
-    install(DIRECTORY "resources/connections"
-            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
- 
--   # install pandoc
--   if(WIN32)
--      set(PANDOC_VERSION "2.7.2" CACHE INTERNAL "Pandoc version")
--   else()
--      set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
--   endif()
--
--   set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
--   file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
--   install(FILES ${PANDOC_FILES}
--           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
--           DESTINATION  ${RSTUDIO_INSTALL_BIN}/pandoc)
--
-    # install rmarkdown package
-    # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
-    # install(FILES ${RMARKDOWN_PACKAGE}
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch
deleted file mode 100644
index aa6a9b23fdec..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- rstudio-1.2.5033-orig/CMakeGlobals.txt	2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/CMakeGlobals.txt	2020-01-07 12:20:19.115307754 +1100
-@@ -175,7 +175,7 @@
-    else()
-      set(RSTUDIO_INSTALL_BIN bin)
-    endif()
--   set(RSTUDIO_INSTALL_SUPPORTING .)
-+   set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
- endif()
- 
- # if the install prefix is /usr/local then tweak as appropriate
---- rstudio-1.2.5033-orig/src/cpp/server/CMakeLists.txt	2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/cpp/server/CMakeLists.txt	2020-01-07 12:17:32.736309024 +1100
-@@ -194,7 +194,7 @@
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
--           DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
- 
-    # install configured redhat init.d script
-    set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
-@@ -202,7 +202,7 @@
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
--           DESTINATION ${RSERVER_INITD_REDHAT_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
- 
-    # install configured suse init.d script
-    set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
-@@ -210,13 +210,13 @@
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
--           DESTINATION ${RSERVER_INITD_SUSE_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
- 
-    # install pam profile
-    set(RSERVER_PAM_DIR "extras/pam")
-    set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
--           DESTINATION ${RSERVER_PAM_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
- 
-    # install configured upstart profile
-    set(RSERVER_UPSTART_DIR "extras/upstart")
-@@ -224,12 +224,12 @@
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
--           DESTINATION ${RSERVER_UPSTART_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
-    set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf")
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT})
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}
--           DESTINATION ${RSERVER_UPSTART_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
- 
-     # install configured systemd profile
-    set(RSERVER_SYSTEMD_DIR "extras/systemd")
---- rstudio-1.2.5033-orig/src/cpp/server/ServerOptions.cpp	2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/cpp/server/ServerOptions.cpp	2020-01-07 12:17:32.773309023 +1100
-@@ -389,8 +389,8 @@
- 
-    // convert relative paths by completing from the system installation
-    // path (this allows us to be relocatable)
--   resolvePath(resourcePath, &wwwLocalPath_);
--   resolvePath(resourcePath, &wwwSymbolMapsPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
-    resolvePath(binaryPath, &authPamHelperPath_);
-    resolvePath(binaryPath, &rsessionPath_);
-    resolvePath(binaryPath, &rldpathPath_);
---- rstudio-1.2.5033-orig/src/cpp/session/SessionOptions.cpp	2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/cpp/session/SessionOptions.cpp	2020-01-07 12:17:32.774309023 +1100
-@@ -53,7 +53,7 @@
- namespace session {  
- 
- namespace {
--const char* const kDefaultPandocPath = "bin/pandoc";
-+const char* const kDefaultPandocPath = "bin";
- const char* const kDefaultPostbackPath = "bin/postback/rpostback";
- const char* const kDefaultRsclangPath = "bin/rsclang";
- 
-@@ -571,14 +571,14 @@
-    }
-    
-    // convert relative paths by completing from the app resource path
--   resolvePath(resourcePath_, &rResourcesPath_);
--   resolvePath(resourcePath_, &agreementFilePath_);
--   resolvePath(resourcePath_, &wwwLocalPath_);
--   resolvePath(resourcePath_, &wwwSymbolMapsPath_);
--   resolvePath(resourcePath_, &coreRSourcePath_);
--   resolvePath(resourcePath_, &modulesRSourcePath_);
--   resolvePath(resourcePath_, &sessionLibraryPath_);
--   resolvePath(resourcePath_, &sessionPackageArchivesPath_);
-+   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_);
-+   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_);
-+   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_);
-+   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
-+   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_);
-+   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_);
-+   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_);
-+   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_);
-    resolvePostbackPath(resourcePath_, &rpostbackPath_);
- #ifdef _WIN32
-    resolvePath(resourcePath_, &consoleIoPath_);
-@@ -611,7 +611,7 @@
-    }
-    winptyPath_ = pty.complete(completion).absolutePath();
- #endif // _WIN32
--   resolvePath(resourcePath_, &hunspellDictionariesPath_);
-+   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_);
-    resolvePath(resourcePath_, &mathjaxPath_);
-    resolvePath(resourcePath_, &libclangHeadersPath_);
-    resolvePandocPath(resourcePath_, &pandocPath_);
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch
deleted file mode 100644
index 034eba37a8b9..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- rstudio-1.2.5033-orig/src/gwt/build.xml	2019-12-04 17:22:17.000000000 +1100
-+++ rstudio-1.2.5033/src/gwt/build.xml	2020-01-10 18:35:29.913030923 +1100
-@@ -28,17 +28,35 @@
-             classname="com.google.javascript.jscomp.ant.CompileTask"
-             classpath="${tools.dir}/compiler/compiler.jar"/>
- 
-+   <!-- Configure path to aopalliance -->
-+   <property name="aopalliance.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/aopalliance-1/lib"/>
-+
-+   <!-- Configure path to javax-inject -->
-+   <property name="javax.inject" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/javax-inject/lib"/>
-+
-+   <!-- Configure path to validation-api -->
-+   <property name="validation.api" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/lib"/>
-+   <property name="validation.api.sources" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/sources"/>
-+
-    <!-- Configure path to GWT SDK -->
--   <property name="gwt.sdk" value="${lib.dir}/gwt/2.8.1"/>
-+   <property name="gwt.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gwt-2.8/lib"/>
-+
-+   <!-- Configure path to Google Gin -->
-+   <property name="gin.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gin-2.1/lib"/>
- 
-    <property name="gwt.extra.args" value=""/>
-    <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
-    <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
-+   <property environment="env"/>
- 
-    <path id="project.class.path">
-      <pathelement location="${build.dir}"/>
-+      <fileset dir="${aopalliance.sdk}" includes="*.jar"/>
-+      <fileset dir="${javax.inject}" includes="*.jar"/>
-+      <fileset dir="${validation.api}" includes="*.jar"/>
-+      <fileset dir="${validation.api.sources}" includes="*.zip"/>
-       <fileset dir="${gwt.sdk}" includes="*.jar"/>
--      <fileset dir="${lib.dir}/gin/2.1.2" includes="*.jar"/>
-+      <fileset dir="${gin.sdk}" includes="*.jar"/>
-    </path>
- 
-    <path id="test.class.path">
-@@ -112,8 +130,10 @@
-             <pathelement location="${src.dir}"/>
-             <path refid="project.class.path"/>
-          </classpath>
-+         <jvmarg value="-Duser.home=${env.T}"/>
-          <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
-          <jvmarg value="-Xmx1536M"/>
-+         <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
-          <arg value="-war"/>
-          <arg value="${www.dir}"/>
-          <arg value="-localWorkers"/>
-@@ -154,6 +174,7 @@
-             <pathelement location="${src.dir}"/>
-             <path refid="project.class.path"/>
-          </classpath>
-+         <jvmarg value="-Duser.home=${env.T}"/>
-          <jvmarg value="-Xmx2048M"/>
-          <arg value="-style"/>
-          <arg value="PRETTY"/>
-@@ -176,6 +197,7 @@
-             <pathelement location="src"/>
-             <path refid="project.class.path"/>
-          </classpath>
-+         <jvmarg value="-Duser.home=${env.T}"/>
-          <jvmarg value="-Xmx2048M"/>
-          <arg value="-style"/>
-          <arg value="PRETTY"/>
-@@ -202,6 +224,7 @@
-             <pathelement location="src"/>
-             <path refid="project.class.path"/>
-          </classpath>
-+         <jvmarg value="-Duser.home=${env.T}"/>
-          <jvmarg value="-Xmx2048M"/>
-       	<arg value="-src"/>
-       	<arg value = "src"/>
-@@ -237,6 +260,7 @@
-             <pathelement location="${test.dir}"/>
-             <pathelement location="${src.dir}"/>
-         </classpath>
-+        <jvmarg value="-Duser.home=${env.T}"/>
-         <classpath refid="project.class.path"/>
-         <classpath refid="unittest.class.path"/>
-         <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/>
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch
deleted file mode 100644
index 87ec83a7d4af..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 71b1a935762efd24a79de193662450de5a89f67e Mon Sep 17 00:00:00 2001
-From: Jonathan McPherson <jonathan@rstudio.com>
-Date: Tue, 14 Jan 2020 12:53:20 -0800
-Subject: [PATCH] use R_NoSave over R_Slave for R 4.0+
-
----
- src/cpp/r/CMakeLists.txt             | 12 ++++++++++++
- src/cpp/r/config.h.in                |  8 +++++++-
- src/cpp/r/session/REmbeddedPosix.cpp | 20 ++++++++++++++------
- 3 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/src/cpp/r/CMakeLists.txt b/src/cpp/r/CMakeLists.txt
-index 6984ae309c..29784b8b67 100644
---- a/src/cpp/r/CMakeLists.txt
-+++ b/src/cpp/r/CMakeLists.txt
-@@ -15,6 +15,18 @@
- 
- project (R)
- 
-+# find the version of R in play
-+find_package(LibR REQUIRED)
-+execute_process(
-+    COMMAND "${LIBR_EXECUTABLE}" "--vanilla" "--slave" "-e" "cat(as.character(getRversion()))"
-+    OUTPUT_VARIABLE LIBR_VERSION)
-+
-+# parse and save the R version to a variable
-+string(REPLACE "." ";" R_VERSION_LIST "${LIBR_VERSION}")
-+list(GET R_VERSION_LIST 0 R_VERSION_MAJOR)
-+list(GET R_VERSION_LIST 1 R_VERSION_MINOR)
-+list(GET R_VERSION_LIST 2 R_VERSION_PATCH)
-+
- # include files
- file(GLOB_RECURSE R_HEADER_FILES "*.h*")
- 
-diff --git a/src/cpp/r/config.h.in b/src/cpp/r/config.h.in
-index 6ba67c8e09..00bc8b6191 100644
---- a/src/cpp/r/config.h.in
-+++ b/src/cpp/r/config.h.in
-@@ -1,7 +1,7 @@
- /*
-  * config.h.in
-  *
-- * Copyright (C) 2009-12 by RStudio, Inc.
-+ * Copyright (C) 2009-20 by RStudio, Inc.
-  *
-  * Unless you have received this program directly from RStudio pursuant
-  * to the terms of a commercial license agreement with RStudio, then
-@@ -16,4 +16,10 @@
- 
- #cmakedefine PANGO_CAIRO_FOUND
- 
-+// Important: These variables represent the version of R found during
-+// compile/link time, NOT the version of R present at runtime.
-+#define R_VERSION_MAJOR ${R_VERSION_MAJOR}
-+#define R_VERSION_MINOR ${R_VERSION_MINOR}
-+#define R_VERSION_PATCH ${R_VERSION_PATCH}
-+
- 
-diff --git a/src/cpp/r/session/REmbeddedPosix.cpp b/src/cpp/r/session/REmbeddedPosix.cpp
-index ac71b94522..73e2e2ce7f 100644
---- a/src/cpp/r/session/REmbeddedPosix.cpp
-+++ b/src/cpp/r/session/REmbeddedPosix.cpp
-@@ -1,7 +1,7 @@
- /*
-  * REmbeddedPosix.cpp
-  *
-- * Copyright (C) 2009-12 by RStudio, Inc.
-+ * Copyright (C) 2009-20 by RStudio, Inc.
-  *
-  * Unless you have received this program directly from RStudio pursuant
-  * to the terms of a commercial license agreement with RStudio, then
-@@ -38,6 +38,8 @@ extern "C" void (*ptr_R_ProcessEvents)(void);
- extern "C"  typedef void (*ptr_QuartzCocoa_SetupEventLoop)(int, unsigned long);
- #endif
- 
-+#include "config.h"
-+
- extern int R_running_as_main_program;  // from unix/system.c
- 
- using namespace rstudio::core;
-@@ -103,14 +105,20 @@ void runEmbeddedR(const core::FilePath& /*rHome*/,    // ignored on posix
-    //
-    structRstart rp;
-    Rstart Rp = &rp;
--   R_DefParams(Rp) ;
--   Rp->R_Slave = FALSE ;
-+   R_DefParams(Rp);
-+#if R_VERSION_MAJOR > 3
-+   // R 4.0 and above use --no-echo to suppress output
-+   Rp->R_NoEcho = FALSE;
-+#else
-+   // R 3.x and below use --slave
-+   Rp->R_Slave = FALSE;
-+#endif
-    Rp->R_Quiet = quiet ? TRUE : FALSE;
--   Rp->R_Interactive = TRUE ;
--   Rp->SaveAction = defaultSaveAction ;
-+   Rp->R_Interactive = TRUE;
-+   Rp->SaveAction = defaultSaveAction;
-    Rp->RestoreAction = SA_NORESTORE; // handled within initialize()
-    Rp->LoadInitFile = loadInitFile ? TRUE : FALSE;
--   R_SetParams(Rp) ;
-+   R_SetParams(Rp);
- 
-    // redirect console
-    R_Interactive = TRUE; // should have also been set by call to Rf_initialize_R
diff --git a/sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch b/sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch
deleted file mode 100644
index dc35d0ce0083..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 71b1a935762efd24a79de193662450de5a89f67e Mon Sep 17 00:00:00 2001
-From: Jonathan McPherson <jonathan@rstudio.com>
-Date: Tue, 14 Jan 2020 12:53:20 -0800
-Subject: [PATCH] use R_NoSave over R_Slave for R 4.0+
-
----
- src/cpp/r/CMakeLists.txt             | 12 ++++++++++++
- src/cpp/r/config.h.in                |  8 +++++++-
- src/cpp/r/session/REmbeddedPosix.cpp | 20 ++++++++++++++------
- 3 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/src/cpp/r/CMakeLists.txt b/src/cpp/r/CMakeLists.txt
-index 6984ae309c..29784b8b67 100644
---- a/src/cpp/r/CMakeLists.txt
-+++ b/src/cpp/r/CMakeLists.txt
-@@ -15,6 +15,18 @@
- 
- project (R)
- 
-+# find the version of R in play
-+find_package(LibR REQUIRED)
-+execute_process(
-+    COMMAND "${LIBR_EXECUTABLE}" "--vanilla" "--slave" "-e" "cat(as.character(getRversion()))"
-+    OUTPUT_VARIABLE LIBR_VERSION)
-+
-+# parse and save the R version to a variable
-+string(REPLACE "." ";" R_VERSION_LIST "${LIBR_VERSION}")
-+list(GET R_VERSION_LIST 0 R_VERSION_MAJOR)
-+list(GET R_VERSION_LIST 1 R_VERSION_MINOR)
-+list(GET R_VERSION_LIST 2 R_VERSION_PATCH)
-+
- # include files
- file(GLOB_RECURSE R_HEADER_FILES "*.h*")
- 
-diff --git a/src/cpp/r/config.h.in b/src/cpp/r/config.h.in
-index 6ba67c8e09..00bc8b6191 100644
---- a/src/cpp/r/config.h.in
-+++ b/src/cpp/r/config.h.in
-@@ -1,7 +1,7 @@
- /*
-  * config.h.in
-  *
-- * Copyright (C) 2009-12 by RStudio, PBC
-+ * Copyright (C) 2009-20 by RStudio, Inc.
-  *
-  * Unless you have received this program directly from RStudio pursuant
-  * to the terms of a commercial license agreement with RStudio, then
-@@ -16,4 +16,10 @@
- 
- #cmakedefine PANGO_CAIRO_FOUND
- 
-+// Important: These variables represent the version of R found during
-+// compile/link time, NOT the version of R present at runtime.
-+#define R_VERSION_MAJOR ${R_VERSION_MAJOR}
-+#define R_VERSION_MINOR ${R_VERSION_MINOR}
-+#define R_VERSION_PATCH ${R_VERSION_PATCH}
-+
- 
-diff --git a/src/cpp/r/session/REmbeddedPosix.cpp b/src/cpp/r/session/REmbeddedPosix.cpp
-index ac71b94522..73e2e2ce7f 100644
---- a/src/cpp/r/session/REmbeddedPosix.cpp
-+++ b/src/cpp/r/session/REmbeddedPosix.cpp
-@@ -1,7 +1,7 @@
- /*
-  * REmbeddedPosix.cpp
-  *
-- * Copyright (C) 2009-19 by RStudio, PBC
-+ * Copyright (C) 2009-20 by RStudio, Inc.
-  *
-  * Unless you have received this program directly from RStudio pursuant
-  * to the terms of a commercial license agreement with RStudio, then
-@@ -38,6 +38,8 @@ extern "C" void (*ptr_R_ProcessEvents)(void);
- extern "C"  typedef void (*ptr_QuartzCocoa_SetupEventLoop)(int, unsigned long);
- #endif
- 
-+#include "config.h"
-+
- extern int R_running_as_main_program;  // from unix/system.c
- 
- using namespace rstudio::core;
-@@ -103,14 +105,20 @@ void runEmbeddedR(const core::FilePath& /*rHome*/,    // ignored on posix
-    //
-    structRstart rp;
-    Rstart Rp = &rp;
--   R_DefParams(Rp) ;
--   Rp->R_Slave = FALSE ;
-+   R_DefParams(Rp);
-+#if R_VERSION_MAJOR > 3
-+   // R 4.0 and above use --no-echo to suppress output
-+   Rp->R_NoEcho = FALSE;
-+#else
-+   // R 3.x and below use --slave
-+   Rp->R_Slave = FALSE;
-+#endif
-    Rp->R_Quiet = quiet ? TRUE : FALSE;
--   Rp->R_Interactive = TRUE ;
--   Rp->SaveAction = defaultSaveAction ;
-+   Rp->R_Interactive = TRUE;
-+   Rp->SaveAction = defaultSaveAction;
-    Rp->RestoreAction = SA_NORESTORE; // handled within initialize()
-    Rp->LoadInitFile = loadInitFile ? TRUE : FALSE;
--   R_SetParams(Rp) ;
-+   R_SetParams(Rp);
- 
-    // redirect console
-    R_Interactive = TRUE; // should have also been set by call to Rf_initialize_R
diff --git a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
deleted file mode 100644
index 09ff6e9c5162..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
-
-# TODO
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=)' dependencies/common/install-gwt
-GWT_VER=2.8.1
-GIN_VER=2.1.2
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage
-PANDOC_VER=1.19.2.1
-# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
-QT_VER=5.10
-QT_SLOT=5
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="
-	http://www.rstudio.org
-	https://github.com/rstudio/rstudio/"
-SRC_URI="
-	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-RDEPEND="
-	>=app-text/pandoc-${PANDOC_VER}
-	dev-java/aopalliance:1
-	dev-java/gin:2.1
-	dev-java/gwt:2.8
-	dev-java/javax-inject
-	=dev-java/validation-api-1.0*:1.0[source]
-	dev-haskell/pandoc-citeproc
-	dev-lang/R
-	dev-libs/boost:=
-	>=dev-libs/mathjax-2.7.4
-	sys-apps/util-linux
-	sys-devel/clang:*
-	sys-libs/zlib
-	>=virtual/jre-1.8:=
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
-		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
-		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( sys-libs/pam )
-	)
-	dedicated? ( sys-libs/pam )
-	dedicated? (
-		sys-libs/pam
-		acct-user/rstudio-server
-		acct-group/rstudio-server
-	)
-	server? (
-		acct-user/rstudio-server
-		acct-group/rstudio-server
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	>=virtual/jdk-1.8:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.5033-prefs.patch
-	"${FILESDIR}"/${PN}-1.2.5033-paths.patch
-	"${FILESDIR}"/${PN}-1.2.5033-pandoc.patch
-	"${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
-	"${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch
-	"${FILESDIR}"/${PN}-1.0.44-systemd.patch
-	"${FILESDIR}"/${PN}-1.2.1335-core.patch
-	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch
-	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch
-	"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
-	"${FILESDIR}"/${PN}-1.2.5042-R-4.0.0.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	mkdir -p dependencies/common/dictionaries
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	java-pkg-2_src_prepare
-	egit_clean
-
-	# Enable CMake to install our .service file for systemd usage
-	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
-	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
-	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
-	# this sed hack for now. ~RMH
-	sed -i \
-		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
-		src/cpp/server/ServerOptions.cpp \
-		src/cpp/session/SessionOptions.cpp || die
-
-	# use mathjax from system
-	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
-
-	# make sure icons and mime stuff are with prefix
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
-
-	# install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
-	sed -i \
-		-e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
-		src/cpp/server/CMakeLists.txt || die
-
-	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
-		-i src/cpp/server/ServerOptions.cpp \
-		|| die
-
-	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
-		-i src/cpp/session/SessionOptions.cpp \
-		|| die
-
-	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
-	# It provides a library that has its version number appended to the end,
-	# which is difficult to handle in cmake, as find_library does not support
-	# searching for wildcard library names. So I find the library name from the
-	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
-	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
-	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
-					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
-						   -e 's@LIBS \*= -l@@')
-	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
-		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
-		|| die
-
-	# The git commit for tag: git rev-list -n 1 v${PV}
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\
-		-i "${S}"/CMakeLists.txt \
-		"${S}"/CMakeGlobals.txt \
-		|| die
-
-	eprefixify src/gwt/build.xml
-}
-
-src_configure() {
-	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
-	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
-	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
-
-	local mycmakeargs=(
-		-DDISTRO_SHARE=share/${PN}
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		)
-
-	if use !dedicated; then
-		mycmakeargs+=(
-			-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-			-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local JAVA_ANT_REWRITE_CLASSPATH="yes"
-	local EANT_BUILD_XML="src/gwt/build.xml"
-	local EANT_BUILD_TARGET="clean"
-	java-pkg-2_src_compile
-
-	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_compile
-}
-
-src_install() {
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_install
-	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
-	fi
-}
-
-pkg_preinst() {
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		xdg_icon_cache_update ;}
-}
-
-pkg_postrm() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		xdg_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
deleted file mode 100644
index 6c4943d4513b..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
-
-# TODO
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=)' dependencies/common/install-gwt
-GWT_VER=2.8.1
-GIN_VER=2.1.2
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage
-PANDOC_VER=1.19.2.1
-# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
-QT_VER=5.10
-QT_SLOT=5
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="
-	http://www.rstudio.org
-	https://github.com/rstudio/rstudio/"
-SRC_URI="
-	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-RDEPEND="
-	>=app-text/pandoc-${PANDOC_VER}
-	dev-java/aopalliance:1
-	dev-java/gin:2.1
-	dev-java/gwt:2.8
-	dev-java/javax-inject
-	=dev-java/validation-api-1.0*:1.0[source]
-	dev-haskell/pandoc-citeproc
-	dev-lang/R
-	dev-libs/boost:=
-	>=dev-libs/mathjax-2.7.4
-	sys-apps/util-linux
-	sys-devel/clang:*
-	sys-libs/zlib
-	>=virtual/jre-1.8:=
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
-		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
-		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( sys-libs/pam )
-	)
-	dedicated? ( sys-libs/pam )
-	dedicated? (
-		sys-libs/pam
-		acct-user/rstudio-server
-		acct-group/rstudio-server
-	)
-	server? (
-		acct-user/rstudio-server
-		acct-group/rstudio-server
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	>=virtual/jdk-1.8:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.5033-prefs.patch
-	"${FILESDIR}"/${PN}-1.2.5033-paths.patch
-	"${FILESDIR}"/${PN}-1.2.5033-pandoc.patch
-	"${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
-	"${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch
-	"${FILESDIR}"/${PN}-1.0.44-systemd.patch
-	"${FILESDIR}"/${PN}-1.2.1335-core.patch
-	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch
-	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch
-	"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
-	"${FILESDIR}"/${PN}-1.2.5042-R-4.0.0.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	mkdir -p dependencies/common/dictionaries
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	java-pkg-2_src_prepare
-	egit_clean
-
-	# Enable CMake to install our .service file for systemd usage
-	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
-	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
-	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
-	# this sed hack for now. ~RMH
-	sed -i \
-		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
-		src/cpp/server/ServerOptions.cpp \
-		src/cpp/session/SessionOptions.cpp || die
-
-	# use mathjax from system
-	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
-
-	# make sure icons and mime stuff are with prefix
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
-
-	# install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
-	sed -i \
-		-e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
-		src/cpp/server/CMakeLists.txt || die
-
-	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
-		-i src/cpp/server/ServerOptions.cpp \
-		|| die
-
-	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
-		-i src/cpp/session/SessionOptions.cpp \
-		|| die
-
-	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
-	# It provides a library that has its version number appended to the end,
-	# which is difficult to handle in cmake, as find_library does not support
-	# searching for wildcard library names. So I find the library name from the
-	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
-	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
-	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
-					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
-						   -e 's@LIBS \*= -l@@')
-	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
-		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
-		|| die
-
-	# The git commit for tag: git rev-list -n 1 v${PV}
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS e4a1c219cbf6c10d9aec41461d80171ab3009bef@'\
-		-i "${S}"/CMakeLists.txt \
-		"${S}"/CMakeGlobals.txt \
-		|| die
-
-	eprefixify src/gwt/build.xml
-}
-
-src_configure() {
-	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
-	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
-	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
-
-	local mycmakeargs=(
-		-DDISTRO_SHARE=share/${PN}
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		)
-
-	if use !dedicated; then
-		mycmakeargs+=(
-			-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-			-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local JAVA_ANT_REWRITE_CLASSPATH="yes"
-	local EANT_BUILD_XML="src/gwt/build.xml"
-	local EANT_BUILD_TARGET="clean"
-	java-pkg-2_src_compile
-
-	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_compile
-}
-
-src_install() {
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_install
-	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
-	fi
-}
-
-pkg_preinst() {
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		xdg_icon_cache_update ;}
-}
-
-pkg_postrm() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		xdg_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild
deleted file mode 100644
index 49d75885be5f..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils cmake pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
-
-# TODO
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-GIN_VER=2.1.2
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-# It should be PANDOC_VER=2.7.3 however >=app-text/pandoc-2.7.3 is not yet in portage
-PANDOC_VER=1.19.2.1
-# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
-QT_VER=5.12.6
-QT_SLOT=5
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="
-	http://www.rstudio.org
-	https://github.com/rstudio/rstudio/"
-SRC_URI="
-	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-RDEPEND="
-	>=app-text/pandoc-${PANDOC_VER}
-	dev-java/aopalliance:1
-	dev-java/gin:2.1
-	dev-java/javax-inject
-	=dev-java/validation-api-1.0*:1.0[source]
-	dev-haskell/pandoc-citeproc
-	dev-lang/R
-	dev-libs/boost:=
-	>=dev-libs/mathjax-2.7.4
-	sys-apps/util-linux
-	sys-devel/clang:*
-	sys-libs/zlib
-	>=virtual/jre-1.8:=
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
-		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
-		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( sys-libs/pam )
-	)
-	dedicated? ( sys-libs/pam )
-	dedicated? (
-		sys-libs/pam
-		acct-user/rstudio-server
-		acct-group/rstudio-server
-	)
-	server? (
-		acct-user/rstudio-server
-		acct-group/rstudio-server
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	>=virtual/jdk-1.8:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.959-prefs.patch
-	"${FILESDIR}"/${PN}-1.3.959-paths.patch
-	"${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch
-	"${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
-	"${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch
-	"${FILESDIR}"/${PN}-1.0.44-systemd.patch
-	"${FILESDIR}"/${PN}-1.3.959-core.patch
-	"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
-	"${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch
-	"${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	mkdir -p dependencies/common/dictionaries
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	java-pkg-2_src_prepare
-	egit_clean
-
-	# Enable CMake to install our .service file for systemd usage
-	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
-	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
-	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
-	# this sed hack for now. ~RMH
-	sed -i \
-		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
-		src/cpp/server/ServerOptions.cpp \
-		src/cpp/session/SessionOptions.cpp || die
-
-	# use mathjax from system
-	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
-
-	# make sure icons and mime stuff are with prefix
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
-
-	# install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
-	sed -i \
-		-e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
-		src/cpp/server/CMakeLists.txt || die
-
-	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
-		-i src/cpp/server/ServerOptions.cpp \
-		|| die
-
-	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
-		-i src/cpp/session/SessionOptions.cpp \
-		|| die
-
-	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
-	# It provides a library that has its version number appended to the end,
-	# which is difficult to handle in cmake, as find_library does not support
-	# searching for wildcard library names. So I find the library name from the
-	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
-	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
-	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
-					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
-						   -e 's@LIBS \*= -l@@')
-	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
-		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
-		|| die
-
-	# The git commit for tag: git rev-list -n 1 v${PV}
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 5a4dee980c998d9a270a83b582b367126f3914cf@'\
-		-i "${S}"/CMakeLists.txt \
-		"${S}"/CMakeGlobals.txt \
-		|| die
-
-	eprefixify src/gwt/build.xml
-}
-
-src_configure() {
-	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
-	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
-	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
-
-	local mycmakeargs=(
-		-DDISTRO_SHARE=share/${PN}
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		-DRSTUDIO_USE_SYSTEM_BOOST=TRUE
-		)
-
-	if use !dedicated; then
-		mycmakeargs+=(
-			-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-			-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		)
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	local JAVA_ANT_REWRITE_CLASSPATH="yes"
-	local EANT_BUILD_XML="src/gwt/build.xml"
-	local EANT_BUILD_TARGET="clean"
-	java-pkg-2_src_compile
-
-	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake_src_compile
-}
-
-src_install() {
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake_src_install
-	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
-	fi
-}
-
-pkg_preinst() {
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		xdg_icon_cache_update ;}
-}
-
-pkg_postrm() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		xdg_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.3.959.ebuild b/sci-mathematics/rstudio/rstudio-1.3.959.ebuild
deleted file mode 100644
index d708ec5bd513..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.3.959.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
-
-# TODO
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-GIN_VER=2.1.2
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-# It should be PANDOC_VER=2.7.3 however >=app-text/pandoc-2.7.3 is not yet in portage
-PANDOC_VER=1.19.2.1
-# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
-QT_VER=5.12.6
-QT_SLOT=5
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="
-	http://www.rstudio.org
-	https://github.com/rstudio/rstudio/"
-SRC_URI="
-	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-RDEPEND="
-	>=app-text/pandoc-${PANDOC_VER}
-	dev-java/aopalliance:1
-	dev-java/gin:2.1
-	dev-java/javax-inject
-	=dev-java/validation-api-1.0*:1.0[source]
-	dev-haskell/pandoc-citeproc
-	dev-lang/R
-	dev-libs/boost:=
-	>=dev-libs/mathjax-2.7.4
-	sys-apps/util-linux
-	sys-devel/clang:*
-	sys-libs/zlib
-	>=virtual/jre-1.8:=
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
-		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
-		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( sys-libs/pam )
-	)
-	dedicated? ( sys-libs/pam )
-	dedicated? (
-		sys-libs/pam
-		acct-user/rstudio-server
-		acct-group/rstudio-server
-	)
-	server? (
-		acct-user/rstudio-server
-		acct-group/rstudio-server
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	>=virtual/jdk-1.8:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.959-prefs.patch
-	"${FILESDIR}"/${PN}-1.3.959-paths.patch
-	"${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch
-	"${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
-	"${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch
-	"${FILESDIR}"/${PN}-1.0.44-systemd.patch
-	"${FILESDIR}"/${PN}-1.3.959-core.patch
-	"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
-	"${FILESDIR}"/${PN}-1.3.959-R-4.0.0.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	mkdir -p dependencies/common/dictionaries
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	java-pkg-2_src_prepare
-	egit_clean
-
-	# Enable CMake to install our .service file for systemd usage
-	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
-	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
-	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
-	# this sed hack for now. ~RMH
-	sed -i \
-		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
-		src/cpp/server/ServerOptions.cpp \
-		src/cpp/session/SessionOptions.cpp || die
-
-	# use mathjax from system
-	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
-
-	# make sure icons and mime stuff are with prefix
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
-
-	# install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
-	sed -i \
-		-e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
-		src/cpp/server/CMakeLists.txt || die
-
-	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
-		-i src/cpp/server/ServerOptions.cpp \
-		|| die
-
-	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
-		-i src/cpp/session/SessionOptions.cpp \
-		|| die
-
-	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
-	# It provides a library that has its version number appended to the end,
-	# which is difficult to handle in cmake, as find_library does not support
-	# searching for wildcard library names. So I find the library name from the
-	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
-	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
-	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
-					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
-						   -e 's@LIBS \*= -l@@')
-	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
-		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
-		|| die
-
-	# The git commit for tag: git rev-list -n 1 v${PV}
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 3a09be39fd51a8fafa8ae330007937d31924b395@'\
-		-i "${S}"/CMakeLists.txt \
-		"${S}"/CMakeGlobals.txt \
-		|| die
-
-	eprefixify src/gwt/build.xml
-}
-
-src_configure() {
-	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
-	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
-	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
-
-	local mycmakeargs=(
-		-DDISTRO_SHARE=share/${PN}
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		-DRSTUDIO_USE_SYSTEM_BOOST=TRUE
-		)
-
-	if use !dedicated; then
-		mycmakeargs+=(
-			-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-			-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local JAVA_ANT_REWRITE_CLASSPATH="yes"
-	local EANT_BUILD_XML="src/gwt/build.xml"
-	local EANT_BUILD_TARGET="clean"
-	java-pkg-2_src_compile
-
-	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_compile
-}
-
-src_install() {
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_install
-	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
-	fi
-}
-
-pkg_preinst() {
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		xdg_icon_cache_update ;}
-}
-
-pkg_postrm() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		xdg_icon_cache_update ;}
-}
diff --git a/sci-mathematics/sha1-polyml/Manifest b/sci-mathematics/sha1-polyml/Manifest
index a43b118ec78d..937dc7bd30a7 100644
--- a/sci-mathematics/sha1-polyml/Manifest
+++ b/sci-mathematics/sha1-polyml/Manifest
@@ -1,5 +1,3 @@
-DIST polyml-5.5.0.tar.gz 12776783 BLAKE2B 8ec50df7a43049f564e4f0fd67aa961fb2dd075359934a58340526e77a852006fdc1083d199837ea406524cbe3fc53d5a85d83e5a414662e141257b18d8c9a22 SHA512 4d8accc7083e12a0117fb4e34367e9b22c500d31094d8f0e381b91e91a3e8122cb5ca760ecc86bdcf7ff50a460848a181747bafc068b4a300b01de54e55fbad7
 DIST polyml-5.6-1.tar.gz 22041657 BLAKE2B c097dda273b12dfe013706e5fa313f210f1f0bf6b32766db6e459ce1bca46f93504baef3d7644922c60d119431d659cbd69d8cd273fcc94609eadff058d3cb9b SHA512 3107f4a5b17283dc3873b0ecf7eb1c607c42e14e859b50345b666f19412a2592e359ea29f03e56d390491e9104a71e0bf80eb39884f51d8724b37f8f935fa7d2
-EBUILD sha1-polyml-5.5.0.ebuild 2717 BLAKE2B 39e0790e8fdfe25cc4c546827d48a99f75ca0ce2ce1588fff4c7e7111466137d5d7d5fa86a7b95f2e71bbb0ac8b08dedd97c574423ce4e6237e604fe1668b270 SHA512 c60123afd281d043a47d0a501f5ee3171ae78bbc6fe74e086215735abc46f917abf8c543d6bfc6399af5774905258be70101d5b4b15cae4bda282243e23077b6
 EBUILD sha1-polyml-5.6_p1.ebuild 1906 BLAKE2B 08981e8894274905a4d4eb428bd85cbe32848b4455196c336cf7859e0ef7b5de5137ec72ce70aa615e276369db04607e44515bd2c40b376f9aa665127a88a822 SHA512 95e93614c546a3b5f08c5917986cee5765e5ba8981832ff5dbb013d070726fa454661b2d2425d452a4cc8228d11b155d4ed2accd00f26b459609101783497ca7
 MISC metadata.xml 631 BLAKE2B f1ea7f8c4cde6c764c3c0649d2977636de0984756e1d3953f0ec142688ac75b6c2f909220766115408059e81a596cde28a31b6d9684b41080b0cc6cc36e2904e SHA512 ce2a008b92696040b1de592443a3bf1ca927aa95380bc92e4558c0d362dd1d2dc33c023a522946fe0295936feb95a2b920cbe0fbd44e65d7c9d5ca3f955bb7b1
diff --git a/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild b/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild
deleted file mode 100644
index 2ca76f2ee378..000000000000
--- a/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-
-MY_PN=polyml
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="implementation of SHA1 is taken from the GNU coreutils package"
-HOMEPAGE="http://isabelle.in.tum.de/"
-SRC_URI="http://isabelle.in.tum.de/components/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}/sha1"
-
-LIBDIR="/usr/"$(get_libdir)"/${PN}"
-
-# sci-mathematics/isabelle requires sci-mathematics/sha1-polyml, to avoid
-# this warning:
-# ### load_lib </usr/bin/libsha1.so> : /usr/bin/libsha1.so: cannot open shared
-#  object file: No such file or directory
-# ### Using slow ML implementation of SHA1.digest
-# sci-mathematics/sha1-polyml supplies the library libsha1.so.  Which
-# is the implementation of SHA1 taken from the GNU coreutils package
-# as described in the sci-mathematics/sha1-polyml README.  Isabelle
-# builds libsha1.so in the contrib/polyml/$ML_PLATFORM directory.
-# isabelle dynamically loads libsha1.so as a plugin.  The Isabelle-2012
-# linux binary bundle places libsha1.so in the contrib/polyml directory, which
-# is referred to as ML_HOME in the Isabelle Pure/General/sha1_polyml.ML source file.
-# ML_HOME is /usr/bin on Gentoo, and we want isabelle to depend o sha1-polyml.
-# For these reasons isabelle is patched to load it from
-# /usr/$(get_libdir)/sha1-polyml/libsha1.so
-
-src_prepare() {
-	cp -p "${S}/build" "${S}/build-orig" || die "Could not cp build to build-orig"
-	sed -e "s@CFLAGS=\"@CFLAGS=\"${CFLAGS} @g" \
-		-e "s@LDFLAGS=\"@LDFLAGS=\"${LDFLAGS} @g" \
-		-i "${S}/build" || die "Could not set flags in build"
-	cp -p "${S}/build" "${S}/tests" || die "Could not cp build to tests"
-	sed -e '/echo "Running tests ..."/,$d' \
-		-i "${S}/build" || die "Could not remove run tests from build"
-	sed -e '$i\\nexit 0' \
-		-i "${S}/build" || die "Could not add exit 0 to build"
-	sed -e 's/echo "Running tests ..."/echo "Running tests ..."\necho "Running tests ..."/' \
-		-i "${S}/tests" || die "Could not duplicate echo line in tests"
-	sed -e '/# building/,/echo "Running tests ..."/d' \
-		-i "${S}/tests" || die "Could not remove build from run tests"
-	sed -e '$i\\nexit 0' \
-		-i "${S}/tests" || die "Could not add exit 0 to tests"
-}
-
-src_compile() {
-	arch=$(uname -m)
-	uos=$(uname)
-	# Switch to ,, when we switch to EAPI=6.
-	#local los=${uos,,}
-	los=$(tr '[:upper:]' '[:lower:]' <<<"${uos}")
-	./build "${arch}-${los}" || die "build failed"
-}
-
-src_test() {
-	./tests "${arch}-${los}" || die "tests failed"
-}
-
-src_install() {
-	dodoc README
-	insinto "/usr/"$(get_libdir)
-	dodir ${LIBDIR}
-	exeinto ${LIBDIR}
-	doexe ${arch}-${los}/libsha1.so
-}
diff --git a/sci-mathematics/twelf/Manifest b/sci-mathematics/twelf/Manifest
index da382e5b8f87..9d51e6127ddd 100644
--- a/sci-mathematics/twelf/Manifest
+++ b/sci-mathematics/twelf/Manifest
@@ -8,5 +8,4 @@ AUX twelf-1.7.1-mlton-20180207.patch 310 BLAKE2B b372c7ca65b4bb12983d84e590d4e30
 AUX twelf-1.7.1-mlton-mlb.patch 11244 BLAKE2B e07adfd1520179a8ca3c292638689c8cc344b8d01ebcf2ba9f668cbf2afa5b5132a88d0521ca4123a9165d8fea49cdbab20b48b791bd3e78610d54b534e9e596 SHA512 2d0f42399e444cbb736f38ad7bdc54f51322c17c010b273c365d9db9a1e6c045c19b872d4b5c1e50444559a981aa5569764ac859c7702c116c97c935fd959bfd
 DIST twelf-src-1.7.1.tar.gz 1147610 BLAKE2B 9fbb3c5a4823845a0c721112744330658be0e68784ef209a3d17fb72874ef50d7dbb434a7104704a5540f2f0bc30727bfe1ff602f986570f944454e77c24609d SHA512 1b4baa0f385b6b605583a9da312f23c775aab43e7398c6e151833a6b95c74112492530f44fcb7b14f8288774e9b63e2f9618a5debfbc4d34737bc2588f5850df
 EBUILD twelf-1.7.1-r1.ebuild 2438 BLAKE2B 2b0f2461f8c1f6b245ea41f39043f3f1ad3633643521c1fccd5384acd319962c1d403a7de9d1d6c655a54a44b10daf215da28e6f82ebeadc77286717072f73b8 SHA512 4de8be441caf012ee6735e37408072639491935ab114c1b8966a4c3ed3bc238293ca63e6a5c0869912f9e0b2ebc5fd2274ac5519ea2c10645c73fd04a003c4cd
-EBUILD twelf-1.7.1.ebuild 2366 BLAKE2B aa2a68eddd7ba17aa5966d01937afc5085a8bf37e0bdcb2b7a9abc62cd092aa9ab7a338d5b01be6e2ebdb2fbcbd264b34bedce90bbf0115a3f5c0cbead05ec95 SHA512 6e3dfa9bea7843bb43903b963ad6cc3764a69cfffc0651788fdb140191981f8edf6cc2adb401b7d118ad9bcbbf01ff539effba702f296e5eb05476dc2fab7e8c
 MISC metadata.xml 446 BLAKE2B 318daa8b8e87beff1553a9e49e7db737736b8bad6f157753f42dd8fcfa0941dd83273cab94c056ab4e9555019263f1356e99baea1ef4dbca1da2df3d8f096ec7 SHA512 7fcca73104456672c8e262129cdcc232073d6d0a4cd48d6593734646a3611ac6056325cc88be5c3a3585d67bc76fa9fb663a0171df7b84612c56c0ec93bc0e2e
diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild
deleted file mode 100644
index 9506fdd82542..000000000000
--- a/sci-mathematics/twelf/twelf-1.7.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit elisp-common eutils multilib
-
-MY_PN="${PN}-src"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implementation of the logical framework LF"
-HOMEPAGE="http://twelf.org/"
-SRC_URI="http://twelf.plparty.org/releases/${MY_P}.tar.gz"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD-2"
-IUSE="doc emacs examples"
-
-# tests reference non-existing directory TEST
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/mlton
-	doc? (
-		virtual/latex-base
-		app-text/texi2html
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-	)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-SITEFILE=50${PN}-gentoo.el
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.1-doc-guide-twelf-dot-texi.patch"
-	"${FILESDIR}/${PN}-1.7.1-doc-guide-Makefile.patch"
-	"${FILESDIR}/${PN}-1.7.1-emacs-twelf.patch"
-	"${FILESDIR}/${PN}-1.7.1-emacs-twelf-init.patch"
-	"${FILESDIR}/${PN}-1.7.1-Makefile.patch"
-	"${FILESDIR}/${PN}-1.7.1-mlton-mlb.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	sed \
-		-e "s@/usr/bin@${ROOT}usr/bin@g" \
-		-e "s@/usr/share@${ROOT}usr/share@" \
-		-i "${S}"/emacs/twelf-init.el \
-		|| die "Could not set ROOT in ${S}/emacs/twelf-init.el"
-}
-
-src_compile() {
-	emake mlton CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -fno-PIE"
-	if use emacs ; then
-		pushd "${S}/emacs" || die "Could change directory to emacs"
-		elisp-compile \
-			auc-menu.el \
-			twelf-font.el \
-			twelf-init.el \
-			twelf.el \
-			|| die "emacs elisp compile failed"
-		popd
-	fi
-	if use doc; then
-		pushd doc/guide
-		emake all
-		popd
-	fi
-}
-
-ins_example_dir() {
-	insinto "/usr/share/${PN}/examples/${1}"
-	pushd "${S}/${1}"
-	doins -r *
-	popd
-}
-
-src_install() {
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.{el,elc}
-		cp "${FILESDIR}"/${SITEFILE} "${S}"
-		elisp-site-file-install ${SITEFILE}
-	fi
-	if use examples; then
-		ins_example_dir examples
-		ins_example_dir examples-clp
-		ins_example_dir examples-delphin
-	fi
-	dobin bin/twelf-server
-	if use doc; then
-		dohtml doc/html/index.html
-		doinfo doc/guide/twelf.info
-		dodoc doc/guide/twelf.dvi doc/guide/twelf.ps doc/guide/twelf.pdf
-		dohtml doc/guide/twelf/*
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		ewarn "For twelf emacs, add this line to ~/.emacs"
-		ewarn ""
-		ewarn '(load (concat twelf-root "/twelf-init.el"))'
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index d2cfafb26d29..a2a63949dfa3 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -3,8 +3,6 @@ AUX why3-for-spark-2019-flags.patch 920 BLAKE2B ee9cf3e956a82f79e647a71c09592593
 AUX why3-for-spark-2019-gentoo.patch 764 BLAKE2B ba9fd2c8ff6dfba4783c527cb02a5d40d0bc8d25e9039af20c1ae4498dfe7c275f5d3cf85a5bea63f86703dca8e931a4ce837c3fe4a2337918d87ec563d69de5 SHA512 61c2b1e8da73617211f9142738836be7787a9d2c2396fad73b6ed7f4d5bbe87336e38540549d8458d7ec2bd290cfdee811c4a6f19444b4e7b7de21396bcacef1
 DIST why3-2019-20190517-197BB-src.tar.gz 9439414 BLAKE2B 68072064e8ee9152528c90afc948047a1f4d58b960ac05b276761fdca5ba1204100c75f33db7bb0ea1a8a646b734e62892ed41bd875b954354f52b8f9d498d4a SHA512 9169a4ff9ee994a19f9f04b689d1b9c679f5340bcd631d7d49b4c55064f505bd5a6ca8149077e5d24d36f5365f0cab58587094e86f352a9105fc46f10c0746ba
 DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
-EBUILD why3-for-spark-2018.ebuild 1712 BLAKE2B 6bab5512436341fe88e22657752081b5ed78f6ae27f1b3e5dc95a916a2b641f1f362aba40a333b74622a3832b5c385100d9266bdc25a692f43a20a93be2605a8 SHA512 0077d68c18911e71f5ff3a54b48700b3e63dbf976acf9f153ebb9ce81d8de6f697b9750be0ac5dfd214f40677a3dbe9325d8005df169a853b90980099d7ce762
-EBUILD why3-for-spark-2019-r1.ebuild 1800 BLAKE2B 945fb823d3add5e83a0a121c077fbf1995620ff57ab061ebe6d70108a7d29a3481364f95a34f8a789b7844dcd544e5506f406317c3f0211fd42d9e50da3b4185 SHA512 e14b116249693850aef1b21b1c61f71c3ad3803bb52b36e1355ff0116d1a7075a5a0282b8814221ab2eeb41bc4823e4b259813d08bd3f3fe555497580c004a37
-EBUILD why3-for-spark-2019-r2.ebuild 2982 BLAKE2B 46845a19e57af3364b387697e96d5438d29d01f27418b11b3adefbbaf1de8463ac08950764aa7af8625945725859885484d343dbe35586e4c03c6ecad4777795 SHA512 520421eac279b9158ccd8e3f3f2cab4181ad78782396d7ef5db7f4d13d550e05023e50b8dbceeb387e533eda395cefc2312930ad9a0ee3cf78bf1d847bc07167
-EBUILD why3-for-spark-2019.ebuild 1781 BLAKE2B 00bb8e39eff2bc94757bb823c663911ad308488a3d3491e6f00a4a30e541a2724a7e29f999c4c32966d9cc45feaf99b76bf3259a6014b133d9125ccff687fdbf SHA512 81e68202740eaea33e19dad98c14e6baa9fafaa69a4a25d87132bb55248d977cc94871f50929802f67fd670a068f01ae62d9863a8a091e97c4e5d762566850c3
+EBUILD why3-for-spark-2018.ebuild 1729 BLAKE2B 14002f870711eaf350aa38c4fa8bcf3947585e08c873b6d9509756009caae20f52d389db22ef288c4c92146622ee43053cf784013331b638d6370278c5189772 SHA512 e3fac3fafa90980c2d3cf068e19477baa45cb01f517ee5dc235a7984f07f8dffb95f6ef329082bf6d5e88cfb8b02ae617b509010fdbb448644c3742b22d1733f
+EBUILD why3-for-spark-2019-r2.ebuild 3000 BLAKE2B c6f405a6e36086f7763e1717f610d2c3139e48ef259652b5489be6d0ac536efe17cada609b693e7d0d848d1c5a4d6b321015e03d7ee2f2ebff71a9ef23b08620 SHA512 27a484e227f693ad50b026e658bbe0fbdc230f7a96ee30115e8fe38149ebc9e574c638fa9e0012b6099aa5a03df3ac83ae5800b611ef6ad2406b18571831109a
 MISC metadata.xml 1363 BLAKE2B 820bfc974ca6984f78340f223f8f19d12f0313016118110a35cfe149129c2dc189d6f03f34bf3d30c9d3e5d9c9ab90bba33dca4320c034821a7a89f97b92a7f9 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
index 2335a61928f9..bb7093a5b79d 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,18 +16,18 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
-RESTRICT=strip
+RESTRICT="strip"
 
-DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
-	dev-ml/menhir
+DEPEND=">=dev-lang/ocaml-4.02.3:=[ocamlopt=]
+	dev-ml/menhir:=
 	coq? ( sci-mathematics/coq )
 	doc? ( dev-tex/rubber )
-	gtk? ( dev-ml/lablgtk[sourceview] )
+	gtk? ( dev-ml/lablgtk:2=[sourceview] )
 	emacs? ( >=app-editors/emacs-23.1:* )
-	html? ( dev-tex/hevea )
-	hypothesis-selection? ( dev-ml/ocamlgraph )
-	zarith? ( dev-ml/zarith )
-	zip? ( >=dev-ml/camlzip-1.07 )"
+	html? ( dev-tex/hevea:= )
+	hypothesis-selection? ( dev-ml/ocamlgraph:= )
+	zarith? ( dev-ml/zarith:= )
+	zip? ( >=dev-ml/camlzip-1.07:= )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild
deleted file mode 100644
index c19ce6114c3d..000000000000
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MYP=why3-${PV}-20190517-197BB-src
-
-DESCRIPTION="Platform for deductive program verification"
-HOMEPAGE="http://why3.lri.fr/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt zarith zip"
-RESTRICT=strip
-
-DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt?]
-	>=dev-ml/ocamlbuild-0.14.0
-	dev-ml/menhir
-	dev-ml/num
-	coq? ( >=sci-mathematics/coq-8.9.1 )
-	doc? ( dev-tex/rubber )
-	gtk? ( >=dev-ml/lablgtk-2.18.8[sourceview] )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	html? ( dev-tex/hevea )
-	hypothesis-selection? ( dev-ml/ocamlgraph )
-	zarith? ( dev-ml/zarith )
-	zip? ( >=dev-ml/camlzip-1.07 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-REQUIRED_USE="html? ( doc )"
-
-src_configure() {
-	econf \
-		--disable-pvs-libs \
-		--disable-isabelle-libs \
-		--enable-verbose-make \
-		$(use_enable coq coq-libs) \
-		$(use_enable doc) \
-		$(use_enable emacs emacs-compilation) \
-		$(use_enable gtk ide) \
-		$(use_enable html html-doc) \
-		$(use_enable hypothesis-selection) \
-		$(use_enable ocamlopt native-code) \
-		$(use_enable zarith) \
-		$(use_enable zip)
-}
-
-src_compile() {
-	emake -j1
-	if use ocamlopt; then
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" -j1 install
-	emake DESTDIR="${D}" -j1 install-lib
-	emake DESTDIR="${D}" install_spark2014_dev
-	dosym ../why3server /usr/$(get_libdir)/why3/commands/why3server
-	einstalldocs
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r examples
-	if use doc; then
-		dodoc doc/manual.pdf
-		use html && dodoc -r doc/html
-	fi
-}
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
index 7b658828da45..9fa713b6baaa 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,20 +14,20 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt zarith zip"
-RESTRICT=strip
+RESTRICT="strip"
 
-DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=]
 	>=dev-ml/ocamlbuild-0.14.0
-	dev-ml/menhir
-	dev-ml/num
+	dev-ml/menhir:=
+	dev-ml/num:=
 	coq? ( >=sci-mathematics/coq-8.9.1 )
 	doc? ( dev-tex/rubber )
-	gtk? ( >=dev-ml/lablgtk-2.18.8[sourceview] )
+	gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] )
 	emacs? ( >=app-editors/emacs-23.1:* )
-	html? ( dev-tex/hevea )
-	hypothesis-selection? ( dev-ml/ocamlgraph )
-	zarith? ( dev-ml/zarith )
-	zip? ( >=dev-ml/camlzip-1.07 )"
+	html? ( dev-tex/hevea:= )
+	hypothesis-selection? ( dev-ml/ocamlgraph:= )
+	zarith? ( dev-ml/zarith:= )
+	zip? ( >=dev-ml/camlzip-1.07:= )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild
deleted file mode 100644
index 409bfc36cda5..000000000000
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MYP=why3-${PV}-20190517-197BB-src
-
-DESCRIPTION="Platform for deductive program verification"
-HOMEPAGE="http://why3.lri.fr/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
-RESTRICT=strip
-
-DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
-	dev-ml/menhir
-	coq? ( sci-mathematics/coq )
-	doc? ( dev-tex/rubber )
-	gtk? ( dev-ml/lablgtk[sourceview] )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	html? ( dev-tex/hevea )
-	hypothesis-selection? ( dev-ml/ocamlgraph )
-	zarith? ( dev-ml/zarith )
-	zip? ( >=dev-ml/camlzip-1.07 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-REQUIRED_USE="html? ( doc )"
-
-src_configure() {
-	econf \
-		--disable-pvs-libs \
-		--disable-isabelle-libs \
-		--enable-verbose-make \
-		$(use_enable coq coq-libs) \
-		$(use_enable doc) \
-		$(use_enable emacs emacs-compilation) \
-		$(use_enable gtk ide) \
-		$(use_enable html html-doc) \
-		$(use_enable hypothesis-selection) \
-		$(use_enable ocamlopt native-code) \
-		$(use_enable profiling) \
-		$(use_enable zarith) \
-		$(use_enable zip)
-}
-
-src_compile() {
-	emake -j1
-	if use ocamlopt; then
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" -j1 install
-	emake DESTDIR="${D}" -j1 install-lib
-	emake DESTDIR="${D}" install_spark2014_dev
-	dosym ../why3server /usr/$(get_libdir)/why3/commands/why3server
-	einstalldocs
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r examples
-	if use doc; then
-		dodoc doc/manual.pdf
-		use html && dodoc -r doc/html
-	fi
-}
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index af114c8b14bb..785fb93c3757 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,15 +1,5 @@
 DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e
-DIST wxmaxima-20.01.1.tar.gz 14011946 BLAKE2B ed80f02158aa0c43f37c040225010b35eea49756d8f052bcfa245d31a4a2203880463f51833ed40f2e1365473eb138269287c30a52e9f9b98ef4d9a5daac8cf5 SHA512 bff946f87db39b4bf416ef3440fdfea277f9dc9ed95debcea5798211299ae8c8dbb136a44be586a79e538b99fd38c46febf5378caab6ac31a01a01033f083937
-DIST wxmaxima-20.01.3.tar.gz 14221966 BLAKE2B cdaf62f5456446fe6edf1247323faa9f0aeb84dbe890cb03028f9f441c4c6bd3e7acf806b71a86b156ea7f10664c0188517b8f2aa15536e3350e16e3307f412c SHA512 4a977bd293255ac3c010610c74aa39fba8b8468aaa9fc59707bab69ede7a427e261ce827bae8d302ee1343bb0fce5e7aa5ee3c59f17198d5c473637571667abd
-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
+DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb
 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
+EBUILD wxmaxima-20.12.2.ebuild 1433 BLAKE2B aab53bc0b36e755aeb883cf18b2a9dc74e6420478765b351c920f2937f6970a20524d31833da7d51730bd7a5955f998e2968cf36d3a48b8122f2eac339b04f8a SHA512 32773324509bc19466c91a43c39050f25a4922f67eac211a117ec6f69be379881f5615a4d000176c0fb490bd91a7534f75038867e4e91064d1ea1b59fcb79570
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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/wxmaxima/wxmaxima-20.01.3.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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/wxmaxima/wxmaxima-20.02.4.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.02.4.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.02.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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/wxmaxima/wxmaxima-20.07.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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/wxmaxima/wxmaxima-20.09.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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/wxmaxima/wxmaxima-20.04.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
index 9a2b704c52cf..a76a6aeeb045 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-20.04.0.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake-utils wxwidgets l10n xdg
+inherit cmake wxwidgets l10n xdg
 
 DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
 HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
@@ -26,24 +26,26 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	setup-wxwidgets
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
+	sed -e "s|GPL.txt ||g" -e "s|share/doc/${PN}|share/doc/${PF}|g" -i CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i info/CMakeLists.txt \
 		|| die "sed info/CMakeLists.txt failed"
 
 	# locales
 	rm_po() {
-		rm "${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
+		rm locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
+		rm -f locales/manual/${1}.po
+		rm -f info/${PN}.${1}.md
+		rm -f info/${PN}.${1}.html
+		sed -e "\\|/${1}/wxmaxima.1|d" -i data/CMakeLists.txt
 	}
-	l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po'
+	l10n_find_plocales_changes locales/wxMaxima '' '.po'
 	l10n_for_each_disabled_locale_do rm_po
 }
 
 src_install() {
 	docompress -x /usr/share/doc/${PF}
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 0fe23437e4d0..0c674d5dd649 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,5 @@
+DIST z3-4.8.10.tar.gz 4731869 BLAKE2B 92487f71a0c8d961949dc23032d8fa3ff157fe7acc29b41d0d79326f8b59c60e19f43527cccf4e51872c0f0664598f9063876b04cc581f918aa48c37a13c4f3f SHA512 d2741d7ad3e1d5ee3fec92095b061a96a700c3327b2eb2090d4162bdcaeaebca8c072ef79c5daac1f6de3456165c2cc38e13f1045bc707779d1027b943837c5b
 DIST z3-4.8.9.tar.gz 4624159 BLAKE2B ff97a688ef3f977cd1204ddafaf6b4ef5824fc8f9f38f0ce9a31657b99b8cb08ee5834893ac67056eb4d7f7df67585933029292eed41d140a93c10b9daa8e100 SHA512 a50da5c3f9e27d3e804c1b71f648a3dbd5a55223b7344d66f191a1b34a4d787810abd976840d3ab3878aaf5c96d89f5a517cac0781b82aa927a9d8d54836d54f
+EBUILD z3-4.8.10.ebuild 2425 BLAKE2B d9fe65ebd7708d31a9501533f30338ce56c6412dfa5f2ef31227923127aa7ee4fb5175497b93b8cca4273f630fc2b42916bb2048ce791e7cc81d3780ee248789 SHA512 b8ffa66d92ed8ba8fafc742c4881be42320ec1f51f649ccf6210876b39b8d5b2cd362ef7cbffc07e8646694f390bf0b2e79d90042f95533e15e2966ad15d4bfd
 EBUILD z3-4.8.9.ebuild 2420 BLAKE2B ab0d58d6e1066bda6a5bdf8314f9bc30912ed2b8f7c194589b0d0eb27772d5bac1cedee90c9d2bab4cd9ca863179404e6cbb652adc9382ae2e662e91dde87ade SHA512 763792bb4fad6b14e8b629103a5ba026bc0fdde49a6cdaa05de9c05448a40aedab7039de0ec1909457dc615e391674eacfdc621f184e4ec312e5584797e57bb8
 MISC metadata.xml 616 BLAKE2B aeef1be6d9c4a94062310c6e2c3ac7fb1efe39bb608d96c143a01e9a01585f11ee25aa56d8f67d0a96d880b543882f2cb781247c034eda75e7f6f030767bf660 SHA512 aed4bbc517cc4f9e78ad3f5d50af5837757efa2985aa61a3faf40e39203179d356830a1d6fd4712422257eb244a67ae5eb5c4b2db76ab75769f5fe5e6d045a0c
diff --git a/sci-mathematics/z3/z3-4.8.10.ebuild b/sci-mathematics/z3/z3-4.8.10.ebuild
new file mode 100644
index 000000000000..6ffa59ba2b62
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.10.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{7..9} )
+
+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 ~riscv ~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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-mathematics
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)