gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sci-mathematics
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
64 files changed, 190 insertions, 1791 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index df905547d8fe..fabd0f69c632 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index d494d819f510..32a349c41897 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,5 +1,5 @@
 DIST coq-8.6.1.tar.gz 5588811 BLAKE2B 1016e54ef9b42a8534add55ab057454fad35b3fe103ba877689489c7d9cf43d76c1fbee123801d91035d353a882120650f94c433d9ee1daa878b8c819609c949 SHA512 814ab76a06ca15f927081428da74add4bc67290199fa011853b9c68a00cdefaf813b10fbac18a434f4504fce8f2173eb544080bf6f50d62caa41bb8724b13083
 DIST coq-8.9.1.tar.gz 6001970 BLAKE2B f65498e2485c59f4f95d2afeac35750ebf85b5af6db7c269a11635f2414df483d4cb159557060c9118de25f4922176f54d2e5c6f12174599371348341cb4d80f SHA512 66344f801b955d1b6daf3ab1d704551070c95cf9032ae74f15fb33f7ec313812b3e05c0ec277a2eb448e3fdfd9721df06d36612e2fb4928b6530d70147f1d983
 EBUILD coq-8.6.1-r1.ebuild 2007 BLAKE2B e11542ca13987c776b7dd4b181a4e369381d5b4bf16d61e2ba06b77d7c26e93295a18040ca757b02df492fb034f8852e9d340f52dbd22e7dde8cefaf60fe14f8 SHA512 b26850dc5f062a938a6974c1b49eb6f09645c75cdbac945262919be3d13c46e897d839ea063258868c6e6785cdeb31fc41152c2ffc0b412ca3b152e5ea89ffbc
-EBUILD coq-8.9.1-r1.ebuild 1883 BLAKE2B a329987a6a77f44f596458787d3b5d0d60e54601b4037a4be46c9008e4b3d1ca0b2aa4dcd5444c761b0d255758df4765d5cef17df1c2117d0830394ec7b77287 SHA512 93a07c2b0084fd8baef9be3fa5d8ebf472455fb41e93024295ea2883fae1fac5368670119bfc1ad18204a7a2f4e867e1add48df0116bd76e687cc4b62b26cd44
-MISC metadata.xml 1113 BLAKE2B 0162bb9994d76c6e3019c5e99459ed2fb5d25e7854213ac90735c9693256cb65d81da48cabf279bb6c8badd028e2f59bcab68a06232c92cc9203db16e36d3f79 SHA512 10bf7af26739a58d7e2165ab8d02b6412540c2abd1e28b800976fd8fc9df78275b5dafbdb2e660eae7fb4946769b41812ee5d2bba931317870d993869d7412b8
+EBUILD coq-8.9.1-r1.ebuild 1884 BLAKE2B d060bd67a71bbe9cfc8c73ec578ca19565f88b671f667305ffbf7a911f46de8040918848321cbebee6c7957d566638007b634a0909ff8603497ca2ef71607a7f SHA512 76d68162cfc431547f5c499d1ffa80c1446a95e2f96c414830a93d4d91ed65143eb0c8bf3b12ed27d3d1b4bd302e498ea1ebf783b37a8576c7c009d4681a83ef
+MISC metadata.xml 999 BLAKE2B 04e27cb6563eca4cfab69c0a73a12e2ea5cb3ccb6dc711400ebbfb4790c896ab8f7efff0da1f985596333a4f32cd6d8278e750ef90cb5f0d61728d8f453095fa SHA512 0c78334d0d352fbe268804040a4f7765fba09055e316fd67739d052fbb4048817e3136065939f763248a3cbe27daf5884f2953b887690a7593aed6b5dc7157a6
diff --git a/sci-mathematics/coq/coq-8.9.1-r1.ebuild b/sci-mathematics/coq/coq-8.9.1-r1.ebuild
index d110241bb500..5392c5dee7b0 100644
--- a/sci-mathematics/coq/coq-8.9.1-r1.ebuild
+++ b/sci-mathematics/coq/coq-8.9.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib
+inherit desktop multilib
 
 MY_PV=${PV/_p/pl}
 MY_P=${PN}-${MY_PV}
diff --git a/sci-mathematics/coq/metadata.xml b/sci-mathematics/coq/metadata.xml
index 1bf44c44c547..3dd30ec86367 100644
--- a/sci-mathematics/coq/metadata.xml
+++ b/sci-mathematics/coq/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>Gentoo ML Project</name>
-  </maintainer>
-  <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
diff --git a/sci-mathematics/dunshire/Manifest b/sci-mathematics/dunshire/Manifest
index d19726f31b66..22e7cdf574f1 100644
--- a/sci-mathematics/dunshire/Manifest
+++ b/sci-mathematics/dunshire/Manifest
@@ -1,3 +1,3 @@
 DIST dunshire-0.1.1.tar.gz 300878 BLAKE2B b0ed57e535313fbc653fdc7c8fd32fb98382db71dfe419e315f4b82fc4630e47757d74b9105e846b2eefaa7dcd93b12886eee341b11d0e8b562a52e480478e9a SHA512 5cdf8125d7fc1f76a483009392360e9e9088f9b58ca3f123d14e366421e831e4e7c8e17d367ba0430fb3cd61873cae7a004c903ff5417bfc9adecb7831681081
-EBUILD dunshire-0.1.1.ebuild 693 BLAKE2B 2c29b2f3bf87da8f640232e011cc8a45d111bace457ae5ff3026c06054c79fe2a605adcbb45afd92d2bb8cad702f8995e82039968a51203169ede5782d0654f2 SHA512 32e3bb7a59b3d5fbf900a02fcbd21eda83da552fca375b499ffe1aa7a559df3d60bfc92550c33e633c2182145762dd716830b1b96a8fdb5906f2c7e486c5df7f
+EBUILD dunshire-0.1.1.ebuild 720 BLAKE2B e54c351613bb3c4bef3ccd2817ea05b23c95bb6e35477a0afeee7a882ad535a222fa98853c92de71c52916a239d0f3d1daa06efc05a5108891541e026bfb9617 SHA512 06b8b505e3d015da9f229b247dc26f09adc9642fc7a2755bd093071e688ed24d20d8f1f809d91116a9d7592a55c8bb800e6c8bb837ba2aa21e73e76fa65d7e43
 MISC metadata.xml 328 BLAKE2B 16beb1fab1e231e2bb2c8088729c9ab6fa1d4ab06f12f1da462fdeb18738d5fed80b28456df94b2af14f97855042d356b7f69ef956524c456bae62e12b4ba499 SHA512 1ae4898a1247c78ba707aa6e38819cbc5277e46fd32d3ca1172c70c18f42247624755262e3886a2deee76d2a39a3a54750edbc2d77a339543741c2488b095e45
diff --git a/sci-mathematics/dunshire/dunshire-0.1.1.ebuild b/sci-mathematics/dunshire/dunshire-0.1.1.ebuild
index 4bbee157ef79..32b83f053c80 100644
--- a/sci-mathematics/dunshire/dunshire-0.1.1.ebuild
+++ b/sci-mathematics/dunshire/dunshire-0.1.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="AGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/cvxopt[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/sci-mathematics/fann/Manifest b/sci-mathematics/fann/Manifest
index e7b9eeaed581..2deb0a17729c 100644
--- a/sci-mathematics/fann/Manifest
+++ b/sci-mathematics/fann/Manifest
@@ -1,5 +1,5 @@
 AUX fann-2.2.0-examples.patch 941 BLAKE2B 82b5480468179cad681e2c1359a84fe550ed4f23b42441d8b943a79c86d51d7b491e879cb597ee0c097acb26210196a7755345e4ece02692a93c3f6ea18b07ee SHA512 617c43352912b965d0c7ef445aecdb15a5148260e3f41c1b0e8cdd5abb0246e6ad0338c74b75c690fbc63175692578dcc596612108c3b9804694cecace046b34
 DIST FANN-2.2.0-Source.zip 2285087 BLAKE2B aacb49c20c4ea0d86f4eeb3144462051b43480ed613228f3a590ea258878cd2d0528cd301cb993a96ed0bec0d69d5b7c4288f25046d5272c1c8295167862a349 SHA512 c486694aac53cf91a83f8b68d9020fc74ca2bea9416c9d06b6dc8f53d30a2261bd00212e3d439adef9fbdd82532056f7c1afed793f5574c2d6191d84d26fb5c2
-EBUILD fann-2.2.0-r1.ebuild 769 BLAKE2B e67a61f1bfb487e5aea5bb439884ecb5c9fa60c9386564aaf48819b214b204e0f8a32dc071c2d308e7cb075a8adb09643d8aa06383b31aac64c08cc5e67ddc86 SHA512 2f620edb4c345f50b1344bf7fb47d9471e6daae9d7c4c6f2fa9ef60f61c26bb3d62d7cd9b20a23f8816c3bd6a18b466eb2c8ac070adf75371c8772d389b94738
-EBUILD fann-9999.ebuild 657 BLAKE2B 5a67c8431ab0007843ab8d2d0cd7a98a2e09712e0c120c067c1dd3c7fe102d30b65748158fc5364dc765646d0f53f67beab08d8566a0ad5a0ab6fa0521095fa3 SHA512 5c2002f43aa598135999993929a09584b048d9d2f0d5e2b695a7e5e1d54b0f84e7e92ca4fcec91831f202ab0f40231cfdcd3666517d2d0634e67be393611876b
+EBUILD fann-2.2.0-r1.ebuild 765 BLAKE2B 7866b7be045f97b9d7fd1caf7eabdf8d925dd65a507af9e84dd26335f8f1c83c8c5a54fadd641388800adfb97d2e241373f7b2f3df5230575666d3b11ff765b1 SHA512 af42792ce0f421b800ca3294f81ee347ed7774ba380748510abb516da5c23dd37b581199dac5f74ebe5ee580385dd51ea358653d94a6a89f21b35025c3410c3a
+EBUILD fann-9999.ebuild 654 BLAKE2B 63070d6d5fbf65379d8250cff286c9ece9944604b81cae25b76cb0082cd654a256d2aa134fa742fb8879c8b7aea50d79ff8c8747d3192ed4174f302108cd5212 SHA512 1994d264a8533f65dc89ec1a252ef407bca10e774750d1c964d03f0684699c16f115cb4c66893d9b92684d6ec5c40c464d30bbfa078dfe657002822ad61c9585
 MISC metadata.xml 841 BLAKE2B e6e263aaef2bb1a54d3a7d438064282532a2d81be2558bda6ecd92f02df6ad1745693aac8f8d31606c8e363e871fe9acff132c264ee398c14ead8a09e5ebbb87 SHA512 4cca56af735bab9710d8e62891c749e990813eb99bc28c01fec63de8038fecd89bbd7b331841a530aaf1b61cf3b77f7995a7006cebe158ad197527ae2fea7ef6
diff --git a/sci-mathematics/fann/fann-2.2.0-r1.ebuild b/sci-mathematics/fann/fann-2.2.0-r1.ebuild
index 614220457998..f37ab14a8884 100644
--- a/sci-mathematics/fann/fann-2.2.0-r1.ebuild
+++ b/sci-mathematics/fann/fann-2.2.0-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit cmake-multilib
+EAPI=7
 
 MY_P=FANN-${PV}-Source
+inherit cmake-multilib
 
 DESCRIPTION="Fast Artificial Neural Network Library"
 HOMEPAGE="http://leenissen.dk/fann/"
diff --git a/sci-mathematics/fann/fann-9999.ebuild b/sci-mathematics/fann/fann-9999.ebuild
index ffe0d8b9bb2d..0f00c30eb182 100644
--- a/sci-mathematics/fann/fann-9999.ebuild
+++ b/sci-mathematics/fann/fann-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib git-r3
 
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index ad0b4ec51eae..981a87020fd0 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -8,7 +8,7 @@ AUX flint-2.4.5-ntl62.patch 454 BLAKE2B cec67356f4b94431d11e3e81f9f37259ddf92a2a
 DIST flint-2.4.4.tar.gz 1639262 BLAKE2B 54162a4d2f02c3e8e441b6a96c1e7ba4e5e8d8ad7b2d36bb7ead49bb112cd94403cb503d1e56621a0a6fedad6387e63dc39888ff3757e298aea55bf55acc4e20 SHA512 236997cf64bdc96741740889f450fdbaf7d7e9b58252645f864d28005c9e7bdf87f7187cd17526606c605f0489f026398a1361b8f209f71158ca3b31c42d86d2
 DIST flint-2.4.5.tar.gz 1640022 BLAKE2B 1267d81bb0270556614ebc8bff65287e0b3738ba0f3245f066ee7ea6971ab4d9082beb2c0a336dcd5b9c1517261aaf55c0bee519c6f71984834a7920002ad95c SHA512 088ff512ea2330f9323a6ca0dc875e8c0926d755317d6007eba4b333a14d7612e82ebcfeabd26d1ec4b9204c4517dee08f914ad1ec852e37336fe378710a8bfc
 DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
-EBUILD flint-2.4.4-r1.ebuild 1543 BLAKE2B d1cca578297beb97de6de0d78684688b4a607218f33ad345a0f1d841e601479607ca7d73227d9e39149413f60d13d80ff953d9a701339a13889093ac629cc52c SHA512 bee9f783ce831ff3c6a745d7c4ebdb046cc0c2b62136c3ba337bc5e47a0ba5782af9f0ead4573c12d695283b14087d2d5fe4d824f5b47bf474bb45a335758cee
-EBUILD flint-2.4.5.ebuild 1631 BLAKE2B 6eb612d92fae80439f83236574270fcb7d612aebcbef0f222f5c306b9d50044466dbafcb9897592a640043796e75ea55ce2c83722fd4527281cd6d16f7546877 SHA512 f1cb533494568b2f0c808a683285815fc34730d59030661bfab7c2a7819f43f08e69e3e8b47081f3b123565b3ce38d49c85f841600c7cff07e4e644c6556eda1
-EBUILD flint-2.5.2.ebuild 1367 BLAKE2B 0fc2746683b36df8fda85937498afa79848dc02c7ee36e7cd538fbc280a4edff2309871b5e06b16012d6e5b1d99e593fc4f36266c317ed4e57713cfee6e5eca0 SHA512 c886113d3cf3c19cc87817296d25695a7824c27ff30ff150721765766d11830f3e6c0bdf49b0b3e80ab33cf4439d42fe1bf5d1a055696d8396f79c1714cac04a
+EBUILD flint-2.4.4-r1.ebuild 1556 BLAKE2B df9874dd99c5a624e59d3cfe31e7b76cbcb9186d46cd54374f26b698cf303dbfc887af151bc1ddab8aabc799a560d1325d43a20657dc7039da6f92580ba7984c SHA512 2e32029930d81a5f2e7e23b589a1ff4cb07b06cbddc350d588a50159cef5cbc4b3c05bb1fbf16752313cc98443106d4b0ff3d794bf543100f522ff1f3d71937b
+EBUILD flint-2.4.5.ebuild 1644 BLAKE2B 041ab4f00f44bdd24cbba2d7e41f6ce8a3c3066dfdb2a5af3704c935400ee8d0368b08c1a0034ac80ff580ad08f3d9b6e7e7167893a0a9f93c92933365fe64e4 SHA512 8a2b4c422b2cb28f4dd89fb035a85cc3fbfe725b069f934de2a51a1e114929f80670d047a5c4acca7e585d0f51ba9b6d90f3f38c12bcc8daa557fbf9baa68ca6
+EBUILD flint-2.5.2.ebuild 1380 BLAKE2B 2b8e87bfe4d77f3d937a2ed963e894d382694f0bda1b36b3dd8166b994aa0c89f26b921686a9d92702417f7cbdf3d0af17b1e22e48e4e6b859ba4001ef9113b0 SHA512 8faa425010435c1badc4323aad4d2db99c09c79a42103340142bdf442a090857118d74171e11d347a5b844e294d5406f0b1055910312ff53e2594ccadc22a826
 MISC metadata.xml 481 BLAKE2B f0d2cbeda37050bec654c0cba3c45b7340f37b29aa570c744d0a882f662481e7d8d777f48b0530fa23090807d9ad0a913733f4d55a3661f82322cfe544b90508 SHA512 63b38afaf08270df42d3a26cca9f5f491562dd89d8e9c43def3849a624d6694343147e47a602d75e44a656a8db1f7cb06885534fe39917cb46f2f895efc8ff16
diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
index 1068395a40c3..846ee038654c 100644
--- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ DESCRIPTION="Fast Library for Number Theory"
 HOMEPAGE="http://www.flintlib.org/"
 SRC_URI="http://www.flintlib.org/${P}.tar.gz"
 
-RESTRICT="mirror"
+RESTRICT="mirror !test? ( test )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
diff --git a/sci-mathematics/flint/flint-2.4.5.ebuild b/sci-mathematics/flint/flint-2.4.5.ebuild
index b36ea8b5f2b3..36bcaaaea7a9 100644
--- a/sci-mathematics/flint/flint-2.4.5.ebuild
+++ b/sci-mathematics/flint/flint-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ DESCRIPTION="Fast Library for Number Theory"
 HOMEPAGE="http://www.flintlib.org/"
 SRC_URI="http://www.flintlib.org/${P}.tar.gz"
 
-RESTRICT="mirror"
+RESTRICT="mirror !test? ( test )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/sci-mathematics/flint/flint-2.5.2.ebuild b/sci-mathematics/flint/flint-2.5.2.ebuild
index 64f94ae79dcf..0a6ef5a44bd8 100644
--- a/sci-mathematics/flint/flint-2.5.2.ebuild
+++ b/sci-mathematics/flint/flint-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ DESCRIPTION="Fast Library for Number Theory"
 HOMEPAGE="http://www.flintlib.org/"
 SRC_URI="http://www.flintlib.org/${P}.tar.gz"
 
-RESTRICT="mirror"
+RESTRICT="mirror !test? ( test )"
 LICENSE="GPL-2"
 SLOT="0/13"
 KEYWORDS="~amd64 ~arm ~x86"
diff --git a/sci-mathematics/gmm/Manifest b/sci-mathematics/gmm/Manifest
index 176beaf8b21c..110bb744117e 100644
--- a/sci-mathematics/gmm/Manifest
+++ b/sci-mathematics/gmm/Manifest
@@ -1,3 +1,5 @@
 DIST gmm-5.1.tar.gz 537290 BLAKE2B bd8463e028554905d42190e9bbec7b8823271789331011ffc6da23f117cba9be4fec88b05343406d4bef557d7630b0a31c2a06df443708674341263f6ce7dfac SHA512 403074c2efedf2d9f63076a46faabb27c1bc19356284fac89aef58220ce0900d126b6f1a4f9bbef1641be1d609a8379729cad063695a570756ae0b2c470cedad
-EBUILD gmm-5.1.ebuild 561 BLAKE2B 918d8d7d58c85feab0d8895b4b3dc19c1be1368d517f40d3a4ca844f6a18ce4cc51e2c3da466cbe36634c33f30d35880b1dd4a8629621e1d2b94cc834b04cb22 SHA512 57876ab20574eb356839f0d3b91f331807a585a09f8d14332b6c82c734feb391a6062118da2a03c1426452093541cf0b2978fe6d419c1be9f742b25b2aa3e100
+DIST gmm-5.3.tar.gz 540146 BLAKE2B 345c82303d82e1b87a6877e10ce6013edd81a62e365824bfe30747a1f577af65fc36337d848d4599a23bd9ea4942e3255a864bc2848ab1a4fc73a7de493320e4 SHA512 5f5bb25268d4357fc103f448c5bb3def49b16f1a03a54495b8c17c347ea3c6cb87435eb943c0fe3e9b46f75fa2ab7942ac63858c9eae01f865e1e4c6e4e7fa0a
+EBUILD gmm-5.1.ebuild 535 BLAKE2B bf660b240e6d802c722499b0d649e288bf5b1d13f0f10e7d68b02987d7a8bef7374d43230ff00e5a1ae681b3d3a2b33dafe76464aafd0515f1a2e940ca0809dc SHA512 598f5554d97c341d353b1f172b48e21a47808f04c67574c6b697415956b09d17145d821bedcf4a403c156104f96357978a0004d0eaadd962a17f6be7d4a83b4a
+EBUILD gmm-5.3.ebuild 539 BLAKE2B 3954ef7a4493b29ac740103efe3457cb678e2fc51c64e0f26926e4f7430d62faf8f772c2b17e03bb1dcbac32f9518cd380b44b9297079fcacaae130b0d133a25 SHA512 3b6ebbea1301025bcb7fd0ca579088ca2f65915a8a2ee5a6aef9c61300953c41326fced8a069947f54d0f66c04629f7e55130fd57dee5fbc61ff2029544394b5
 MISC metadata.xml 747 BLAKE2B eb7f2a2c5c48f83d2c170f1f099fc473c2b2aad0f0230777331e46f2630eb2e38d51ebf74c87ad4d3a201bd0ce9995f15320780e6a37f8167b2cc709ebab0a9a SHA512 10c681ecfb5f05c61b24badecdc640e92053c56b3d1c3a324a8664a6c4012823c08070f7fd7334007353b04203f5570ded69821779446ce209896301741b7415
diff --git a/sci-mathematics/gmm/gmm-5.1.ebuild b/sci-mathematics/gmm/gmm-5.1.ebuild
index 42c6d3eace9d..76289e38d9f7 100644
--- a/sci-mathematics/gmm/gmm-5.1.ebuild
+++ b/sci-mathematics/gmm/gmm-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit flag-o-matic
 
 DESCRIPTION="Generic C++ template library for sparse, dense and skyline matrices"
-SRC_URI="https://download.gna.org/getfem/stable/${P}.tar.gz"
-HOMEPAGE="https://www-gmm.insa-toulouse.fr/getfem/"
+SRC_URI="mirror://nongnu/getfem/stable/${P}.tar.gz"
+HOMEPAGE="http://getfem.org/gmm.html"
 
 LICENSE="|| ( LGPL-3 LGPL-3-with-linking-exception )"
 SLOT="0"
diff --git a/sci-mathematics/gmm/gmm-5.3.ebuild b/sci-mathematics/gmm/gmm-5.3.ebuild
new file mode 100644
index 000000000000..9c63466f030d
--- /dev/null
+++ b/sci-mathematics/gmm/gmm-5.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Generic C++ template library for sparse, dense and skyline matrices"
+SRC_URI="mirror://nongnu/getfem/stable/${P}.tar.gz"
+HOMEPAGE="http://getfem.org/gmm.html"
+
+LICENSE="|| ( LGPL-3 LGPL-3-with-linking-exception )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_configure() {
+	# required for tests, #612294
+	append-cxxflags -std=c++14
+
+	default
+}
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 45b557baeeba..cdb75cb276bf 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,6 +1,6 @@
 DIST gmp-ecm-6.4.4.tar.gz 941058 BLAKE2B e83f02592a8bb86285f258fefc3e302cc5168888109e7f87835b25412baf526df58e5ea38347acfd926b90fac15b4103981a14aa7b853dba0cb0168467a223e0 SHA512 039009de2d1a22de7abed2e2b843fa2bc684ddcfc45892891a24b93ad4b3640a97d2e7612ebcbdbca8db032534c226ad77c67199772b21a6139e5fa205687097
 DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-EBUILD gmp-ecm-6.4.4-r1.ebuild 1474 BLAKE2B cf8ce605ccdb5a1b26db33a01989a06b8395840a84c700f7e420e8b69edc0bf4a91e03f84ce66e2d13184b10212c1e375c273d67c043adbf57e99b7462fc93eb SHA512 da6edd387bef9b397d431ee5ac7700e651a9751fb7aff1413151bf7a7f1e312def417514c7ff536a454c5b46f7405a26ad5fdbecf743f0d667313a1da6c00e22
-EBUILD gmp-ecm-7.0.4-r1.ebuild 1203 BLAKE2B e1c8e29bd3a42277aac1029f2a7b840cfacaf8cfb057e250ba597849858b4e6e1a45c4a4c6f2917a9834b53fed92faa7d5bc020b15dbe17c64d923e015827010 SHA512 a42cb6e57827da2c6e28858da18c65d0e70319dbd646378e9dab1d4ed5c138d842e9ad5aa6a2853d0abe6aeadee24fbffeb45fae955ae213ccca1d692cd2b8e8
-EBUILD gmp-ecm-9999.ebuild 1026 BLAKE2B 26e3b858f684136f9909a00f58240359cb6f09cafb64276e1c14efc7d26f13dc9b676809c8bf8d8b3b3342847b87de2b19ba5f37096a975e870694a6fb082cd3 SHA512 2f4314e9578bdc129af573c540e2f4cb26549a5a5bbfd640bdcdd50afc55b6bd05f10486a0382be4f13d4c4fac3dc93bcffd44faddfbafcafdaaf9b64d2cc579
+EBUILD gmp-ecm-6.4.4-r1.ebuild 1501 BLAKE2B 48aa2b0e116f151507bfebc43ca33b413c29d5eb89364e608556b611302094dc8c0db497350c8001f4164822b89fedc1aa571dd3332c5182dc600f6cc2af5566 SHA512 131cef9c49bfdea884516a56b0b1ddf42602886555554c4eab112f17417f2b9838a3fc70ba7171f9eb9c882971bbc73bda1619b8f2a31986a08d2380c8abe4a3
+EBUILD gmp-ecm-7.0.4-r1.ebuild 1230 BLAKE2B 43eafb8be5dce1211467d2cb40ae5f0aa68306876a891a3160903eb71f1922c38091320d5f9f9bb66b8ac444eb48d9121b8743d13ee31b0ffb5825598e862f4f SHA512 3eb32837e3b7311fc9dda8592c9934da55191ee5b294de9d2d0540f20f6665f64234995f7e243ae4b39d63baba5787d5ca9724b51ea6e840090ca0b239ed50d5
+EBUILD gmp-ecm-9999.ebuild 1053 BLAKE2B eab97fcb27a1ac30898000ea06ba6d8e5279e979b2b85141ce86494fabf3fb6066c8449292620816ee17822b12564c248705bbbe6ecb4f64a622d8c84b25c4a5 SHA512 2d5f6ebbb57d8cf98e479021d9b345ca00d41dbffef357d0ddfdc40ef6c9f4bf159527ad0b1a37e18deb33051796408456f72ebb2b0bc3c47651a6a374f4ebe4
 MISC metadata.xml 384 BLAKE2B 168807abd87bddc88522015f01126d5ec0bde8716aa38b6e619054d39e9bb12a6ffdaa3082328ecb56c0398b498c964c8e28c818d3887919fbe3065a28673f2a SHA512 a8a7aa64869c88ac293347281a80158cbd3cc84fc9f5ca56531d3d53b33601f9baa5c4f66c93508d6763dc54779a563faa09c4a473c670a9b217610efecca25c
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
index 29e28d2fc9cf..463c145bb3c8 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+blas +custom-tune -openmp static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
index 67ee92316610..e650e69207f7 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+blas +custom-tune -openmp static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
index 728b19ecd527..2856746b2ef3 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="blas -openmp test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index ed60fb4f4c93..e35073726567 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -19,5 +19,5 @@ DIST maxima-5.43.0.tar.gz 34605709 BLAKE2B db9db75b7eff0454d4b9595120d726969b4e8
 EBUILD maxima-5.38.1.ebuild 4823 BLAKE2B e2f4aa9b01a251b0ff0250df56a9b9cb904ea1d859ff32414fc38f48d9cd772ebe5bab5dbe02fdfe87f6c70c848ad9b2b0b724a8dcbd8aecf459d492cbfa6132 SHA512 88dfd3edcef7450247c1c62b1c9c8759a8816ff6ba6691074088253d5ae3922afa828b21e543978617cc022701a2dfc82e2d2436c21430da1249949393cf6e12
 EBUILD maxima-5.42.1.ebuild 4904 BLAKE2B 9e3ebeec6da72caab22651f9e2421d36b7eed178a3aa86d07e7cdc62cba8af5a762ff6394a002138a83f03e313c3c0c80a9f2bf3343a1cb85b3a2182ffae8332 SHA512 0d6ce53ea40e4d34de1958a9e9739ff95179b424ac816b108c30f711784d5c1aed240a16c1b7c26f16b95a4b468c6113b79e434fc4a823dbf60697eff986f54e
 EBUILD maxima-5.42.2.ebuild 4907 BLAKE2B e01606981d1a4bb47d35ba0eece7ed52397cda03a913c1c9d198346db458fd6906d33cde56ac29881c864ac4c7fc14e93d111544005b1a20bfe0836eb0a5822b SHA512 afdc36255024bb493e1b119cda07cf37a9aa871c6b49af412121e45e12be2e510211ea8ad828dda76686d6cf2df435c8eccca7e264297f0abac8138b72d8a56f
-EBUILD maxima-5.43.0.ebuild 4959 BLAKE2B b11cbeae9caa8c629f0225ddbb311c3dbf283b27220ac43feef11891aa5d90ab4bf1ee5f605e7d029df026ff4a74d362d4375bf8b608e157001ce142a35d6d14 SHA512 5023e9230297bd2550e47e6b65d2fa050e1aeddb6d9c3dd4ca43e8b7c6f6c9a12787cec4e8d330d8b0d01cc90e930225c3b5a367d170b29b65fb37f288fb284d
+EBUILD maxima-5.43.0.ebuild 4986 BLAKE2B d21e48f2723187ff89309c360d82f08be6954d75a3dec63b13506cc6576c5950d9a6ab39a85e07dd67e69f4df5e12e152c4f824359a642deba62b1397b8303c3 SHA512 17b3b9ec3bf62cd236cf00c92d042e20c2e1e0787464d5136961a8c7fe66d196b1e44092fab7c03df2a3213bb15b9916762e0057668c3d127945b67cbad3dd76
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/maxima-5.43.0.ebuild b/sci-mathematics/maxima/maxima-5.43.0.ebuild
index 3d2e01212877..177564b4b5f1 100644
--- a/sci-mathematics/maxima/maxima-5.43.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.43.0.ebuild
@@ -23,6 +23,7 @@ CONF_FLAG=( .    .     .               ecl  ccl       .     )
 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"
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index df577b8581bc..5e5090ea1250 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -5,7 +5,7 @@ AUX msieve-1.53-fix-version.patch 1138 BLAKE2B 110bdba41cc622eb6edbebef641df4f5c
 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 1471 BLAKE2B d0737d40f63129dcdbcdf3481bfab1342fa8a2cda2ad6f120f3ce7c9909f74278999a26ce1812f51c3e3cfac2830a5a7bf65a134bad4815d2fab83e5e71d999b SHA512 5b893ee8d35f14a6d723b78b99c981f15b5598f24eca57bdefd0b9d7db64e1ce284307c92c699214ce567eb643ec52ba207e8308e37e57c4c45fcf3f9505c476
-EBUILD msieve-1.53-r1.ebuild 1496 BLAKE2B 38800df9f0046b7de5f609b728356950ee0f76a8904af2bc10c14bdd049ab88a50ee3eb5c9e0df0460cecffd528e5137ee5c2fd9561398725bd13449edc0ef46 SHA512 4e95fb791fb1b1bd1b6059059b7368867d3ad58507d464da29d38d50617835d4e1c0a631b25e285320fd0cdb05de4064f5279d10539deaadfc008e4b1f4015a2
-EBUILD msieve-9999.ebuild 1344 BLAKE2B c465f6a5b5c75a1d533b204ab838dc7025ded5d331bc0fd1419ed721131dfbbb52d8e8f3b11ebfe81af1be41f6e85dfb83605ea1a7c8a48e4de9817796688275 SHA512 e626117a138ec30bd0a952a4d82783dbf529ba9a22160ded2ce18456fb5afe0b09f54998f7db3d67db085f067a00b6da3e270fd509c7555e8597a058a50842f2
+EBUILD msieve-1.51-r1.ebuild 1444 BLAKE2B 41db7580a8949792af750e712d66818d98c449500b7dc6e4ae0e11770db367b052ac7520adbd1c53f39b311d80f09e2703c961c568594224f7cffb72747d4ed4 SHA512 d25740704f94f2e6ceab9643a20d7013ba6c9cfdfec01983795f55596dff3c95836392294b9c86a6af3efeb6405e8bfc8483bb7d15301e4546aeb49f9c01c714
+EBUILD msieve-1.53-r1.ebuild 1469 BLAKE2B 8325e0ba994c25ce3280287542038f4731b639e0953801379dffef31cdc145d1666fafa326bb7177733af13a35cbc08ef9820f843fc409536fa7db74e2a631f7 SHA512 e8e04b4c66b190f3f43f6dfcf2e36cfb96f90557752cb2c118844c8c980f3327226517358bbda7c0c852c35e25071651cc28c53d5053232dfcf164a000836606
+EBUILD msieve-9999.ebuild 1317 BLAKE2B 8cd2cc6925fcecc20e3e78bffbfe2e331c53dcd32e7432be57188f5de1ab081152fc944e5ebd56e1248f9e0dfd0e421e726cf24081c61176556e9ca19bb0f8e8 SHA512 9b7cc2ea8f065e47fcda5b83f043262b59cc6705adf14187d81bd8ec6c05f3d80c08011c7613ab0b040328ba8c5a2f3b6d651916d487fed9c6195f15f8428507
 MISC metadata.xml 417 BLAKE2B ac5b4847814369f3126102ccf20421069b3b7edace1b95951729507d84bd37966d5f02cefff41857d32661fba8353dd29bef4de63097d276018acbf8ace456dd SHA512 a8c43840089c4516cd31bfd2a9fee4202bdb5a264cb28b22dcd7d17cd40669056cdc4a5c7a437b092bc71b1ec9c1bf6d1bc7f0f8f61858818749fad3e93eaf1d
diff --git a/sci-mathematics/msieve/msieve-1.51-r1.ebuild b/sci-mathematics/msieve/msieve-1.51-r1.ebuild
index 0b4672d57dc6..25cedcc0c961 100644
--- a/sci-mathematics/msieve/msieve-1.51-r1.ebuild
+++ b/sci-mathematics/msieve/msieve-1.51-r1.ebuild
@@ -49,6 +49,6 @@ src_install() {
 	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 || die "Failed to install"
+	dobin msieve
 	cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install"
 }
diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
index 67933ca55dfd..f590609455e3 100644
--- a/sci-mathematics/msieve/msieve-1.53-r1.ebuild
+++ b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
@@ -51,6 +51,6 @@ src_install() {
 	mkdir -p "${ED%/}/usr/share/doc/${P}/"
 	cp include/* "${ED%/}/usr/include/msieve" || die "Failed to install"
 	cp libmsieve.a "${ED%/}/usr/lib/" || die "Failed to install"
-	dobin msieve || die "Failed to install"
+	dobin msieve
 	cp Readme* "${ED%/}/usr/share/doc/${P}/" || die "Failed to install"
 }
diff --git a/sci-mathematics/msieve/msieve-9999.ebuild b/sci-mathematics/msieve/msieve-9999.ebuild
index d5ad2a8ec1b9..72fa0aaf997f 100644
--- a/sci-mathematics/msieve/msieve-9999.ebuild
+++ b/sci-mathematics/msieve/msieve-9999.ebuild
@@ -45,6 +45,6 @@ src_install() {
 	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 || 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 b9f403556fdd..d7be566c444c 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -3,5 +3,5 @@ DIST nauty25r9.tar.gz 1007323 BLAKE2B 29d8131a5d21d22a0ef5502d8822aefc07022e83ea
 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 945 BLAKE2B b912308231284d1fe1ddc96b5742ae47b7f203a22f9f1adb0b1464fa26b116aeaf28832bcbda7758ce152423cfb76ad9be153559d4119bd7943e0cb133b140c2 SHA512 4206a0203297ca7b5e71286b0db9a26bf9e335867ffccc3edcd85df09688cb7b15f6aa526b90a23760f23e019d251e3798bb1ef7ccc23c2a34db1deabb8aa422
-EBUILD nauty-2.6.7.ebuild 1447 BLAKE2B c4505e8c59b95e6f1c05f2fe52bc2b44cc262baa575fc6a50ee945bf0eecbbaee3f6eb878a5b539fc66d8774f4510fa679eceb442f33a020cf95a0be5750f4d3 SHA512 83d1041bf1696b4b19dc1f4afc74f24d3106ed265b58d0ad23990744da43f2178fcc9b68fcaf05942534bd2992c50a93923cc7290336008cfa2b8c496f82f946
+EBUILD nauty-2.6.7.ebuild 1471 BLAKE2B 39f024d026a0558b731e540ba9b0b9f7b857b253b7b30936392136a80bf385e0fcfd58c7331220352e61e6efb9c0ac08127e6478eda013fbf64ab138d68f0595 SHA512 4008b318bff18e44ef588106d22840a959429f8f31a1614e39f2dd98e107b262004e9b2ba924861b9fbb128e92cc7e57ec2668b7507727f002dcfefa1c074247
 MISC metadata.xml 545 BLAKE2B dc773d4acdd458e7dbe5bc8744c847d9ae04eaedff901e4daa1f78cefcd261f158f54d916dcf054f7ba348b3c9d555d6542a421c3cc1ed1feda1276bd798064d SHA512 19b48e8150e6776f4c51f80cc0b4d468cbb320a9468dfe298debe21177e13a2c9a41d7ef2a24b54c5e7986231402f72d7db19c6c8b075ae9a3f103c040dd9262
diff --git a/sci-mathematics/nauty/nauty-2.6.7.ebuild b/sci-mathematics/nauty/nauty-2.6.7.ebuild
index 2e01267a151a..13acc2d602be 100644
--- a/sci-mathematics/nauty/nauty-2.6.7.ebuild
+++ b/sci-mathematics/nauty/nauty-2.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-libs/gmp:0
 	sys-libs/zlib"
diff --git a/sci-mathematics/pymc/Manifest b/sci-mathematics/pymc/Manifest
index 5c96dc9a8bec..f061f545be53 100644
--- a/sci-mathematics/pymc/Manifest
+++ b/sci-mathematics/pymc/Manifest
@@ -1,4 +1,4 @@
 AUX pymc-2.3.6-remove-hardcoded-blas.patch 414 BLAKE2B 6bf59a1088f701c0897c002aabe0c9de0a87067da24ffb965afcb304950662f551fc63d4694cda2d6832d5faf963c3801e3fe2365c46ab5b791df1c28de0ad3f SHA512 776ecd9876342215c925ad4a2dfa123e9f6656c6e5a8f3b8d208cc89befc84164b5355d4c1afce8be8962951c3343629cfacb0449d6d0b05d9333886803bbb4a
 DIST pymc-2.3.6.zip 402827 BLAKE2B e8ed875d84e8783f35f9186c6d7d659f29a49937896261a0f8bd892f324d2e17887ce37381aece8d97e47389edf7d727dc73a40ef6abfe4682a7bcbd1a768336 SHA512 4b5e0663ca296efd8d242a0b6362a12d475cdabf661a430de5455e60999acf8a4a30d053303c2f79e8aec3e5e7d120f56cb341e283aa87f31c224e4e57300d13
-EBUILD pymc-2.3.6.ebuild 1296 BLAKE2B 3fbd1f424904d68ee121df68dfa4ca9c153d75f1027e090441073e2a18745dda7f310fc0511eae97c85d9248f1deeec5ef71641bdd8978753cc3e1c00fbed4e8 SHA512 bd1b79ea087e6ce6256051f060d6a0b0ba491619053add8f305eaad85e3c0e4b7d02323bdd2c689a275be77069f4d5632520fc61b9230f0d17e5be2715705cb4
+EBUILD pymc-2.3.6.ebuild 1323 BLAKE2B f39df705cf5011997e341041e8e30a1509f5aee25307b7626dcbde50e6461fdbdb813ce1a235ac74085a2ee5a3ca43fbe9f03ccd30169af15b9a2c43853dd13e SHA512 1b60973ba58034119c660e39dcaa9852ea7a417c8f07d292ed2d0cf75976d1057b08f19a18a78b1240cb35a58e646ef1acd887b9c6091b99898f79e8e3cd5159
 MISC metadata.xml 554 BLAKE2B 229a895f97fe3880b2b739dcbe09bb377bb9625eaa0ef6388097143d90b8aaae7c08100ff5e9503f5c2c1ea62e574f712de2826770177a52ea27d925edc38069 SHA512 0d9ac09e21100370ed731a23cbce01c73a734a4e2adb282a2c0cc185c75d011f3aeafc75283d27e30635f00cf7fb27a6a502e1a9cb922892d10016d6e9770d65
diff --git a/sci-mathematics/pymc/pymc-2.3.6.ebuild b/sci-mathematics/pymc/pymc-2.3.6.ebuild
index ae4dc4146942..17a639ab072b 100644
--- a/sci-mathematics/pymc/pymc-2.3.6.ebuild
+++ b/sci-mathematics/pymc/pymc-2.3.6.ebuild
@@ -15,6 +15,7 @@ SLOT=0
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE=AFL-3.0
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/numpy-1.6[${PYTHON_USEDEP},lapack]
 	>=dev-python/matplotlib-1.0[${PYTHON_USEDEP}]"
diff --git a/sci-mathematics/pymc3/Manifest b/sci-mathematics/pymc3/Manifest
index cc0ca5d930c8..ac7408e3fb83 100644
--- a/sci-mathematics/pymc3/Manifest
+++ b/sci-mathematics/pymc3/Manifest
@@ -1,3 +1,3 @@
 DIST pymc3-3.1.tar.gz 34553828 BLAKE2B 73c4d50f7d656322fa1a7384aefa1f46caacccc8055138fefc27a82d765866efb9d4853a842a2df312058c558edd66b37a40295904c86f023f8fec5503877206 SHA512 30799d9c1b670adbcf5cc1463029d71a87c7b917e83b1f6cb453d75553616da7173421e7ae6e31b332c85f8170daea735344ff83ba6605cf3b15cf79c5c4fb97
-EBUILD pymc3-3.1.ebuild 1555 BLAKE2B cd8b093e17014f5ab3bed51ce9421a4710f9cc5b8ab86af0b66f25617a47463ede86dbf56c45b1798eb22c2763f1550204ce48c9a68e1731f9fb3a30c8428e8f SHA512 bf6e081b0a59db5225e55ecd3424669b9be5cdba395381e8a1ea426761fe3c5a58cfc64bac08e6fe9dacbf662b543aabea8d9e79f22813fe8fc3721b94d8af71
+EBUILD pymc3-3.1.ebuild 1578 BLAKE2B 78cb77fc1ed2ad981ba93ca6233ffecd68e324b482cd1631ea552715d02be7e80fb81e673befc056e33f058a48144abb815f4672e6ef51b15cef32ff1b36207e SHA512 464b982de86f8bc94dd45de397c4febe19128dea1adb994abe6d029f9877fc111a169af904914738f71a65f759a87d5106a00530983ddfa6388297a9ab2c8763
 MISC metadata.xml 740 BLAKE2B 2c56161497137f40e0e25e85299af90c361ddbcaccb4436747ba111e725c9a881fdf88944dd0208909275bf4013b9e1d5983b590ad7f46589f584549288aa02c SHA512 c75ed4b57479fef93c4b667792cb284212f859532697c4d4876e2dc23ab13d2c470143d3236de03e741a0797049a12d3a7e2f0d2ae4f07b2cfb0b7943c78526d
diff --git a/sci-mathematics/pymc3/pymc3-3.1.ebuild b/sci-mathematics/pymc3/pymc3-3.1.ebuild
index 9fe032ad4a5a..c246e0768bb9 100644
--- a/sci-mathematics/pymc3/pymc3-3.1.ebuild
+++ b/sci-mathematics/pymc3/pymc3-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1 virtualx xdg-utils
 
@@ -19,6 +19,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="AFL-3.0"
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	<=dev-python/commonmark-0.5.4[${PYTHON_USEDEP}]
diff --git a/sci-mathematics/rngstreams/Manifest b/sci-mathematics/rngstreams/Manifest
index 6788a76b4b44..5b28e72116f0 100644
--- a/sci-mathematics/rngstreams/Manifest
+++ b/sci-mathematics/rngstreams/Manifest
@@ -1,3 +1,3 @@
 DIST rngstreams-1.0.1.tar.gz 502458 BLAKE2B 119f4bc9ceb34487176c2ad02b6be16b50c6300c0512b05fb2376d02ddd59f17d62fa9e3e190093534614a90daace84701c628962284228be787950a534ec24e SHA512 665c27e72a4e1bdc59864f340208d42fc899c1c9429aafe1c7c3f8778dee0bb87ec9da26976a925197e07931bc1c2864dde0cb3fc08996155f775b7e44f9d7f4
-EBUILD rngstreams-1.0.1.ebuild 586 BLAKE2B 17fd08ac0d033c247d616c6489a68fbe6886cff0cfed2ebc48971023dc4553ce4ae447520e9d45507b9c5689ebadbe97ac495135c0893535937d13056b4eab3f SHA512 e60cf7643db00587579f89bd9694231d4840ca4c2f00c52c30617f28dbcee21b341540dfac938130d687fef6c2e4726061989646c59d2b2a675f475f329395a1
+EBUILD rngstreams-1.0.1.ebuild 794 BLAKE2B 0c2c031df94a8216536196d5a1f1b7b176859782818cbf3633faa3f7cfd5d8ab04a5f68283f3c7267f0bab046f667652eb03c2611c19d7451716fec1f850bae8 SHA512 b99c3a9b98c80f949d848debfdfd42c0f892bcc9a0997b18b0901ef7cffee929f0996c5b0c96fee71688678283b9b7493536766ffce90e67a4fd82e1aff0d3a6
 MISC metadata.xml 601 BLAKE2B 5ab0eb6e81c32b128237ba780e3b8170557ca55b170abe6bace9d7f6ea7ad9dd7df0f23e4ad45ac84a2ca899c5e62f1b6c0b89ed171667ddc0938e9b3e4a1825 SHA512 866f6fa26bcdf67b429ea2268f6f7b7101f04ff2666603984b9bdb0551a794925877eee42846826edd2045502c7111cb85e9dc9abde149572d9aac14b6df13d6
diff --git a/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild b/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
index 2ea39b2a42f1..cf74c8bf763f 100644
--- a/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
+++ b/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
@@ -1,24 +1,36 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools-utils
+inherit out-of-source
 
 DESCRIPTION="Multiple independent streams of pseudo-random numbers"
 HOMEPAGE="http://statmath.wu.ac.at/software/RngStreams/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://statmath.wu.ac.at/software/RngStreams/${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT=0
+SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
+
+my_src_configure() {
+	econf --enable-shared --disable-static
+}
+
+my_src_install_all() {
+	if use doc; then
+		HTML_DOCS=( doc/rngstreams.html/. )
+		dodoc doc/${PN}.pdf
+	fi
+	einstalldocs
 
-src_install() {
-	autotools-utils_src_install
-	use doc && dohtml -r doc/rngstreams.html/* && dodoc doc/${PN}.pdf
 	if use examples; then
-		rm examples/Makefile*
+		rm examples/Makefile* || die
 		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 95ca00b41ff9..c8d7b950219c 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -33,16 +33,11 @@ DIST gwt-2.8.1.zip 95650299 BLAKE2B 3853d50d1346e313903b6f0c4b8405ce9e896e516524
 DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 282fe33dc5ba366ceea05a222ae2d018bc3ad8f35fad73c585a3d4901c3287e6902277a9c7ca087854f3944bd85ff1b1d1f02869ece686b10f946e2f1cb1296c SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6
 DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a83764b0c988b3ba571877c986b0d5d237059ed6643a86bb404428857ec8c346bfecd12f7cd15cde301cb0ce331f842b7f SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852
 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade
-DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2
-DIST rstudio-1.1.453.tar.gz 20200360 BLAKE2B 560b89e53b04356ecf9a02dd8a7e72ad8d6c30bf406fbe7e22a82cc6d33d40e84bececf5ecda9cf086360b2bd2fa64d6b33c2dd675ef5f605f9e825d7ca2dc84 SHA512 f2be0866f645007a6f80959109928820c89480057c3660d23e790591797d4f4c371733f49290dae9c81bfc2715821528e2a105e7a66d4d9ffbfc7ee2a596976c
 DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B 97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17 SHA512 987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b
 DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c SHA512 90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde
 DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779
 DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
 DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c
-EBUILD rstudio-1.1.383-r1.ebuild 8338 BLAKE2B 8e31b308cd394d0e38f9cb861dd88b0259dc14655f6833cf39df717a00dfc7837f9c37715808d1a8ceefdfe74381956d6101121bef66f69cd7898e8b0edca35b SHA512 69d88552c40c0050d3e818c430682dbb50cda2b78acd081e6f211674cdff142211c8c809d5eca63eeacfa3f3d62a146f1b846a59138a52e9d8086830f62b4be1
-EBUILD rstudio-1.1.453.ebuild 8504 BLAKE2B 2932ca066ac46b127a02f34e43e2bc09f85a56b1c497e7f58230b012229900f64deb6a51c980fe71c33d7932f819529b80967e44c9c5d9fd53662b11b67b2c38 SHA512 1b86f33053e63de45d9b5f90a3f1fba7337dcabceb0410e72bdd6dde45b962a3ef3ed15149e5c89fe1ed386d600b19995ea23d07774f6319d510ba5a7d1f2fed
-EBUILD rstudio-1.1.463-r1.ebuild 8693 BLAKE2B 12234dd1c9093bfe4d09cc1f53fd051791372399c8bb84a6fc2f2f8e35739ccf1abb4ee40d977f9020842aed29a6bf2ae404fd48778261163f4313a85b8bcad9 SHA512 fc7cc0a2eea34b020ea9b6abc577bf4d86f2b1cf65564f1d4544cfea64875d7ceaface2a12bf6d995d0465dbabc8ccebc8c901a7a429b69e9814f4ceb68e6772
-EBUILD rstudio-1.1.463.ebuild 8716 BLAKE2B eb7f45aad1543f845788c251b65842b46963412d11e65e483fc613936337bb6f4c86bee4ea8807d4736527d56258c87930d0ab94e50750a86589c28267779d97 SHA512 6a350230f7930430a54f4d39ba7e5e89273775b4dec7a8a27068a04243481c672473ab66eba7febd135626b6bb27c347f2f4a36f027d3844058275082757bdbd
-EBUILD rstudio-1.2.1335.ebuild 8641 BLAKE2B fc0440ac6b289b32885898c2d17fa2292c43d918ac6a2706046bba93e3f90f90d37a10ee6b152f80e50bdfca4538a7b861ce1888254626068eb362ad4c84c0ab SHA512 3fddbf958ea7d1a020941731fb6069b8bedbf02113a336738039df97c5679fbb857892a53f9f76470bf60144c185a334ee8d72f62207664c2b467f4b3ebbdaf2
+EBUILD rstudio-1.1.463-r1.ebuild 8679 BLAKE2B 2341733acb0bad21b48da77842bfff75f9b18860ec039282662609b312788d8d1dfd8ce7dd5b13ede6030167eb399554a68dced9dcbce4aa6c7e31f758cf9c30 SHA512 5003e147cf81e9e65aba48c8143623e3d0f5f2e1ae75fe8ac6300261962c93ba2132b2a41c961ae6cbaf5fb0e1ae5262e27702e3d2c6bd6d6cfd52f54a329ea7
+EBUILD rstudio-1.2.1335.ebuild 8630 BLAKE2B 5fb25a1c374b336a44ad91652fda367abeec3f5e9da0eb682eb2224ea81a0ac24bc8d801f0e0733118cb1f872d61507951778c3c16d7b1ea74abade932a0e542 SHA512 3f409a721d2f20e4c558bd6b2b40e6c06293162a5c92f06509cef13e356f2279554807a755bfd28cff0ab11b170f3fb53aa88b10a3984e92f9a2d8b9d0655ac9
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
deleted file mode 100644
index 9dc32b4769c4..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
-
-# TODO
-# * package gin and gwt
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
-GWT_VER=2.7.0
-GIN_VER=1.5
-SELENIUM_VER=2.37.0
-CHROMEDRIVER_VER=2.7
-# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
-PANDOC_VER=1.13.1
-# ls dependencies/common/*.tar.gz
-PACKRAT_VER=0.98.1000
-RMARKDOWN_VER=0.98.1000
-SHINYAPPS_VER=0.98.1000
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
-
-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-buildtools/gin-${GIN_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
-	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated server"
-
-QT_VER=5.4
-QT_SLOT=5
-RDEPEND="
-	app-text/pandoc
-	dev-haskell/pandoc-citeproc
-	>=dev-lang/R-2.11.1
-	<dev-libs/boost-1.70:=
-	>=dev-libs/mathjax-2.7.0
-	dev-libs/openssl:0=
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	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/qtwebkit-${QT_VER}:${QT_SLOT}
-		>=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 )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	>=virtual/jdk-1.8:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-1.0.44-paths.patch"
-		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
-		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
-		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
-		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
-	cd "${S}" || die
-	mkdir -p src/gwt/lib/{gin,gwt} \
-		dependencies/common/dictionaries \
-		src/gwt/lib/selenium/${SELENIUM_VER} \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
-	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
-	unzip -qd src/gwt/lib/gin/${GIN_VER} \
-		"${DISTDIR}"/gin-${GIN_VER}.zip || die
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
-		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
-	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
-		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
-	cp "${DISTDIR}"/chromedriver-linux \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
-	cd dependencies/common || die
-	unpack packrat-${PACKRAT_VER}.tar.gz
-	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
-	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
-	unpack rsconnect_${RSCONNECT_VER}.tar.gz
-	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
-		. || 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
-
-	# 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 v0.99.903
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
-		-i "${S}"/CMakeLists.txt \
-		"${S}"/CMakeGlobals.txt \
-		|| die
-}
-
-src_configure() {
-	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
-	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
-	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
-
-	local mycmakeargs=(
-		-DDISTRO_SHARE=share/${PN}
-		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		)
-
-	cmake-utils_src_configure
-}
-
-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
-	pax-mark m "${ED}usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}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() {
-	use dedicated || gnome2_icon_savelist
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		gnome2_icon_cache_update ;}
-
-	if use dedicated || use server; then
-		enewgroup rstudio-server
-		enewuser rstudio-server -1 -1 -1 rstudio-server
-	fi
-}
-
-pkg_postrm() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		gnome2_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
deleted file mode 100644
index 9c47ef9b01c2..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
-
-# TODO
-# * package gin and gwt
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
-GWT_VER=2.7.0
-GIN_VER=1.5
-SELENIUM_VER=2.37.0
-CHROMEDRIVER_VER=2.7
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-PANDOC_VER=1.19.2.1
-# ls dependencies/common/*.tar.gz
-PACKRAT_VER=0.98.1000
-RMARKDOWN_VER=0.98.1000
-SHINYAPPS_VER=0.98.1000
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
-
-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-buildtools/gin-${GIN_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
-	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-QT_VER=5.4
-QT_SLOT=5
-RDEPEND="
-	>=app-text/pandoc-${PANDOC_VER}
-	dev-haskell/pandoc-citeproc
-	>=dev-lang/R-2.11.1
-	<dev-libs/boost-1.70:=
-	>=dev-libs/mathjax-2.7.4
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	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/qtwebkit-${QT_VER}:${QT_SLOT}
-		>=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 )
-	!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}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-1.0.44-paths.patch"
-		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
-		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
-		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
-		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
-		"${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch"
-		"${FILESDIR}/${PN}-1.1.453-core.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
-	cd "${S}" || die
-	mkdir -p src/gwt/lib/{gin,gwt} \
-		dependencies/common/dictionaries \
-		src/gwt/lib/selenium/${SELENIUM_VER} \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
-	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
-	unzip -qd src/gwt/lib/gin/${GIN_VER} \
-		"${DISTDIR}"/gin-${GIN_VER}.zip || die
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
-		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
-	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
-		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
-	cp "${DISTDIR}"/chromedriver-linux \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
-	cd dependencies/common || die
-	unpack packrat-${PACKRAT_VER}.tar.gz
-	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
-	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
-	unpack rsconnect_${RSCONNECT_VER}.tar.gz
-	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
-		. || 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
-
-	# 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
-}
-
-src_configure() {
-	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
-	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
-	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
-
-	local mycmakeargs=(
-		-DDISTRO_SHARE=share/${PN}
-		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		)
-
-	cmake-utils_src_configure
-}
-
-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
-	pax-mark m "${ED}usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}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() {
-	use dedicated || gnome2_icon_savelist
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		gnome2_icon_cache_update ;}
-
-	if use dedicated || use server; then
-		enewgroup rstudio-server
-		enewuser rstudio-server -1 -1 -1 rstudio-server
-	fi
-}
-
-pkg_postrm() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		gnome2_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
index c26f7f5c3001..09f22605f334 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
@@ -225,7 +225,7 @@ src_install() {
 	dodir /etc/rstudio
 	insinto /etc/rstudio
 	doins "${FILESDIR}"/rsession.conf
-	dosym "${EROOT}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.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
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
deleted file mode 100644
index 74ba9b3fb3b2..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
-
-# TODO
-# * package gin and gwt
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
-GWT_VER=2.7.0
-GIN_VER=1.5
-SELENIUM_VER=2.37.0
-CHROMEDRIVER_VER=2.7
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-PANDOC_VER=1.19.2.1
-# ls dependencies/common/*.tar.gz
-PACKRAT_VER=0.98.1000
-RMARKDOWN_VER=0.98.1000
-SHINYAPPS_VER=0.98.1000
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
-
-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-buildtools/gin-${GIN_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
-	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-QT_VER=5.4
-QT_SLOT=5
-RDEPEND="
-	>=app-text/pandoc-${PANDOC_VER}
-	dev-haskell/pandoc-citeproc
-	>=dev-lang/R-2.11.1
-	<dev-libs/boost-1.70:=
-	>=dev-libs/mathjax-2.7.4
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	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/qtwebkit-${QT_VER}:${QT_SLOT}
-		>=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 )
-	!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}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-1.0.44-paths.patch"
-		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
-		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
-		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
-		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
-		"${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch"
-		"${FILESDIR}/${PN}-1.1.453-core.patch"
-		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch"
-		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch"
-		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch"
-		"${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
-	cd "${S}" || die
-	mkdir -p src/gwt/lib/{gin,gwt} \
-		dependencies/common/dictionaries \
-		src/gwt/lib/selenium/${SELENIUM_VER} \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
-	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
-	unzip -qd src/gwt/lib/gin/${GIN_VER} \
-		"${DISTDIR}"/gin-${GIN_VER}.zip || die
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
-		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
-	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
-		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
-	cp "${DISTDIR}"/chromedriver-linux \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
-	cd dependencies/common || die
-	unpack packrat-${PACKRAT_VER}.tar.gz
-	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
-	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
-	unpack rsconnect_${RSCONNECT_VER}.tar.gz
-	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
-		. || 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
-
-	# 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
-}
-
-src_configure() {
-	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
-	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
-	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
-
-	local mycmakeargs=(
-		-DDISTRO_SHARE=share/${PN}
-		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		)
-
-	cmake-utils_src_configure
-}
-
-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
-	pax-mark m "${ED}usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}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() {
-	use dedicated || gnome2_icon_savelist
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		gnome2_icon_cache_update ;}
-
-	if use dedicated || use server; then
-		enewgroup rstudio-server
-		enewuser rstudio-server -1 -1 -1 rstudio-server
-	fi
-}
-
-pkg_postrm() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		gnome2_icon_cache_update ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 2e857a99a3a5..9d0dfd64d7d1 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -223,7 +223,7 @@ src_install() {
 	dodir /etc/rstudio
 	insinto /etc/rstudio
 	doins "${FILESDIR}"/rsession.conf
-	dosym "${ED}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.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
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index f11cab2f5b13..400a8056bca1 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,23 +1,12 @@
 AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91d1a359e058fc654c6778456174d6cee9242f7fcaf81bf1464f47f43604b9e4eb298f051c6a4daba4630ca SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431
-AUX singular-3.0.4.4-nostrip.patch 453 BLAKE2B 63a75031410aaa40ef271c249cc20b515bf86ce6873acea630aff9586a423964e93d77217fef819ae2058a69bac417f58fab306fb22d8e2b2d3f223b84d9b588 SHA512 2fd31198c7c4e752976539a7ddc3b03bb4030efc52e66e5a2d34ce438af558d9d8b45aa088da6cf4eb1edf7f7239994f6eea040d0a8eb0c2c854b6275e7dde5f
-AUX singular-3.1.0-emacs-22.patch 637 BLAKE2B 0cf175eca1fac56d8fcf6fec49a7116381d57fdbdd6a8cc3b874fb9d3c90cf3a49fd4d583141685739377e27d4f91f0957c2a25772d95d76fa43d436ed057737 SHA512 19ef6b9252c42f468099b15911251c4b162ca552d86bcb1c90bb86a591b79e1c1d21463e21b14944820761df32d952e03276804a9125580179218b78226bbbdc
-AUX singular-3.1.0-gentoo.patch 4563 BLAKE2B 8617fe729dc5893a3d00eeafba9d56eeb678d119ba14ae538da6bacf25a789494d5f8a62608b0fb1acaf7f00e1f18ff2b89109e0626708b2c1572dc069210bf2 SHA512 f503ccc1a2501e7a990715e2403989dbc4ec33fd6e4f043379db4b4eb22d18df27acc750271c556dacff2b74a7b5154feb92f3fab2c66de6e464635ff86e86ff
-AUX singular-3.1.3.2-python.patch 1136 BLAKE2B 6951a3ba39fa2d69f69bf86bfedc99dc0220803209469b79abd8748c71555eaa9ca457c5ba6086b4e62ff2f19d160a0e74457255aeb6ceac7db9779fa523417d SHA512 76398bb6f679cba84b71fe7a5ecef6815cf314c87e15286726e4fa079dbefa65cfffd6934695ffe2cc18b6cefea75d960962908a24bfbf9cacbc3e3f74395370
-AUX singular-3.1.3.3-Minor.h.patch 234 BLAKE2B e0d9e6cc2ac6ef37492be18c65185e4e07ac0ab75ea67910fab8c3f64e7e9f377187e87a876e23f4dd49b935e39e5d5aa879a2849bd0587a4f0b7c6544da93ca SHA512 8748e8c76cb6b33f3d43b604c3dc713e033c7636367d9f3086beaf52428cc3e2cd1244d831d2e94cf29530ad0118c9148ffc1e5364df8680d069d0e3d00592d7
-AUX singular-3.1.3.3-install_name.patch 862 BLAKE2B 912b9ea4ef92929694398ce9ba4876601ca49d08ba3fe30790610931c8fba9580c52c1a659f3a90a026caa0e82137a94371dba08842455ab14298d83be274cee SHA512 9f641503a62f8de151e9774003b9b52634f27ad8b4355bb72b49239acf4086fc066a7688f1ba2df7a42b05aaf8c89c9fff6100706d7bf71043d931a049804497
-AUX singular-3.1.6-factory_template_instantiation.patch 900 BLAKE2B 9cf2772260c74cca3b55b93d5e417f6331fa024517290f0d95b49f8e81685101adb73557a80cf497a9c275563134a91ff89d7931cdf4663db6e2075da171d6ab SHA512 0a0d7a271fddf543de6d8d987322e4062997a6283ccbb90f55c8d70ed39a2e58a0d68e881c0d260ad9f4ceaf60352bcd78a48b6f707a7719369c0b4cbe47542f
-AUX singular-3.1.6-ntl6compat.patch 1401 BLAKE2B 8faa3f5367fa1ac5333a53345bc4d646862ebe38286f51dea327aa403319251f4d7bf6d13590a465730b5c4f481f65d1434aaea4c7679de1d025b4dc5459ed47 SHA512 5d6c4ec73b81cebcd8d24dc75efedb2f3da656fc5103701f25f7bba40355e995f116acddb7bb711b8832a89ec55a1b7fbbc7dd9215822f786e7a6012905b66be
 AUX singular-4.0.0-fix-omalloc-ar-detection.patch 484 BLAKE2B 801f773c434ad35a18f80be4453a70540438054fca6fe7e8ba58520d8e17c47da51669d951989c161049d451d111a57d2e6f365ef4ee523829e056fdc2c4c72f SHA512 4f74b1d436c17efa3872a6b24e56c691220813a3cc2debeb19caa5dd6bf0e3c39af32e43e3d7afb5af40f985ec56377128185b9138dfcf77a04618ba444ea619
 AUX singular-4.0.2-ntl8-compat.patch 1149 BLAKE2B ed7ca37745eb37dd6493dfc4b531c3b9dc7390bc246a5ac08480ab188746883f3320031b14f9fe542c5889a56fa6c5c93a4b3f23e581cfb11cc308caa4dfa868 SHA512 178f0130cd6a606d6c93f5cc42dfe92782a16cc6b3d0e2695ce16d2115f70e502f702e8e72fd5d3b61b1bb5b3f4038a4fbf6277418b3f0bf89cae7939d5ed606
 AUX singular-4.0.3-fix-destdir.patch 992 BLAKE2B ffde08cf18fe22214acee27877090d7a7e3f458fac2f6f928cc822995c77579e705acb87b3bac4a9f84806bb3ce84eacfe7b51db3b51c94121c92b5335e207bb SHA512 6b0496d1901c51da66d75fde1b980333df8b1e03572f49ecd56f3f3c67d3af1b08527c7b764aa3b62b0296b97aaaa861d257a97a4370b3600b2cd7ffb9580936
 AUX singular-4.0.3-fix-resources-name.patch 10175 BLAKE2B 54b576ab1d5db6a1d2aca507472e3eba0a4c02507c82de7dfd1d6ad069c5225c8c2957c9258f57f686b5fa845427d95cbb350bf4bb151ee13e5b4eaa8e900c17 SHA512 29c43d97598c647ac2754ed897411638f0141b60de590a53fc3f476cd1d627b270ecab29e16923b00757d8218d680c6b837070fa6899e4c770243bf71e86a09f
-DIST Singular-3-1-6-share.tar.gz 10620177 BLAKE2B 407f7936617d71e10779ae20548091a84be309a25c32e76b3a8277483ab288a8c6d47b7a8ba6c56dc6bba4f0b4395db3b997adbde5890189317fe1faaa7362ce SHA512 54bff29c5d64609583ec8b1c43005a1ff453c8f2cedfe9a26ac840888e9d306e3104e14aea5a3cc923fac916215c4285ecfe5ae7e1242aee0308b5e4c6e2d48d
-DIST Singular-3-1-6.tar.gz 25535111 BLAKE2B 915f25c00be5fc04056bba12b5f62b09d41d7367a8fecc732b7cbbf68a0536b998bf0d2b69cf4c6f4d0f8eed60132c225dced762b3f2b17ea326bfe4fb6d17ff SHA512 103a10dd474d93cceb678bcef1a4aae5ec693cb9e68c9d63a7536929b738a0127501ee145a79cc3b9ddfa4bd1ca0f05e640eeb3b0fbdb60de4f56aa5beacc213
 DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 357a68f68cc0508e4e197427c56232da60412a8380045ac594cbe313bf6a403068d1724f637d47de44e66baf34c74fa5c4ee622721c5bbd67764e65e66c8583a SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25
 DIST singular-4.0.2.tar.gz 8635172 BLAKE2B 5f565bf14677d8414300d7a5602aa96c8cef7e863fd858083fe4561742b545d74a5fc4de95ef0c63acf4f78c66405bac7ba77a954e42b2e87a6da608e4732bcd SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d
 DIST singular-4.0.3-share.tar.gz 6633256 BLAKE2B c137b72aaa0926eb006624e03fe938678acb94a41da525de1ca4f7711985d253926788b550d2d98b8def15fb0cb60b2527c1c04566a29a28135fcb1a70246025 SHA512 5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a
 DIST singular-4.0.3.tar.gz 12615042 BLAKE2B b3c63434974bb8b5fdef86cbcbe73b76a47503b28dcae6bfc6e4210e1ab1c14224ac0f6eeefa9d8004450f6d9a26843368a9b2ea16bca68bf1215ce33e83df0d SHA512 781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab
-EBUILD singular-3.1.6.ebuild 4724 BLAKE2B 047b1af903467103abba488ba0f6effa6c6f59b7f541e643ada481164e741e4e6a77fece0b791f0b086acfac329a433dc9b27c158a2f9cb5ecfc1265f901197a SHA512 eb18e7a69b110d71b02a7f1d239c9b9b281f535463105c28687eae1e49d303843e0e71f573bbdfbe051f3efb675f7128f0c9e253f1a43dd3fc9d6c9b91acae6e
-EBUILD singular-4.0.2.ebuild 3979 BLAKE2B b2f34c4afaa7335dc3ba14b95f611948303bd299cde00ce287f108d7c1167edfed60b45f4f5861485b6b56f1aa1c769b241fb76589199546bfa0c19e225425ca SHA512 41450e6f7da47c2505c9e889487c52b35701cba8394ad2dfa0cbfbbe55dbeb9d72685ee1d0a584488c3022b75e34f9c5b0ed6d26612a8d31499f02abec1176fd
-EBUILD singular-4.0.3.ebuild 2625 BLAKE2B 7a4e85030fcd92e19e804d2e0dd780db7ae85730a7b15097d4334656fff0e6e1272d78c638de35a645eabddd5ad326b69b943aee034bb3041e25b0c753673c4c SHA512 077b88bbbd4b72247979196cbe32410f9c8012591f12a3df689838da4ac9515664e3fd45c66f31a4444c637ecd7eda829a722027966a2271edc057edf8dc83bd
+EBUILD singular-4.0.2.ebuild 3685 BLAKE2B 434a1dbac875bb0cfdf4dc3df105529fb5cfcc74e2bc0cff2c2047f8ee68660aca8bf073e8a386c8d5447b04decbcaf8efc4d494e14e4915b2bd07f53325eefc SHA512 c29ac1e417f559ca1f81d3f0c8b0f887c40be8f8060a97aaba32c2583ab8117948a66cb329dab08adbd536465c736f61a5222517169f26122ac4042b7523d91d
+EBUILD singular-4.0.3.ebuild 2603 BLAKE2B c6d59b1c2d7d6885a390d09cd08abac12d6b3ce3ea099fd902656cfb86269b8d6d213bca3a917124c6cae929646605f5e0f105a41cfe70310f557f690d181518 SHA512 91cbb0906f0a3f99da2ffeb8c053c3b2a45ce4c33545dc3be54e1774e34852f7670b5702f165387d9b9f0884ca442292f46b80c6650321f504728f162ca040cf
 MISC metadata.xml 389 BLAKE2B dcba16dd34ab572d58d76ea55f528ee1a4bb4c0c37ca272c9a11afdb8117f6982e5109a4a4783d1efc6cb31fe273f07bf79f720f178fea635af29574007c93f9 SHA512 3c5aea925276639c81a03a2a8d05ecaa48edac510f144d92e173402721dbc253638341ac8afdfbc17098ac35d2f4f47b41e5d56427c8ecaa788dc28fbb0977ae
diff --git a/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
deleted file mode 100644
index 5884b6cd2d60..000000000000
--- a/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Singular-3-0-4/IntegerProgramming/Makefile.in Singular-3-0-4.new/IntegerProgramming/Makefile.in
---- Singular-3-0-4/IntegerProgramming/Makefile.in	2008-07-09 07:55:13.000000000 -0400
-+++ Singular-3-0-4.new/IntegerProgramming/Makefile.in	2008-10-19 22:40:41.000000000 -0400
-@@ -21,7 +21,7 @@
- endif
- 
- INSTALL		= @INSTALL@
--INSTALL_PROGRAM	= @INSTALL_PROGRAM@  -s
-+INSTALL_PROGRAM	= @INSTALL_PROGRAM@ 
- MKINSTALLDIRS   = ../mkinstalldirs
- 
- ##
diff --git a/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch b/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch
deleted file mode 100644
index 3f4f3c76203c..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur Singular-3-1-0/emacs/singular.el Singular-3-1-0.new/emacs/singular.el
---- Singular-3-1-0/emacs/singular.el	2008-11-03 09:16:38.000000000 -0500
-+++ Singular-3-1-0.new/emacs/singular.el	2009-08-20 22:16:57.000000000 -0400
-@@ -865,7 +865,8 @@
-   (add-hook 'singular-post-output-filter-functions 'singular-prompt-remove-filter nil t)
- 
-   ;; some relict from Comint mode
--  (setq comint-prompt-regexp singular-comint-prompt-regexp))
-+  (setq comint-prompt-regexp singular-comint-prompt-regexp)
-+  (setq comint-use-prompt-regexp-instead-of-fields 1))
-   ;; required to use prompt-regexp
-   (setq comint-use-prompt-regexp t)
- ;;}}}
diff --git a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
deleted file mode 100644
index ebb402289386..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- kernel/feResource.cc.orig	2010-04-30 10:20:14.000000000 +0000
-+++ kernel/feResource.cc	2010-10-11 09:19:01.431179334 +0000
-@@ -41,7 +41,7 @@
- #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
- #endif
- #else // ! defined(MAKE_DISTRIBUTION)
--#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
-+#define SINGULAR_DEFAULT_DIR "@GENTOO_PORTAGE_EPREFIX@/usr"
- #endif // defined(MAKE_DISTRIBUTION)
- 
- /*****************************************************************
-@@ -73,33 +73,31 @@
- {
-   {"SearchPath",    's', feResPath,  NULL,
-    "$SINGULARPATH;"
--   "%b/LIB;"
--   "%b/MOD;"
-+   "%r/share/singular/MOD;"
-    "%r/LIB;"
--   "%r/../LIB;"
-+   "%r/share/singular/LIB;"
-    "%d/LIB;"
--   "%d/../LIB"
-    ""},
--  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",(char *)""},
--  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME,           (char *)""},
--  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
-+  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/bin/Singular",(char *)""},
-+  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/bin",           (char *)""},
-+  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%d",                (char *)""},
-   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
--  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", (char *)""},
--  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  (char *)""},
--  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/html",              (char *)""},
-+  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/share/info/singular.info.bz2", (char *)""},
-+  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/share/singular/singular.idx",  (char *)""},
-+  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/share/doc/PFSUBST/html",              (char *)""},
- #ifdef ix86_Win
-   {"HtmlHelpFile",'C',  feResFile,  "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",    (char *)""},
- #endif
-   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"S_VERSION1,    (char *)""},
--  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
-+  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples",          (char *)""},
-   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
- 
- #ifdef ESINGULAR
-   {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs",             (char *)""},
-   {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs",            (char *)""},
-   {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
--  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
--  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/emacs",             (char *)""},
-+  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%r/share/emacs/site-lisp/singular/.emacs-singular",   (char *)""},
-+  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/share/emacs/site-lisp/singular",             (char *)""},
- #elif defined(TSINGULAR)
-   {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
- #ifdef ix86_Win
-@@ -108,7 +106,7 @@
-   {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             (char *)""},
- #endif
- #else
--  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             (char *)""},
-+  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/share/emacs/site-lisp/singular",             (char *)""},
- #endif
-   {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
- };
---- kernel/mod_raw.cc.orig	2009-11-02 10:12:22.000000000 +0000
-+++ kernel/mod_raw.cc	2010-10-11 09:19:01.432179264 +0000
-@@ -109,11 +109,11 @@
- void* dynl_open_binary_warn(const char* binary_name, const char* msg)
- {
-   void* handle = NULL;
--  const char* bin_dir = feGetResource('b');
-+  const char* bin_dir = feGetResource('r');
-   if (bin_dir != NULL)
-   {
-     char path_name[MAXPATHLEN];
--    sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name,
-+    sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name,
-             DL_TAIL);
-     handle = dynl_open(path_name);
-     if (handle == NULL && ! warn_handle)
diff --git a/sci-mathematics/singular/files/singular-3.1.3.2-python.patch b/sci-mathematics/singular/files/singular-3.1.3.2-python.patch
deleted file mode 100644
index 2cc29c9a553b..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.3.2-python.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- Singular/pyobject.cc.orig	2011-01-31 15:03:16.000000000 +0100
-+++ Singular/pyobject.cc	2011-08-24 17:22:57.000000000 +0200
-@@ -14,7 +14,7 @@
- 
- 
- 
--
-+#include <Python.h>
- 
- #include <Singular/mod2.h>
- 
-@@ -27,7 +27,7 @@
- 
- #include <Singular/lists.h>
- 
--#include <Python.h>
-+
- #include <iterator>             // std::distance
- #include <stdio.h>
- 
-@@ -592,11 +592,12 @@
-   long len = newElts.size();
-   for (long idx = 0; idx < len; ++idx)
-   {
--    char* name = newElts[idx][0].str();
-+    PythonObject current (newElts[idx]);
-+    char* name = current.operator[](0).str();
-     if (name && (*name != '\0') && (*name != '_'))
-     {
-       Py_XDECREF(get_current_definition(name));
--      newElts[idx][1].import_as(name);
-+      newElts[idx].operator[](1).import_as(name);
-     }
- 
-   }
---- Singular/pyobject_setup.cc.orig	2011-02-10 19:15:30.000000000 +0100
-+++ Singular/pyobject_setup.cc		2011-08-24 17:23:55.000000000 +0200
-@@ -12,6 +12,7 @@
- **/
- //*****************************************************************************
- 
-+#include <Python.h>
- #include <Singular/mod2.h>
- #include <kernel/febase.h>
- #include "static.h"
diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch b/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch
deleted file mode 100644
index 1d03e61ae308..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Singular/Minor.h	2010-02-02 08:22:24.000000000 -0500
-+++ patches/Minor.h	2011-06-28 13:26:01.000000000 -0400
-@@ -2,6 +2,7 @@
- #define MINOR_H
- 
- #include <assert.h>
-+#include <time.h>
- #include <iostream>
- #include <string>
- 
diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch b/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch
deleted file mode 100644
index 6a7826c390f6..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- kernel/Makefile.in.orig	2011-10-13 23:36:54.000000000 +0200
-+++ kernel/Makefile.in	2011-10-13 23:37:46.000000000 +0200
-@@ -267,7 +267,7 @@
- 	-rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
- 
- p_Procs_%.so: p_Procs_Lib_%.dl_o
--	$(LD) ${SLDFLAGS} -o $@ $^
-+	$(LD) ${SLDFLAGS} -install_name @GENTOO_PORTAGE_EPREFIX@/usr/lib/singular/$@ -o $@ $^
- 
- ##
- ## install targets
-
---- Singular/Makefile.in.orig	2011-10-14 23:59:07.000000000 +0200
-+++ Singular/Makefile.in	2011-10-14 23:58:34.000000000 +0200
-@@ -492,7 +492,7 @@
- 	$(LD) ${SLDFLAGS} -o $@ $^ -L${libdir} ${MP_LIBS} ${GLIBC_DYN_FIX}
- 
- dbmsr.so: $(DBMSR_SOURCES:.cc=.dl_o)
--	$(LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
-+	$(LD) ${SLDFLAGS} -install_name @GENTOO_PORTAGE_EPREFIX@/usr/lib/singular/$@ -o $@ $^ ${GLIBC_DYN_FIX}
- 
- # dynamic module for python bject support
- pyobject.${MODULE_SUFFIX}: pyobject.dl_o
diff --git a/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch b/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch
deleted file mode 100644
index edf764a758eb..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libfac/factor/tmpl_inst.cc b/libfac/factor/tmpl_inst.cc
-index bda287a..2f5ba49 100644
-Index: libfac/factor/tmpl_inst.cc
-===================================================================
---- a/libfac/factor/tmpl_inst.cc
-+++ b/libfac/factor/tmpl_inst.cc
-@@ -3,7 +3,7 @@
- ////////////////////////////////////////////////////////////
- 
- 
--//#include <templates/ftmpl_array.cc>
-+#include <factory/templates/ftmpl_array.cc>
- //#include <templates/ftmpl_factor.cc>
- #include <templates/ftmpl_list.h>
- #include <factory/templates/ftmpl_list.cc>
-@@ -75,8 +75,8 @@ template OSTREAM & operator << ( OSTREAM &, const List<Variable> & );
- template OSTREAM & operator << ( OSTREAM &, const Array<int> & );
- #endif
- 
--template class Array<int>;
--template class Array<Variable>;
-+//template class Array<int>;
-+//template class Array<Variable>;
- //template class Array<REvaluation>;
- 
- // for database
diff --git a/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch b/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch
deleted file mode 100644
index b0330ccdfc86..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
-index 0fa6109..553afa5 100644
-Index: Singular/claptmpl.cc
-===================================================================
---- a/Singular/claptmpl.cc
-+++ b/Singular/claptmpl.cc
-@@ -123,3 +123,37 @@ template class std::list<PolyMinorValue>;
- template class Cache<MinorKey, IntMinorValue>;
- template class Cache<MinorKey, PolyMinorValue>;
- 
-+#ifdef HAVE_NTL
-+#include<NTL/version.h>
-+#if NTL_MAJOR_VERSION == 6
-+
-+#include<NTL/tools.h>
-+#include<NTL/lzz_pE.h>
-+#include<NTL/lzz_pEX.h>
-+#include<NTL/lzz_p.h>
-+#include<NTL/vector.h>
-+#include<NTL/pair.h>
-+#include<NTL/GF2X.h>
-+#include<NTL/GF2EX.h>
-+#include<NTL/ZZ.h>
-+#include<NTL/ZZX.h>
-+#include<NTL/ZZ_pX.h>
-+#ifdef NTL_CLIENT               // in <NTL/tools.h>: using of name space NTL
-+NTL_CLIENT
-+#endif
-+template class Vec<zz_p>;
-+template class Vec<zz_pE>;
-+template class Mat<zz_p>;
-+template class Mat<zz_pE>;
-+template class Mat<ZZ>;
-+template class Vec<Pair<zz_pEX, long> >;
-+template class Vec<Pair<GF2EX, long> >;
-+template class Vec<Pair<ZZX, long> >;
-+template class Vec<Pair<ZZ_pX, long> >;
-+template class Vec<Pair<GF2X, long> >;
-+template void swap<zz_pE>(Vec<zz_pE>&, Vec<zz_pE>&);
-+template long operator==<zz_p>(Vec<zz_p> const&, Vec<zz_p> const&);
-+template Vec<Pair<zz_pX, long> >& Vec<Pair<zz_pX, long> >::operator=(const Vec<Pair<zz_pX, long> >&);
-+#endif
-+
-+#endif
diff --git a/sci-mathematics/singular/singular-3.1.6.ebuild b/sci-mathematics/singular/singular-3.1.6.ebuild
deleted file mode 100644
index 1aaa72907608..000000000000
--- a/sci-mathematics/singular/singular-3.1.6.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils elisp-common flag-o-matic multilib prefix python-single-r1 versionator
-
-MY_PN=Singular
-MY_PV=$(replace_all_version_separators -)
-MY_DIR=$(get_version_component_range 1-3 ${MY_PV})
-# Note: Upstream's share tarball may not get updated on every release
-MY_SHARE_DIR="3-1-6"
-MY_PV_SHARE="${MY_PV}"
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-
-SRC_COM="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/"
-SRC_URI="${SRC_COM}${MY_DIR}/${MY_PN}-${MY_PV}.tar.gz
-		 ${SRC_COM}${MY_SHARE_DIR}/${MY_PN}-${MY_PV_SHARE}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="boost doc emacs examples python readline test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/ntl:0=
-	emacs? ( >=virtual/emacs-22 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	boost? ( dev-libs/boost:0= )"
-
-# Upstream does not care about tests
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${MY_DIR}"
-
-pkg_setup() {
-	append-flags -fPIC
-	append-ldflags -fPIC
-	tc-export CC CPP CXX
-	use emacs && elisp-need-emacs 22
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare () {
-	epatch \
-		"${FILESDIR}"/${PN}-3.1.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-3.1.0-emacs-22.patch \
-		"${FILESDIR}"/${PN}-3.0.4.4-nostrip.patch \
-		"${FILESDIR}"/${PN}-3.1.3.3-Minor.h.patch \
-		"${FILESDIR}"/${PN}-3.1.6-ntl6compat.patch \
-		"${FILESDIR}"/${PN}-3.1.6-factory_template_instantiation.patch
-	use python && epatch "${FILESDIR}"/${PN}-3.1.3.2-python.patch
-
-	if  [[ ${CHOST} == *-darwin* ]] ; then
-		epatch "${FILESDIR}"/${PN}-3.1.3.3-install_name.patch
-		eprefixify kernel/Makefile.in
-		eprefixify Singular/Makefile.in
-	fi
-
-	eprefixify kernel/feResource.cc
-
-	# The SLDFLAGS mangling prevents passing raw LDLAGS to gcc (see e.g. bug 414709)
-	sed -i \
-		-e "/CXXFLAGS/ s/--no-exceptions//g" \
-		-e "s/SLDFLAGS=-shared/SLDFLAGS=\"$(raw-ldflags) -shared\"\n\t  \tSLDFLAGS2=\"${LDFLAGS} -shared\"/" \
-		-e "s/  SLDFLAGS=/  SLDFLAGS=\n  SLDFLAGS2=/" \
-		-e "s/AC_SUBST(SLDFLAGS)/AC_SUBST(SLDFLAGS)\nAC_SUBST(SLDFLAGS2)/" \
-		"${S}"/Singular/configure.in || die
-
-	sed -i \
-		-e "s/@SLDFLAGS@/@SLDFLAGS@\nSLDFLAGS2\t= @SLDFLAGS2@/" \
-		-e "/\$(CXX).*SLDFLAGS/s/SLDFLAGS/SLDFLAGS2/" \
-		"${S}"/Singular/Makefile.in || die
-
-	# remove ntl sources for safety.
-	rm -r ntl || die
-
-	cd "${S}"/Singular || die "failed to cd into Singular/"
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--prefix="${S}"/build \
-		--exec-prefix="${S}"/build \
-		--bindir="${S}"/build/bin \
-		--libdir="${S}"/build/lib \
-		--libexecdir="${S}"/build/lib \
-		--includedir="${S}"/build/include \
-		--with-apint=gmp \
-		--with-NTL \
-		--disable-doc \
-		--without-MP \
-		--without-flint \
-		--enable-factory \
-		--enable-libfac \
-		--enable-IntegerProgramming \
-		--enable-Singular \
-		--with-malloc=system \
-		$(use_with python python embed) \
-		$(use_with boost Boost) \
-		$(use_enable emacs) \
-		$(use_with readline)
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}/emacs/
-		elisp-compile *.el
-	fi
-}
-
-src_test() {
-	# Tests fail to link -lsingular, upstream ticket #243
-	emake test
-}
-
-src_install () {
-	dodoc README
-	# execs and libraries
-	cd "${S}"/build/bin
-	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.so
-
-	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN}
-	dosym ${MY_PN}-${MY_DIR} /usr/bin/${PN}
-
-	# stuff from the share tar ball
-	cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
-	insinto /usr/share/${PN}
-	doins -r LIB
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	if use doc; then
-		dohtml -r html/*
-		insinto /usr/share/${PN}
-		doins doc/singular.idx
-		cp info/${PN}.hlp info/${PN}.info &&
-		doinfo info/${PN}.info
-	fi
-	if use emacs; then
-		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs*
-		elisp-site-file-install "${FILESDIR}"/60${PN}-gentoo.el
-	fi
-}
-
-pkg_postinst() {
-	einfo "The authors ask you to register as a SINGULAR user."
-	einfo "Please check the license file for details."
-	if use emacs; then
-		echo
-		ewarn "Please note that the ESingular emacs wrapper has been"
-		ewarn "removed in favor of full fledged singular support within"
-		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
-		ewarn "and you should be good to go! See bug #193411 for more info."
-		echo
-	fi
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
index fd44a959ad62..114d83fd0a31 100644
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -80,7 +80,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if use emacs; then
 		cd "${MY_SHARE_DIR}"singular/emacs/
@@ -92,26 +92,24 @@ src_compile() {
 # 	dodoc README
 # 	# execs and libraries
 # 	cd "${S}"/build/bin
-# 	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL \
-# 		|| die "failed to install binaries"
+# 	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL
 # 	insinto /usr/$(get_libdir)/${PN}
-# 	doins *.so || die "failed to install libraries"
+# 	doins *.so
 #
-# 	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN} \
-# 		|| die "failed to create symbolic link"
+# 	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN}
 #
 # 	# stuff from the share tar ball
 # 	cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
 # 	insinto /usr/share/${PN}
-# 	doins -r LIB  || die "failed to install lib files"
+# 	doins -r LIB
 # 	if use examples; then
 # 		insinto /usr/share/doc/${PF}
-# 		doins -r examples || die "failed to install examples"
+# 		doins -r examples
 # 	fi
 # 	if use doc; then
-# 		dohtml -r html/* || die "failed to install html docs"
+# 		dohtml -r html/*
 # 		insinto /usr/share/${PN}
-# 		doins doc/singular.idx || die "failed to install idx file"
+# 		doins doc/singular.idx
 # 		cp info/${PN}.hlp info/${PN}.info &&
 # 		doinfo info/${PN}.info \
 # 			|| die "failed to install info files"
diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild
index 819a33a186cc..6d898b9c9fcb 100644
--- a/sci-mathematics/singular/singular-4.0.3.ebuild
+++ b/sci-mathematics/singular/singular-4.0.3.ebuild
@@ -74,7 +74,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if use emacs; then
 		cd "${S}"/emacs/
diff --git a/sci-mathematics/unuran/Manifest b/sci-mathematics/unuran/Manifest
index 1a5b1f317963..b33495b24b95 100644
--- a/sci-mathematics/unuran/Manifest
+++ b/sci-mathematics/unuran/Manifest
@@ -1,3 +1,3 @@
 DIST unuran-1.8.1.tar.gz 4409911 BLAKE2B 2b036032deaeae70aa6ef58124fc88e9c167ae7952d04cba4b50181fff4249eff88c20bbb667c5702899bc863745b6991ae842da86f6bc592b6635dc310ec544 SHA512 4d98861914afe39065ec31ee837c0e21e0fb4f4667f559dee38a7a5c4e06f0d09bd550b20d06321d1f5fcd4799d482a9eebc66ac35f8cd7fff834f536d24854c
-EBUILD unuran-1.8.1.ebuild 998 BLAKE2B 2ea89ce75474449513f3c0e55c9f299d7d9d1eeaf2ff0eb8b1c6e2f76f32cfc135ed2b97cdfd7ebaddc5ca9fbe934ce379848b066f1a386cf387a0ad3acf3fbe SHA512 3de4820fb515dfa42c896da8fb2ba55def0b0fa23d4c7ca11b3e660f809b41ccc0f2ce174c005bcf42b281133fd4bfb45a048805dbe560b04d375da39f9be7b6
+EBUILD unuran-1.8.1.ebuild 1075 BLAKE2B 9b46dd7830ed35f33742528feeae0bde844ab5e62b3f55de474b16d6531af5460e96b547ed433dbe5b5a08f221ae7626d8076a8deab6f2af68f460104576cfda SHA512 646133d49d54ad0922a8f60389f93a08a5e526a05f3b32914ce6b4ea76d9a8cc367b228f2ff8e4575d23bb5a3321cde5f32a8d90e7159a0337aa6ff133505385
 MISC metadata.xml 764 BLAKE2B fa69b69765aca99c96cfb65149eafa4c9f3c28368418747da5d285500c2416ebf2eb9ab4c575bdc07889a0036ff5d10fff8c906899893081650ce7522cfd0068 SHA512 9292cbfe62c3b99ce76ada16e9811bd0a6cbb1feee80cbcd83a36a60e9ae4e703ebf28a9bd728f3fc163b672fb17116693a98a19b6d4471dce69fce55c3cc6cf
diff --git a/sci-mathematics/unuran/unuran-1.8.1.ebuild b/sci-mathematics/unuran/unuran-1.8.1.ebuild
index f3fea32d662e..27d0f064189a 100644
--- a/sci-mathematics/unuran/unuran-1.8.1.ebuild
+++ b/sci-mathematics/unuran/unuran-1.8.1.ebuild
@@ -1,44 +1,47 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools-utils
+inherit out-of-source
 
 DESCRIPTION="Universal Non-Uniform Random number generator"
 HOMEPAGE="http://statmath.wu.ac.at/unuran/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://statmath.wu.ac.at/unuran/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT=0
+SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gsl prng +rngstreams static-libs"
+IUSE="doc examples gsl prng +rngstreams"
 
 DEPEND="
-	gsl? ( sci-libs/gsl )
+	gsl? ( sci-libs/gsl:= )
 	prng? ( sci-mathematics/prng )
-	rngstreams? ( sci-mathematics/rngstreams )"
+	rngstreams? ( sci-mathematics/rngstreams:= )"
 RDEPEND="${DEPEND}"
 
-src_configure() {
+my_src_configure() {
 	local udefault=builtin
 	use rngstreams && udefault=rngstream
-	local myeconfargs=(
-		--enable-shared
-		--with-urng-default=${udefault}
-		$(use_with gsl urng-gsl)
-		$(use_with prng urng-prng)
+	econf \
+		--enable-shared \
+		--disable-static \
+		--with-urng-default="${udefault}" \
+		$(use_with gsl urng-gsl) \
+		$(use_with prng urng-prng) \
 		$(use_with rngstreams urng-rngstream)
-	)
-	autotools-utils_src_configure
 }
 
-src_install() {
-	autotools-utils_src_install
+my_src_install_all() {
 	use doc && dodoc doc/${PN}.pdf
+	einstalldocs
+
 	if use examples; then
-		rm examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		rm examples/Makefile* || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 4b74e98ed822..23810b10c33c 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -4,10 +4,12 @@ DIST wxmaxima-19.08.1.tar.gz 15153254 BLAKE2B 1bd48735ab95b078b9f35d7be623c1a16d
 DIST wxmaxima-19.09.0.tar.gz 15153282 BLAKE2B 96cb2db8938b73fb2dc3547310109df581a780a0372687aed9957cd3434fcbec8fef23467543f854f7e6b2c302dba6f3d5a411b17ab83e886175a62dc3fac385 SHA512 fad35fa118e49834d2ff6d54fb1f7cb8675ca1caadbb43c526b7a313479412c1a6c69959a0820c17af0119fc926f66c31368598c9e212fac56305a96d7a39838
 DIST wxmaxima-19.10.0.tar.gz 16573758 BLAKE2B 9bee3f8822e9c9ed28058496f7c5c6b2358feeafad39d08d92f3e6ff382817a8a7fd3e33b821f6faba3863f4c8871bc3bebee2b9d97ec6ccfdbfd7c0f7d44940 SHA512 39681cefb81a3816b7daeef7df5b23f57f3a4572ff34396fd447829ceaf6505d09f730255d3c44dd48232879b9994f26a9f86801fe333e15483026d864efdf14
 DIST wxmaxima-19.11.0.tar.gz 15304346 BLAKE2B 3a8038f4b67cee261d261f64671227963f91b55969b922282c3b2057029617a5989dc44dc8c28ab17a74e57c2547381dab98b07bf2a1f2f01a5d3c838d6d8a68 SHA512 bb0701ad2be71463ab412649164b2040e5fe95bd6fadb5332fbe5712dc4b65ef30fc86f2ff375e14f1879156fd77e1b8431f15794a136d7e6ee4e6a9393b903a
+DIST wxmaxima-19.12.1.tar.gz 15303584 BLAKE2B 0d7d1fb738563ba0d5805ddc746fc88548c76f249d6c79217f558b7a29c497cf4865810c4aa52f5787e9f4b87aacc93a6ce05726c3bc423c74f382b572ced12d SHA512 74bb60223fb47528f08ed737709eb703d533c27fadfd87deece08f6ec2a6ef1caa489f7ad31f0204010b1b421ab992b4167be133c69bca1b56872685ec0b2cad
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
 EBUILD wxmaxima-19.05.7.ebuild 1460 BLAKE2B 1137943c8725f8a47b31404ff691f4d865f419b9bdc224a851decc4d76c067c4b7dec561039c6b6efa9c6fc8b2643bb8f57f4c94dec60db954b8a02a3d049f65 SHA512 7437cacffb38ce11970036778acb916aadec00ad84e8d8de0f9627bb935e96caac30ede0f6b08ea72539fb3e93d96879796773741d95402df239536418e6dff4
 EBUILD wxmaxima-19.08.1.ebuild 1460 BLAKE2B 1137943c8725f8a47b31404ff691f4d865f419b9bdc224a851decc4d76c067c4b7dec561039c6b6efa9c6fc8b2643bb8f57f4c94dec60db954b8a02a3d049f65 SHA512 7437cacffb38ce11970036778acb916aadec00ad84e8d8de0f9627bb935e96caac30ede0f6b08ea72539fb3e93d96879796773741d95402df239536418e6dff4
 EBUILD wxmaxima-19.09.0.ebuild 1234 BLAKE2B 8cd862e12a583116859213c861d120095b88f5a815fcf8aed15499eaadaedcc5c0eae3c1e5b40e5bd4beae165fba68408c1c0772bf69ed28651264e214a82bf8 SHA512 f544e092e687134e312791a7b4d003bcc15b42aded3bc9e464ab1271c6e626fdb5fbdd87ae52c189a5e901099d3f8d47a9431b46c449f499081488b39d0e5218
 EBUILD wxmaxima-19.10.0.ebuild 1397 BLAKE2B fbd3c30213c726d0aeeb9a32c4f87c3d747343421c19330336cf132875cc84ad84b1b9b33b92961dbc54330bc02e33753d9e6f58eeeb069eca5d7a12559c773d SHA512 2ca45bc6831052fa7b6a0f8d6e628394419c46b040adab85878ff79acb6b19da710add34c5dcc17ea9bc397c41cd84597451340c2d68f6511cdeeecdf4715412
 EBUILD wxmaxima-19.11.0.ebuild 1397 BLAKE2B fbd3c30213c726d0aeeb9a32c4f87c3d747343421c19330336cf132875cc84ad84b1b9b33b92961dbc54330bc02e33753d9e6f58eeeb069eca5d7a12559c773d SHA512 2ca45bc6831052fa7b6a0f8d6e628394419c46b040adab85878ff79acb6b19da710add34c5dcc17ea9bc397c41cd84597451340c2d68f6511cdeeecdf4715412
+EBUILD wxmaxima-19.12.1.ebuild 1397 BLAKE2B fbd3c30213c726d0aeeb9a32c4f87c3d747343421c19330336cf132875cc84ad84b1b9b33b92961dbc54330bc02e33753d9e6f58eeeb069eca5d7a12559c773d SHA512 2ca45bc6831052fa7b6a0f8d6e628394419c46b040adab85878ff79acb6b19da710add34c5dcc17ea9bc397c41cd84597451340c2d68f6511cdeeecdf4715412
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.12.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.12.1.ebuild
new file mode 100644
index 000000000000..b22b9bbbbd26
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-19.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 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}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
+	cmake-utils_src_install
+}
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index 46f1c9f094e7..d93488295476 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -3,5 +3,5 @@ AUX yacas-1.7.0-gnuinstalldirs.patch 13706 BLAKE2B 67c024ecb5111ae0188140143c7d5
 AUX yacas-1.7.0-use-bundled-not-external.patch 7485 BLAKE2B 9f4653465fa7dcb21a915c67e138053296a8a0c446b198f1ab394c34223be3526b247a2de90a46bbc481d5cdeaac43711f979edada93fded89144ca21c4f34d8 SHA512 58e58aeae8a9b89ba7df18d3a9ed9168f4654d5501d3cc42ced9079c87b3177e7d57e9109729d57eb0441d9de40a5212573671bfd739916366957a3be659d3ba
 DIST yacas-1.7.0.tar.gz 2610016 BLAKE2B 62400d8aaba192a088bb48e0e12ff79e7e2d24af4825b2d53aeffa7aace011beb728118d56e5a9dd9e7dedba545706bbf77cb9ef27b5075e555fc5cc1983dc5e SHA512 6da7d454b3a74638d743c5e8168b27b9a8a71e2c41fe3f35bcb397fb80e866277ddb5b4e15167e2c0d11dd6033491ca72b560440fe2db6dc34b91b2ad047ca1d
 DIST yacas-bundled-1.7.0.tar.xz 4940180 BLAKE2B e191f3806df0c15149df053c47b1f11a5113ee3b55cbc9a78bfaec058fb5d783e4157687bf4ee9a953bcd23a4e3e49a59e6743e4471e31209a9e24e03ddc8ff5 SHA512 a9c519d0721df69ec81998a3ec17043b59230f5b0650fc2fd6555eccb5503460f387433c019ae15bbd0fd3ff11e697d6da56a3d08aac5fadf4ff023ca5d8691c
-EBUILD yacas-1.7.0-r1.ebuild 1389 BLAKE2B e46299ac3e3e7b79547173888dde4446846bb65298543d59b17eb32acdd81f9ef6fb68f2c63cac7faa60148ede3e559e89205b64bc8736a078a1d41e2f014116 SHA512 d3ac339c516b4ed4d09d88da840c73104236b07694285cec742cc7a322d87a866b164536e6c80b30217c98046b852ee6d2f84e3256638166f2735c8c635ecfd1
+EBUILD yacas-1.7.0-r1.ebuild 1416 BLAKE2B a244961e5225b0baf9479fa68467ce62ace38d7cc2af4b0167aa3a9ea7e4b2c65187f786f5dd5b54e80bc38f7173bdfcb716bbae4981de57394f8842fabee61e SHA512 1f03029cc3bb8ebeca7a42a9b68fc332013522dfcd74a911654eee8c30e5e16f0cf48bcc71a1505f1aac5c8e203adf1cf9ef2b3947154efc8443136b11295e6e
 MISC metadata.xml 945 BLAKE2B 63739d4c7d0e8fc17f107f94585355ff2e2cd6e68718008e0c0af862b5d66cd1518e036a2ee1357584e849cf510b9cbfeca6d04c1a97fa3d42ddcdae36fb19d4 SHA512 926b90c3c18ecc5401b56ea8b09914b785575c78dbef8cdc928240e4a54c42146feabfcf9ea3eb91c131c2af6dc6471f08ce57994d0ff6fcfbf027432d70c999
diff --git a/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild b/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
index fdba42ce0213..0d808f23ce18 100644
--- a/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
+++ b/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2 gui? ( MIT Apache-2.0 OFL-1.1 )"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
 IUSE="gui +jupyter static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	gui? (
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 9598008f8121..8bf53b70953e 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,10 +1,3 @@
-AUX z3-4.4.1-gcc-6.patch 668 BLAKE2B d6d87a3f8204f04359b2843e6988b9ac2c13df9fae5d15ad0309848d98d2b909599f41fb157cb60efa43ec1179952f157cf78f3d7b1c7b5491b640868af7b212 SHA512 2efd883026643f365141665f257a863c6b22ad30327db82ad03719d33abfd58bc681cf4c9db9145098584817e57e59f7b1fe90a5390e72a49bce66cd23481f7f
-DIST Z3-4.8.5.tar.gz 4177051 BLAKE2B f8c4be9dbab2d5cf6fdb0bd8e9e1648f8ac29bc8ca9241b3ef29699400b383f09601149d50899d6ca828abadacb71161af1524df6d1ed45d7fd95c4a49c0d3df SHA512 ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309
-DIST z3-4.4.1.tar.gz 3347371 BLAKE2B 57f090b891618613c4647a89620d12f2ac05ea110268e63b343594f53fa2cc7aa347781001e2778ea7dc1ce475c964ddeced7a82c304b4be706ad164fd17a285 SHA512 76991a24f47f2b53ceb8d7a9a6be19913c57994ffb6cf6acfe30f61b2e73959cf02a99f656053594fccb5aaf4d1f44b3ae7e51f1c8953b213d738ceeeaea74f8
-DIST z3-4.5.0.tar.gz 3573695 BLAKE2B 285cc4d1f998d61ddb0b854044b7c79c1bb4cccf51bbdcba7c4a45698d74d9591f84d0aa74c5ef7c8aea2c6539ac987f29e326b44037e954108df67644dff594 SHA512 1ebc2c908d90b6b879f1e819c864ff894613276af47a440f27cf94968c195656952434754c3eb20f4bdbdd8497d227d22e1b4821c0d320b11052b5648d9e2dc7
 DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46 SHA512 d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1
-EBUILD z3-4.4.1.ebuild 4306 BLAKE2B 7e81603d96667c8e5748467668615f07a9e2194be963b67ae94eb90b29252d7fb53be373df21efbbea007aa8671609f2199fcb8a5f866b1f284228ad0d6e9d00 SHA512 1a370b019b33e83d5984b6abf321b39ff25f3b633ca60b2c48ddf9e33b30252389b5cb6f2e34e0dc1103730c9e5bf60ac688d67914d9c5dae52cf5fc5354620c
-EBUILD z3-4.5.0.ebuild 4721 BLAKE2B 8d0dab01c8c06bb07462bb51311520bb9f600b64ab43dd1ad5975c39554416d1a019665d30079535f5e20cefa5d65c6e6eb7140fd2ebc90cd2c363e9c732421c SHA512 e52d01917d884d10c24bf081303bdef7b1efa3b042f838ebc7de678a473fdd01d7738a216c9e14c4929b847fe7e5c3abe7a92bdafc827a1c1aa54b86abe46664
-EBUILD z3-4.8.5.ebuild 2638 BLAKE2B 2f9f25e652ab0eb24a7d254478d1ad36ad5b08cf1fbd742f90f132a939cc62cd74b38f60ee76246a4714041848cab487bd9464708cff7e4793dd295c8d7c5346 SHA512 733f387ae61a3de6e582844e6d49b329e19e3aa4ec193867acbc2220f8a1432fc566f103641967f76693f42b9e33b0097a6a7b0a36296c5d03b59e19a0335bba
-EBUILD z3-4.8.6.ebuild 2342 BLAKE2B 41f06a28720f4e277bb2baab64874c8b50df603a414be87ae1b260f7e344899664878e4db12fcf6da013ed64d0e2c4a98c072782c5056d3049a62eded391877a SHA512 ed360f44d8e79c0b92e442c2352c910da87a619a1ed16b6d83874cb283e090dc4e7ea5ebcfa273224aa09edeb8846cfde3f062983938d52c271303a5f2292d5d
+EBUILD z3-4.8.6.ebuild 2339 BLAKE2B de6532630288a2fd70f3d8ed47ee61b627bff96e26779a03f213ef868bb47c04fbaa62e30741fe31c7204e894c44166b1ecd4198d858b2b16088005b5da5242d SHA512 d0f9ef9fc1359830a495c679a6404f87bb7a0f377b9c740d4648a093d1ea731d9a434149ee5f5f6ca5410a52afc8f12e3d55045636788d38c8b1eaabf90a729e
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch b/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch
deleted file mode 100644
index 2dc0ddd12f26..000000000000
--- a/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/util/debug.cpp b/src/util/debug.cpp
-index 54c67fe..66676c6 100644
---- a/src/util/debug.cpp
-+++ b/src/util/debug.cpp
-@@ -78,3 +78,3 @@ void invoke_gdb() {
-         char result;
--        bool ok = (std::cin >> result);
-+        bool ok = bool(std::cin >> result);
-         if (!ok) exit(ERR_INTERNAL_FATAL); // happens if std::cin is eof or unattached.
-diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp
-index 8559279..7dca14b 100644
---- a/src/util/mpz.cpp
-+++ b/src/util/mpz.cpp
-@@ -136,3 +136,3 @@ mpz_manager<SYNCH>::mpz_manager():
-     mpz one(1);
--    set(m_two64, UINT64_MAX);
-+    set(m_two64, (uint64)UINT64_MAX);
-     add(m_two64, one, m_two64);
diff --git a/sci-mathematics/z3/z3-4.4.1.ebuild b/sci-mathematics/z3/z3-4.4.1.ebuild
deleted file mode 100644
index 8fd027f17feb..000000000000
--- a/sci-mathematics/z3/z3-4.4.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic java-pkg-2 java-pkg-simple python-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="http://z3.codeplex.com/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gmp isabelle java python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0 )"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )"
-
-S=${WORKDIR}/${PN}-${P}
-JAVA_SRC_DIR=${S}/src/api/java
-
-SO1="0"
-SO2="1"
-SOVER="${SO1}.${SO2}"
-
-pkg_setup() {
-	python_setup
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-			ewarn "Please use an openmp compatible compiler"
-			ewarn "like >gcc-4.2 with USE=openmp"
-			die "Openmp support missing in compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-gcc-6.patch
-	default
-
-	sed \
-		-e 's:-O3::g' \
-		-e 's:-fomit-frame-pointer::' \
-		-e 's:-msse2::g' \
-		-e 's:-msse::g' \
-		-e "/LINK_EXTRA_FLAGS/s:@LDFLAGS@:-lrt $(usex gmp -lgmp ""):g" \
-		-e 's:t@\$:t\$:g' \
-		-i scripts/*mk* || die
-
-	sed \
-		-e "s:SLIBEXTRAFLAGS = '':SLIBEXTRAFLAGS = '-Wl,-soname,lib${PN}.so.${SOVER}':" \
-		-i scripts/mk_util.py || die
-
-	append-ldflags -fopenmp
-
-	cat <<- EOF > "${S}/src/api/python/__init__.py" || die
-		from .z3 import *
-
-		from . import z3num
-		from . import z3poly
-		from . import z3printer
-		from . import z3rcf
-		from . import z3types
-		from . import z3util
-
-		# generated files
-		from . import z3core
-		from . import z3consts
-	EOF
-}
-
-src_configure() {
-	export Z3_INSTALL_LIB_DIR="$(get_libdir)"
-	export Z3_INSTALL_INCLUDE_DIR="include/z3"
-	set -- \
-		$(usex gmp --gmp "") \
-		$(usex java --java "")
-	echo ./configure "$@" >&2
-	./configure "$@" || die
-	${EPYTHON} scripts/mk_make.py || die
-}
-
-src_compile() {
-	emake \
-		--directory="build" \
-		CXX=$(tc-getCXX) \
-		LINK="$(tc-getCXX) ${LDFLAGS}" \
-		LINK_FLAGS="${LDFLAGS}"
-
-	use java && java-pkg-simple_src_compile
-}
-
-src_install() {
-	dodir /usr/include/${PN}
-	insinto /usr/include/${PN}
-	doins src/api/z3*.h src/api/c++/z3*.h
-	dolib.so build/lib${PN}.so
-	dosym "/usr/$(get_libdir)/lib${PN}.so" \
-		  "/usr/$(get_libdir)/lib${PN}.so.${SO1}" \
-		  || die "Could not create /usr/$(get_libdir)/lib${PN}.so.${SO1} symlink"
-	dosym "/usr/$(get_libdir)/lib${PN}.so" \
-		  "/usr/$(get_libdir)/lib${PN}.so.${SOVER}" \
-		  || die "Could not create libz3.so soname symlink"
-	dobin build/z3
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-
-	if use python; then
-		python_moduleinto "${PN}"
-		instpybind() {
-			python_domodule src/api/python/*.py
-			dosym "/usr/$(get_libdir)/lib${PN}.so" \
-				  "$(python_get_sitedir)/${PN}/lib${PN}.so" \
-				|| die "Could not create $(python_get_sitedir)/lib${PN}.so symlink for python module"
-		}
-		python_foreach_impl instpybind
-	fi
-
-	use java && java-pkg-simple_src_install
-
-	if use isabelle; then
-		ISABELLE_HOME="${ROOT}usr/share/Isabelle"
-		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		cat <<- EOF >> "${S}/settings" || die
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${ROOT}usr/bin"
-			Z3_SOLVER="${ROOT}usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		doins "${S}/settings"
-	fi
-
-	local DOCS=( "README" "RELEASE_NOTES" )
-	use doc && einstalldocs
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [ -f "${ROOT}etc/isabelle/components" ]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
-				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-			cat <<- EOF >> "${ROOT}etc/isabelle/components"
-				contrib/${PN}-${PV}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [ ! -f "${ROOT}usr/bin/Z3" ]; 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\/${PN}-${PV}/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.5.0.ebuild b/sci-mathematics/z3/z3-4.5.0.ebuild
deleted file mode 100644
index 5f19493a454c..000000000000
--- a/sci-mathematics/z3/z3-4.5.0.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic java-pkg-2 java-pkg-simple python-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="http://z3.codeplex.com/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gmp isabelle java python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.8 )"
-
-S=${WORKDIR}/${PN}-${P}
-JAVA_SRC_DIR=${S}/src/api/java
-
-SO1="0"
-SO2="1"
-SOVER="${SO1}.${SO2}"
-
-pkg_setup() {
-	python_setup
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
-			ewarn "Please use an openmp compatible compiler"
-			ewarn "like >gcc-4.2 with USE=openmp"
-			die "Openmp support missing in compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:-O3::g' \
-		-e 's:-fomit-frame-pointer::' \
-		-e 's:-msse2::g' \
-		-e 's:-msse::g' \
-		-e "/LINK_EXTRA_FLAGS/s:@LDFLAGS@:-lrt $(usex gmp -lgmp ""):g" \
-		-e 's:t@\$:t\$:g' \
-		-i scripts/*mk* || die
-
-	sed \
-		-e "s:SLIBEXTRAFLAGS = '':SLIBEXTRAFLAGS = '-Wl,-soname,lib${PN}.so.${SOVER}':" \
-		-i scripts/mk_util.py || die
-
-	sed -e 's:api\\html\\ml:api/html/ml:' \
-		-e 's:python/z3.py:python/z3/z3.py:' \
-		-i doc/mk_api_doc.py || die
-
-	append-ldflags -fopenmp
-}
-
-src_configure() {
-	local PYTHON_SITEDIR
-	python_export PYTHON_SITEDIR
-	export Z3_INSTALL_LIB_DIR="$(get_libdir)"
-	export Z3_INSTALL_INCLUDE_DIR="include/z3"
-	set -- \
-		--pypkgdir="${PYTHON_SITEDIR}/${PN}" \
-		--prefix="${ROOT}usr" \
-		$(usex gmp --gmp "") \
-		$(usex python --python "") \
-		$(usex java --java "")
-	echo ./configure "$@" >&2
-	# LANG=C to force external tools to output ascii text only
-	# otherwise configure crashes as:
-	#    File "scripts/mk_make.py", line 21, in <module>
-	#    UnicodeEncodeError: 'ascii' codec can't encode characters in position 80-82: ordinal not in range(128)
-	LANG=C ./configure "$@" || die
-	echo ${EPYTHON} scripts/mk_make.py "$@" >&2
-	LANG=C ${EPYTHON} scripts/mk_make.py || die
-}
-
-src_compile() {
-	emake \
-		--directory="build" \
-		CXX=$(tc-getCXX) \
-		LINK="$(tc-getCXX) ${LDFLAGS}" \
-		LINK_FLAGS="${LDFLAGS}"
-
-	use java && java-pkg-simple_src_compile
-
-	if use doc; then
-		pushd doc || die
-		${EPYTHON} mk_api_doc.py || die
-		popd || die
-	fi
-}
-
-src_install() {
-	emake \
-		--directory="build" \
-		CXX=$(tc-getCXX) \
-		LINK="$(tc-getCXX) ${LDFLAGS}" \
-		LINK_FLAGS="${LDFLAGS}" \
-		install DESTDIR="${D}"
-
-	dosym "/usr/$(get_libdir)/lib${PN}.so" \
-		  "/usr/$(get_libdir)/lib${PN}.so.${SO1}" \
-		  || die "Could not create /usr/$(get_libdir)/lib${PN}.so.${SO1} symlink"
-	dosym "/usr/$(get_libdir)/lib${PN}.so" \
-		  "/usr/$(get_libdir)/lib${PN}.so.${SOVER}" \
-		  || die "Could not create libz3.so soname symlink"
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-
-	if use python; then
-		python_moduleinto "${PN}"
-		instpybind() {
-			python_domodule src/api/python/z3/*.py
-			dosym "/usr/$(get_libdir)/lib${PN}.so" \
-				  "$(python_get_sitedir)/${PN}/lib${PN}.so" \
-				|| die "Could not create $(python_get_sitedir)/lib${PN}.so symlink for python module"
-		}
-		python_foreach_impl instpybind
-	fi
-
-	use java && java-pkg-simple_src_install
-
-	if use isabelle; then
-		ISABELLE_HOME="${ROOT}usr/share/Isabelle"
-		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		cat <<- EOF >> "${S}/settings" || die
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${ROOT}usr/bin"
-			Z3_SOLVER="${ROOT}usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		doins "${S}/settings"
-	fi
-
-	local DOCS=( "README.md" "RELEASE_NOTES" )
-	local HTML_DOCS=( "doc/api/html/." )
-	use doc && einstalldocs
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [ -f "${ROOT}etc/isabelle/components" ]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
-				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-			cat <<- EOF >> "${ROOT}etc/isabelle/components"
-				contrib/${PN}-${PV}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [ ! -f "${ROOT}usr/bin/Z3" ]; 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\/${PN}-${PV}/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.8.5.ebuild b/sci-mathematics/z3/z3-4.8.5.ebuild
deleted file mode 100644
index 655c7b28fe6a..000000000000
--- a/sci-mathematics/z3/z3-4.8.5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-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"
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="doc examples gmp isabelle java openmp python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.8 )"
-
-S=${WORKDIR}/${PN}-${P^}
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	python_setup
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp && ! tc-has-openmp; then
-			ewarn "Please use an openmp compatible compiler"
-			ewarn "like >gcc-4.2 with USE=openmp"
-			die "Openmp support missing in compiler"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DUSE_LIB_GMP=$(usex gmp)
-		-DUSE_OPENMP=$(usex openmp)
-		-DENABLE_EXAMPLE_TARGETS=OFF
-		-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DBUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DBUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	cmake-utils_src_make test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md RELEASE_NOTES
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT%/}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT%/}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT%/}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT%/}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT%/}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.8.6.ebuild b/sci-mathematics/z3/z3-4.8.6.ebuild
index 67b683d00d7f..5845b66caf22 100644
--- a/sci-mathematics/z3/z3-4.8.6.ebuild
+++ b/sci-mathematics/z3/z3-4.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
 
 inherit cmake-multilib python-single-r1 toolchain-funcs
 
@@ -14,7 +14,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sci-mathematics
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)