gentoo resync : 25.08.2020

38 files changed, 437 insertions, 242 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 74f45dbb8b27..b84ec2356257 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index b0c9fc266e3e..8b3494715513 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -1,7 +1,7 @@
 AUX arb-2.18.0-build_type.patch 866 BLAKE2B c127152e03d8dd532558a7dc95e4dd2cc1079073d8c30095feea6fa11a65ced564b94dbe3f2c3295fe47a010982a95b2e4408101ad078017d296f9c796f33ddd SHA512 b38728b103b55b19da1f92f9db8bfae74f275d54f83f3409e18503f199467e48fb74bdfb3716c28c01201dd19e8d78d20036671f99cdb63738f33416dc8eb7a2
 AUX arb-2.18.0-multilib-strict.patch 590 BLAKE2B 7f438139ff5f0a19db074ea3bfab064da968424520bc81af242b58675657a7cacce0921076cb5525e00e2d6c33f2b75ed898ffdba7ce730855b09f2b7f8863a1 SHA512 ec9de9a642dd4cb859460132ed597474df4eb2b3f28cdf3ebcb5109fedc2866eda91b0d301149d94f71dd67c105a1dda3d0aed94dcfe34c9ff9fc4083ee6817c
 DIST arb-2.17.0.tar.gz 1589083 BLAKE2B 68d5b04dca24129ceaec4e05124e35b474157cf1efbb6505121a03058e014cd4eb67b99497dbbafcf62e9e31f9d11c92f749f6e047e6b1513b6c0cc5ef8f22da SHA512 201e0cebbd1c4857d194e5531c76c6e45a478cf6965b836818919adf0fc04f0fe25e16ecd49c62a438876b67f009b872c4f3c774fe35620be0b22c5e08bdb824
-DIST arb-2.18.0.tar.gz 1595610 BLAKE2B be6a7e1a306f91b70383110e1ef6ead1ebd39f7d408c7a2e3031ca4b6fd788133607779d8f8edb3de1f00abe8ac5f21e07f951caecb4d56ada0517af71265d05 SHA512 3db0b2af4fe63fbc505d9b0e1940165f8bb62eec99d83569a1d959144f33b99141afd6c402d10b24407f9fce1853017a4802850f57fca181cf2f58605395fc31
+DIST arb-2.18.1.tar.gz 1595831 BLAKE2B 010ae7a17a9cc1c11ded5806ff761115f3e78c48a5d8fc058eae0715b1e00e40345d4e6445a84c71c37627879648f445663dcc3bbcebdeaac8439a993ade38ee SHA512 07afb45829119bc695926dab4221051b221c2cc3952e42c9928efc74570b05fc01c97ea86b1b67c16d7a19a55b4e32dce97e08c9b72f36b33dd62bfccd19bb05
 EBUILD arb-2.17.0.ebuild 2035 BLAKE2B 1866ef62a25faaa1dbfe24423c0cc135b61c7297c18d8ac38aa58f30f26a692cf32e1bd63153dfda66f3be27b39eb1186c684b86d7b9e9ca4d8d1c20be03c764 SHA512 a364ab870eda7e5cdedad53d80be7ad80cfeaeea93935b3637bba6d81fb59bd55c2960a3e605a0d58bb8a7e262357ab8825a60acf1bd8c1a56536431a74c5a7c
-EBUILD arb-2.18.0.ebuild 790 BLAKE2B 5e2101ab5002f49381de85535de0b1449909d11e27c2bde71280839e9b9c6f927ef5feb4401ca9de8e98f8e4d11a09ecb8e292b0055e5b10f326cc27abeb44b7 SHA512 6792a29a1b0b7aae2fc83f8bf666ebc82c770a9e0ab029fc2dc9543ed71f2cdf9cb951afd931e67707ec52c17602b9b21dbd71b0c0f4462fa5751882a9d28ff7
+EBUILD arb-2.18.1.ebuild 790 BLAKE2B 5e2101ab5002f49381de85535de0b1449909d11e27c2bde71280839e9b9c6f927ef5feb4401ca9de8e98f8e4d11a09ecb8e292b0055e5b10f326cc27abeb44b7 SHA512 6792a29a1b0b7aae2fc83f8bf666ebc82c770a9e0ab029fc2dc9543ed71f2cdf9cb951afd931e67707ec52c17602b9b21dbd71b0c0f4462fa5751882a9d28ff7
 MISC metadata.xml 1077 BLAKE2B d21ef7ffc1b41b7b52d7d8caf246b0109be10d06b7bb4d660c9ae0f750d748cac37cd289df3282cbca9f2658e8fb5f6674c170ea6bfd511edb71a3f0da88bc86 SHA512 cc6a2aed7acd718af2aa1612b1b454a2e699da97a33cb9ba9ca747e3782d9439bb0ff96c25e9023776777a5ee20d2c208c7f98dc73c787a16bfca58e9a10e1ee
diff --git a/sci-mathematics/arb/arb-2.18.0.ebuild b/sci-mathematics/arb/arb-2.18.1.ebuild
index 691185c1d346..691185c1d346 100644
--- a/sci-mathematics/arb/arb-2.18.0.ebuild
+++ b/sci-mathematics/arb/arb-2.18.1.ebuild
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
index 4e1d31f4f292..d01837e4c2ed 100644
--- a/sci-mathematics/eclib/Manifest
+++ b/sci-mathematics/eclib/Manifest
@@ -1,3 +1,3 @@
 DIST eclib-20190909.tar.bz2 914900 BLAKE2B df57972792f96e65b25db5a2ab1063d5a8f1ad05edbed77d9ca2632ddfb4af2cb8586e572155beec09cc0c03472300d1e6fcbdda3527c36e9106006239f50600 SHA512 df829b10c353f528f2040b55d6198e3a48eba179b9a80e71794e4c6d46ee9bb13b3eccec15c7d286ec5d8252e6ba91157c2a08ac4e2da86969a4158450a41960
-EBUILD eclib-20190909.ebuild 1031 BLAKE2B a2dc95b4e5497f703e1e059dc6cfae3f1b2bf24a688adf23b57681645ad83fdee51e2541ba7b2827a8d95bd22a432f47ddb32a4a8f3580acdf2e0cb8d6d2da9d SHA512 1b3c526c58f1ae7055757c8a632e6e085af4ca23752ffe7f2be18e28259dcb437f42e4c0658dd793dc9afb7c637f960913f128f8774e9c0c89511102353ce19f
+EBUILD eclib-20190909.ebuild 1009 BLAKE2B 78281fa5043db50b79b5462af2098f09fc36d386da6f4c0d521eeae24b2faa4fb910881000c415ccde92016dfae358b84305829b9deaff742bba79906d4b4c77 SHA512 41eb82fb56e18fe7695eaaa1a523bf0eff903ab8e0fa852f431b7ce21ddfa3f11462999f15c48bc7e4e1218b59a7ec3022674d5363c33e7861dd3d9a1cc49b26
 MISC metadata.xml 1058 BLAKE2B f78114f517aa1b21ee6bc36104f1e929b319d77c2a9373c41cfcea4a90d89ff9e0a0d512f4056b6d1c611a3dfe2f64b65117f8e3ba09dd4c3e535eab0cb76f3b SHA512 692e570681c68cd0a2285b616a792e91e341993fceac875f3e35911f04d1933b2e696c9d54d9f90c3a2f459c8365291e03c0a52c1cbf0491a3c303f9e1ba6d41
diff --git a/sci-mathematics/eclib/eclib-20190909.ebuild b/sci-mathematics/eclib/eclib-20190909.ebuild
index ffffddd7a61d..e43120cdeb45 100644
--- a/sci-mathematics/eclib/eclib-20190909.ebuild
+++ b/sci-mathematics/eclib/eclib-20190909.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="boost flint minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 8b4fe6189b96..a48185aa2fde 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -4,7 +4,7 @@ AUX flint-2.5.2-utf8.patch 625 BLAKE2B ab76e01125f0f483b09c22a30656019963a98629c
 AUX flint-2.6.0-multilib-strict.patch 622 BLAKE2B d383ce45fb82fabd62530cc15a8bda65f1b088a115985469cd5bfd13d96d0bb9a21d9a073d78aa7ee98f08bd3f75f81445f274777562bca8f317b553cb8483cd SHA512 d360d3d57427d66dedb2f12b2dad03dbbe8530b0bec4184829eed7d8ba534eb8d6e24b302b149dfb852e0415d2612ec9e6312f8f2ac6f0f6a264b8a1f0a66a78
 AUX flintxx-include.patch 507 BLAKE2B 250e54de1ab5b70cffdac7348b78db543cbdb366efa419dea62ffed2b0b5f95b787019e96fb95b9253b5289d58a2322b41f660f1719516e410e4245b09accb7b SHA512 144dc23d8706e22c6ac5d50bc2ce6c9e2eb8016155bec48a809bceec435d07781105c073b669302132963f063ab1c311e7381f78cc29a0141ca78eceb25aa0dc
 DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
-DIST flint-2.6.0.tar.gz 4517938 BLAKE2B 25eeaae93dda01b91d7c76db6cd637ac61199f60cb169998b506eb733b0ed4dbd306c9d370caaf84dd20fbd85779d5b05de52086d82c8bc9afe67a581064462b SHA512 623655a121190d0a1f24305eee323e14f90d2c6451c174133706cde8b62fdf6363d79bfcbe6dce8ffe04bc64d0131d902917f44e0d38c1d647d982710cbc8a8a
+DIST flint-2.6.3.tar.gz 4526340 BLAKE2B d663b44166cd857f83c2752eb4d4f6dc45eb8de535089e5dbe9939ac1464f1d69f66b62184644fff1ecd1d171f389d5ab874873def670c702733a0eba17bfd13 SHA512 8e71570364c789b1d4eaaa5f5adf10212cab47bf1a9f45c333211035ed021a86bb7b1de1feec51e83b2e113e8168853e370f127d2d2b1e941a12aec71fe8ae9e
 EBUILD flint-2.5.2-r1.ebuild 1714 BLAKE2B e1e6770c375f95ac1bb5d4284ffc205ba4a95d9933799718862ab31a12c87c3da9ed0c46509b808856a3663eef1d4bbd0c7334d9b1f76a192d66e196a2eb1683 SHA512 4ee441362d871807a93a9e9ab8d5a4d261f1c87ae0802525a780855ceb93666f3ca721a0fcbfc7d341522a0c8d81e3b28765ba6a1246a3535881e35e20ec24dd
-EBUILD flint-2.6.0.ebuild 1148 BLAKE2B a131754672341cbebfc5b74c07525213d6c7fecff58acf48db94aad682e29526dc91727e13210fae02b440ed3ece9a921b5f6e22a59bd3874bebcba76280dc43 SHA512 45eb898e733364e021b2723acd5d57d4ea5946e9b3f49ba95e8ccff9e8ef831b30a4007f5f93b34ed8cff14fd4aa2feee9633c9c94665244006a7b42e2349901
+EBUILD flint-2.6.3.ebuild 1148 BLAKE2B a131754672341cbebfc5b74c07525213d6c7fecff58acf48db94aad682e29526dc91727e13210fae02b440ed3ece9a921b5f6e22a59bd3874bebcba76280dc43 SHA512 45eb898e733364e021b2723acd5d57d4ea5946e9b3f49ba95e8ccff9e8ef831b30a4007f5f93b34ed8cff14fd4aa2feee9633c9c94665244006a7b42e2349901
 MISC metadata.xml 481 BLAKE2B f0d2cbeda37050bec654c0cba3c45b7340f37b29aa570c744d0a882f662481e7d8d777f48b0530fa23090807d9ad0a913733f4d55a3661f82322cfe544b90508 SHA512 63b38afaf08270df42d3a26cca9f5f491562dd89d8e9c43def3849a624d6694343147e47a602d75e44a656a8db1f7cb06885534fe39917cb46f2f895efc8ff16
diff --git a/sci-mathematics/flint/flint-2.6.0.ebuild b/sci-mathematics/flint/flint-2.6.3.ebuild
index d6ba11ee4b12..d6ba11ee4b12 100644
--- a/sci-mathematics/flint/flint-2.6.0.ebuild
+++ b/sci-mathematics/flint/flint-2.6.3.ebuild
diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest
index fe018d2fd844..0cd5d41c801a 100644
--- a/sci-mathematics/genius/Manifest
+++ b/sci-mathematics/genius/Manifest
@@ -5,5 +5,5 @@ DIST genius-1.0.23.tar.xz 2910332 BLAKE2B 8c9822737dfd0b445092c6b96376249093f3cf
 DIST genius-1.0.25.tar.xz 2935920 BLAKE2B 9e5a58e15a1e53a64b10c662f1dea91ec80987d1be3ec208aaff76f59d1f9f5b2f9b2b1a2d6bede9c2cae5258038b2995b3bce6600471d088653b1392a1a8eb1 SHA512 ecd01acceb4cea3cb9796edaebc983ed7c0ee618737d98755882a845ddc07e1307851ef9fba75714bc33868556f03c004e03c3b9c42425293cb59a86b8af17a9
 DIST genius-reference.pdf 1024944 BLAKE2B e0058fbd266a4ed4bf29306520ac64b7ff9a970fa79b5132f5556b61a97dd985fe916c888d0d5a678528ef231a9c66310dc2affe01491c7848451b3d54f58274 SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285
 EBUILD genius-1.0.23.ebuild 1461 BLAKE2B a23dd485bc36ebfae68e6cea6f6b63867b77f521e2e4b636050595b1ef3e7f62e21f3aa76669bcbcc23c9a484fe6acea88af6ca335bd5b9789cf47d0617bc564 SHA512 512066eb09d4fe81722bb3cbe0802e074f1f658b24d0ebbb822b973dae9554934d2c469058dcb24320e290309bec4ab82385897e8f0c131c1a569c0d025f98b3
-EBUILD genius-1.0.25.ebuild 1458 BLAKE2B 5ed920490b79d4c2d57ec5e792d0ed5233250fb3be0cd5c3449df2a92a1bf14d1aa56c126b71dd826829d44626b3103046c6e18a81a9e3e956246be17f667696 SHA512 bb7933fa1aae2699e14b3fd74f3eef133f4b614a8a778ad331b311071ae77d309f42ec35005694d82dc80a3b17148f688b453856a6a7d5f93a39b7499ad86823
+EBUILD genius-1.0.25.ebuild 1465 BLAKE2B baba62c17f47fecbe46e14213693bb28d215dd40b42836efd4915c3afd452717783dba503f94eddb73804896b570ff9fe58c3888ec6316a49846d3815e6af4a9 SHA512 844848bd820fef9b3e3acb7a42473e987e4a3f471ae0e49d06b0b03329f1dfa200c80deeae203d40c7f75a92877bb51f874b89912e23dfa1f27edeb613f258ee
 MISC metadata.xml 809 BLAKE2B 9102651076c5b608afc1fbd7a2371d771587fbdc4960e56692f0999ddbfc9bef8096e04e59c491dc7c85ce4f75ec9fb9b093f49a3e53979d62e787e13377c345 SHA512 4259f2ea73e57edc70689d48522cb28ae79443b97b25799bfda21e9114bac15ae77bc27933fd6773c99daeaa060088cb0cb0acae71acd4af81fe7ae408c9e06c
diff --git a/sci-mathematics/genius/genius-1.0.25.ebuild b/sci-mathematics/genius/genius-1.0.25.ebuild
index 8d7c54134e0c..94b9f5146e99 100644
--- a/sci-mathematics/genius/genius-1.0.25.ebuild
+++ b/sci-mathematics/genius/genius-1.0.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc +gui"
 
 RDEPEND="
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 7c56d50d32c0..9859e6665865 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,10 +1,8 @@
 AUX ginac-1.5.1-pkgconfig.patch 340 BLAKE2B 4e45d5af711f0a6bb833bd805340527be8972b8587f47ffe34b9e473b2783f6cb98af2b2397b199bfca1c7522250c68249112ac67a750ec59f31e26628978bd0 SHA512 b88c7ef69686733a3e817d9d4961246eb64aebf753b51bf8f6ea5c6fdfef41e52b6a20656e074f0bcc42dfe7965a440642d9036628a139f2c87bbde5f59d76d1
 DIST ginac-1.6.6.tar.bz2 1028211 BLAKE2B 3f939e82cfa833ee5ba6714d4db38edf80de4e380b0bcacfe23992ca3c5eefbd719506cf77f57aebc1517968eff7d26c8d24d14167c596e5e7145458367074e8 SHA512 495ef255dd32e71ee91257a515c0566e56525e0c54c8955c19beaf9e2e55457f7d8171c7e5f6e4f29f555f5d262bbaf4edf4f033166c4904c016987a5029e958
-DIST ginac-1.7.2.tar.bz2 1056339 BLAKE2B 116be56df781d6e9675f914b9f75af86736183dbd26a1ff5e7f6f3cc79e4efc31449bc4fd5454b0f73cf189749a00f071d2b7cc519005e1f3b772b6b1521d508 SHA512 5c356beb8e0830b9f5805870f67298d4c19e512db8b8f46a37b490c19179a5c99e4497439e5adb575dd97e7deb5fe0b931a4b6db80e98a8e1e6f46977e33d8cf
-DIST ginac-1.7.4.tar.bz2 1062724 BLAKE2B 742ec49629fecb14a2294ca9e8dc1df52cdad2d2e11cebbffa3c23a64592c597f872dd8294bc9324ea1f88e540f75015d09ea526ef9d67689943bb6c94325911 SHA512 740c221a0115bd233723f3032a77b1389122694b2893c52d4c7ed778c7332981c152f6ea81b35352882c14b42542f64963d5199af3f492af97f79a6e6c52156c
+DIST ginac-1.7.11.tar.bz2 1077491 BLAKE2B 741e9c8adfec15c225c3656b935707f86292b98310b50533269b238d1a9746bf54d186074c879fdbdd23f915dde225d9ee34fdbd87977835e8f9e78af364d77d SHA512 35a029915c946fcc10ba7b78df6fe1ece9a9f2f6bc172816a923c35f5b495154ab356526b904ac2a16a1bd6b0a81c480c5abb39ef40238ca7b32d1acbf97276c
 DIST ginac-1.7.8.tar.bz2 1075317 BLAKE2B 6ae917b442c090fa6c6b28f543eecfc2a8119a63d15494933f0cb1c979f018d6439551e52e92b6d50c8cf83ce2df66aca4bb6be947e5b18cbfab2539c42e0ad2 SHA512 4d5a0e52108aee2438362d66d6b5f3e3a108855fc2c0ab2bc521ddc9a2a87c9b1404ae5304ba7d1dbcf6e985bfe26c730e14f3f46d63d0bdffe242f4a948c6a0
 EBUILD ginac-1.6.6.ebuild 1400 BLAKE2B 7813592727485b9e4ffe56a4f5cbde1250823b239e621fdbbcd9485b25ab0062efc4cd09cdf2556c19fbaee1b34c8ab2b27d001f3b16c19fce5f748ad093b9ec SHA512 363562d721e28744c64b535404e8bab606c040df3d36af53b5e04156401db9c88210ed623317cd52a482b276585dc3741b3233cc0cf942abd2f1d55a790db8a3
-EBUILD ginac-1.7.2.ebuild 1525 BLAKE2B e3e152b6b92d353f6f9c596414affd9cd4ab89a30f5f9c858618b81389704ac9ed4820fe6ea523c8fa8b6cddd52fc1737b374964c3141afaba6e36ec06660c38 SHA512 4c3397f8d96b8cff7ec46318c5fbb7a60bffbecec09db1f678d6eb43efde931e2fb41e40c293e2e9a19326a482d50f8291938cdf059a2f6fc4c6c3fe8090e37a
-EBUILD ginac-1.7.4.ebuild 1578 BLAKE2B 3f44a3342aa5c36d6d6c3e00d27790a5b436b727c25baa75a9ec90544cafa077c95f86d456b4173dcbce75e6a1694398ff8a24c1f6065be16b98de3104c40d48 SHA512 34b4167b823e40bcd128bbfd97cdf6fe3bf18633fd63dea014ad807063498e7d4e5666d31c247fa4b7fe63217fa95fcbfa73186a163bcf2e19551e029413cfc4
+EBUILD ginac-1.7.11.ebuild 1628 BLAKE2B 3810a7bdde0344d086b8c00155a790e4e078aa163d4fb6645705102b97f0359d9ea39255094efec33dcaebf14e78d86c04057e73ed2272879a16773a0b41c41f SHA512 3f8db3ec36c581e6ec15f628fecc19c08816c6a90d0f0d7a279220aa1aa303115f40b5729f4febcf7a8409b42e591b6b82ee254c997c2da8df79268e1b1d139c
 EBUILD ginac-1.7.8.ebuild 1481 BLAKE2B b11bfa56f9fbff4187f0ff576ea5e82b1159ebfc0bef8c5b97f4ef5d7d370bf4fb2db87c6ddbb98c34fe238d063ea164c1bc15048a140d9abb44a0e85b18e5ec SHA512 81a14a67cbc97a05a93493f8502b56f528556b429f89f3f162dcfd73e7ee2ad84b88f88ed8b6124115dd3827c5e865317f2f6ec63dd9d95cf27bd1ba9045d20f
 MISC metadata.xml 685 BLAKE2B 78804186606452771e8b37a00dd41458fd7ffabd1813303528cda8596cebdd54c5daea16f324b7d23dfcf679255e73f1cff84116b0bf8a81cd79bb559dcd77ae SHA512 d0075823063455623b875bf678448b146243347879eb9ca5a4fb9324183d8dcda9c060145d5b874fead55491625ef08289b349b8abf1bf105e09ac9ebc647c37
diff --git a/sci-mathematics/ginac/ginac-1.7.4.ebuild b/sci-mathematics/ginac/ginac-1.7.11.ebuild
index d1ccecc918ff..bd90fbd5c1b4 100644
--- a/sci-mathematics/ginac/ginac-1.7.4.ebuild
+++ b/sci-mathematics/ginac/ginac-1.7.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+inherit multilib flag-o-matic
 
 DESCRIPTION="C++ library and tools for symbolic calculations"
 SRC_URI="http://www.ginac.de/${P}.tar.bz2"
@@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch )
 
 src_configure() {
 	append-cxxflags -std=c++14
-	econf --disable-rpath
+	econf --disable-rpath $(use_enable static-libs static)
 }
 
 src_compile() {
@@ -51,17 +51,19 @@ src_test() {
 
 src_install() {
 	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN}.la || die "cannot rm lib${PN}.la"
+	fi
 	if use doc; then
 		pushd doc > /dev/null || die "pushd doc failed"
-		insinto /usr/share/doc/${PF}
-		newins tutorial/ginac.pdf tutorial.pdf
-		newins reference/reference.pdf reference.pdf
-		insinto /usr/share/doc/${PF}/html/reference
-		doins -r reference/html_files/*
-		insinto /usr/share/doc/${PF}/html
-		newins tutorial/ginac.html tutorial.html
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/doc/examples/*.cpp examples/ginac-examples.*
+		newdoc tutorial/ginac.pdf tutorial.pdf
+		newdoc reference/reference.pdf reference.pdf
+		docinto html/reference
+		dodoc -r reference/html_files/.
+		docinto html
+		newdoc tutorial/ginac.html tutorial.html
+		docinto examples
+		dodoc "${S}"/doc/examples/*.cpp examples/ginac-examples.*
 		popd > /dev/null
 	fi
 }
diff --git a/sci-mathematics/ginac/ginac-1.7.2.ebuild b/sci-mathematics/ginac/ginac-1.7.2.ebuild
deleted file mode 100644
index 8caa65f652bf..000000000000
--- a/sci-mathematics/ginac/ginac-1.7.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="C++ library and tools for symbolic calculations"
-SRC_URI="http://www.ginac.de/${P}.tar.bz2"
-HOMEPAGE="https://www.ginac.de/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND=">=sci-libs/cln-1.2.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		   media-gfx/transfig
-		   virtual/texi2dvi
-		   dev-texlive/texlive-fontsrecommended
-		 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch )
-
-src_configure() {
-	local myeconfargs=( --disable-rpath )
-	append-cxxflags -std=c++11
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		export VARTEXFONTS="${T}"/fonts
-		cd "${BUILD_DIR}/doc/reference"
-		emake html pdf
-		cd "${BUILD_DIR}/doc/tutorial"
-		emake ginac.pdf ginac.html
-	fi
-}
-
-src_test() {
-	pushd ../${P}_build > /dev/null
-	emake check
-	popd > /dev/null
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		cd "${BUILD_DIR}"/doc
-		insinto /usr/share/doc/${PF}
-		newins tutorial/ginac.pdf tutorial.pdf
-		newins reference/reference.pdf reference.pdf
-		insinto /usr/share/doc/${PF}/html/reference
-		doins -r reference/html_files/*
-		insinto /usr/share/doc/${PF}/html
-		newins tutorial/ginac.html tutorial.html
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/doc/examples/*.cpp examples/ginac-examples.*
-	fi
-}
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 8adb05e22424..7cc581b134d2 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -2,5 +2,5 @@ AUX glpk-4.65-debundle-system-libs.patch 1930 BLAKE2B 0c265afe9338e75bb3d6536e9e
 AUX glpk-4.65-fix-mysql-include-prefix.patch 1837 BLAKE2B ecd90024e07f29e8ebb6af80b520c8f192cfea21c90d8c247001389f2ccfcf24ad487981a0cc719d1ca99e266dd2a9d66f6416d4f2d5e7c80bdf807b9bb7b74e SHA512 c74281bf3e03e136d183b562b8f682a3e1957019a36ec0c6a048049f0d5f55361107a62e36eaa9e3306a1f13df10adf55c2f54f096b6e353108856e05d9ce799
 AUX glpk-4.65-longstep_verbosity.patch 844 BLAKE2B c1d14e6dfd596694bf1da060129713eb70ceebd4b1742e8496b89c1e1bfefa5bfdf320ecb8d863aa5b5a0d9750bca8bf59b261608cc39b1d1a0b3fe3b10a7be4 SHA512 29d8e876c0d5fba14056e8f0639e3746c6f4c0eefcad284727921e0ca7184ad96b4363dfe9bfe67b74d6d9419f37d21e453e431bf53438b624c1ab0ef9fe1092
 DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
-EBUILD glpk-4.65.ebuild 1787 BLAKE2B cce26aa79190ce27f60a49f7325a2adc005ebfb47ccdc5f0b6252b87441c88af90c43cf7524e61e3b9377a9108ace3d97ce7bc3feaec51a8d4aa1ea66caba5ab SHA512 2fc117d1bff9cc476b19a0a63a12701bda56fc33c80d87bc8c8cddee34702f5dbff5ff4fe37239bf349db46443ea8e4167fc853fc9d4f9cb583587d57b2c5d60
+EBUILD glpk-4.65.ebuild 1834 BLAKE2B d6ec90c5f7e267c831733b1008e720b4f1e66dfd62ee010f6880daf58a9477d5687fdadf45635ea0e365591cf4dbb6fb88a9a185361e212989b60b13fe3cdd42 SHA512 3cee3950f88357a0984d4c28edff8daa8d470330a12901973e320c550ca2bb6ad6595f0dbea6edd1622e8209fda683f43da27267f89d687b48de95261471e6e0
 MISC metadata.xml 998 BLAKE2B 11afba9ccdd6a53cee9432201eee2ae03483da71212f1c7f9907a775e6c2fcce068648fdae87965dab7550c9157c86697802707b582589626cf48e4236aa56e0 SHA512 1ef83c282b3a6143a1e85a1ecdc55463cf5617409dc990806917077c30e4acd2663b2772bf47aa96c572ee78dab76467c10b4ae9a2705220aa6e8e4936c4f7b5
diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild
index a08a4af54c4f..30668cbb935a 100644
--- a/sci-mathematics/glpk/glpk-4.65.ebuild
+++ b/sci-mathematics/glpk/glpk-4.65.ebuild
@@ -6,13 +6,13 @@ EAPI=7
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
 HOMEPAGE="https://www.gnu.org/software/glpk/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
+LICENSE="GPL-3"
 SLOT="0/40"
-IUSE="doc examples gmp odbc mysql static-libs"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc examples gmp odbc mysql"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
@@ -21,13 +21,18 @@ DEPEND="
 	sys-libs/zlib:0=
 	gmp? ( dev-libs/gmp:0= )
 	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
+	odbc? (
+		|| (
+			dev-db/libiodbc:0
+			dev-db/unixODBC:0
+		)
+	)"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.65-fix-mysql-include-prefix.patch"
-	"${FILESDIR}/${PN}-4.65-debundle-system-libs.patch"
-	"${FILESDIR}/${PN}-4.65-longstep_verbosity.patch"
+	"${FILESDIR}"/${PN}-4.65-fix-mysql-include-prefix.patch
+	"${FILESDIR}"/${PN}-4.65-debundle-system-libs.patch
+	"${FILESDIR}"/${PN}-4.65-longstep_verbosity.patch
 )
 
 src_prepare() {
@@ -52,9 +57,9 @@ src_configure() {
 	fi
 
 	econf ${myconf} \
+		--disable-static \
 		$(use_enable mysql) \
 		$(use_enable odbc) \
-		$(use_enable static-libs static) \
 		$(use_with gmp)
 }
 
@@ -66,4 +71,7 @@ src_install() {
 		docompress -x "/usr/share/doc/${PF}/examples"
 	fi
 	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-mathematics/mathematica/Manifest b/sci-mathematics/mathematica/Manifest
index 11091d32732d..35750914fc97 100644
--- a/sci-mathematics/mathematica/Manifest
+++ b/sci-mathematics/mathematica/Manifest
@@ -1,5 +1,5 @@
 DIST Mathematica_10.3.1_LINUX.sh 3200459545 BLAKE2B 5a057b4e714eabb0afebe5a3ef536dbdc2d49a775130442e21493d6a0756527362fddfa7fabf927f996464456309c37b10b70a37f05718cb9f79d8ffc5912098 SHA512 08658a01a18c14a9b3f422816007980bf6576162e4cca6779ed1bdaf6b9748fb36a195006529ed6725f462042a264e7ee7753e802af8072ba6bebfee0cad8543
 DIST Mathematica_12.1.1_LINUX.sh 4438946649 BLAKE2B 473f814a3e0686bb3a6ac1f49c887842bc17db11439b65c1dad1dae8cd5797e6762d94bccdf156f6f9ba1edb9a16ed5172936a6884d2f0f98c29808214b1eabe SHA512 5cfdd91bae9bad53afe405b40759732589119256c3f785058808b20faf21f593d90bf7bb2dbaccf3e983aa84ff380a1fa6d40fd63f5ba17109c1cd6818c63490
-EBUILD mathematica-10.3.1-r1.ebuild 2623 BLAKE2B ea4a2ffd01c5acde572183947566eba260bef8181a1b120be2c5b06ba12bec7f19b2ce0640baa0ebd0274dd15e9b7f5f81daa9de97aa4e7f9a16eef2f0367061 SHA512 86b1929d30ab0a06a1337480c1c974eda2bb2814009631673898d5bad03824b983c2a844954203c26aaa145bd896f6c42a53b78fb6b52f645ae8ee87993dbeb5
-EBUILD mathematica-12.1.1.ebuild 2623 BLAKE2B ea4a2ffd01c5acde572183947566eba260bef8181a1b120be2c5b06ba12bec7f19b2ce0640baa0ebd0274dd15e9b7f5f81daa9de97aa4e7f9a16eef2f0367061 SHA512 86b1929d30ab0a06a1337480c1c974eda2bb2814009631673898d5bad03824b983c2a844954203c26aaa145bd896f6c42a53b78fb6b52f645ae8ee87993dbeb5
+EBUILD mathematica-10.3.1-r1.ebuild 2821 BLAKE2B 958869840413f275d50272636693c776ac399cc14401d21d8709aab81ec23f396b0407618b787a4c04fe5a70327c604bef81735f6fcdeb8cbbaf6b74cf387172 SHA512 ac52970098b31e2e1a72d50dffc0db3cfe67c68eed8272b1d78febe5e47eb514b333c23a9c5f7030bb606f937106b5a237818d9ab829779533e33f5459d2aeb2
+EBUILD mathematica-12.1.1-r1.ebuild 2821 BLAKE2B 3433f43e527bb9efbd07b2d0768ce324a2097b2813c412dd6fa15fd6644d298a2f621fee9fc810548f72fb133086179d539645bcf7c5c68fb337109014690b1d SHA512 4883533ccf4df1ae99fe265e497f16b0c33202f921dc77a55fc9a33f54d65ade2efc020bd01998c11fa2159a8e9a37c936d7b1d39f40af9163bb6853359a7f08
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild b/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
index 51e74ad3cc99..6abf0f35a7dd 100644
--- a/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
+++ b/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib versionator xdg
+inherit desktop multilib xdg
 
 DESCRIPTION="Wolfram Mathematica"
 SRC_URI="Mathematica_${PV}_LINUX.sh"
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.wolfram.com/mathematica/"
 LICENSE="all-rights-reserved"
 KEYWORDS="-* ~amd64"
 SLOT="0"
-IUSE=""
+IUSE="+doc"
 
 RESTRICT="strip mirror bindist fetch"
 
@@ -26,8 +26,9 @@ RDEPEND="
 
 # we need this a few times
 MPN="Mathematica"
-MPV=$(get_version_component_range 1-2)
+MPV=$(ver_cut 1-2)
 M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel WolframScript math mathematica mcc wolfram"
+M_TARGET="opt/Wolfram/${MPN}/${MPV}"
 
 # we might as well list all files in all QA variables...
 QA_PREBUILT="opt/*"
@@ -35,12 +36,21 @@ QA_PREBUILT="opt/*"
 S=${WORKDIR}
 
 src_unpack() {
-	/bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die
+	/bin/sh "${DISTDIR}/${A}" --nox11 --confirm -- -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die
 }
 
 src_install() {
 	local ARCH='-x86-64'
 
+	einfo 'Removing MacOS- and Windows-specific files'
+	find AddOns SystemFiles -type d -\( -name Windows -o -name Windows-x86-64 \
+		-o -name MacOSX -o -name MacOSX-x86-64 -\) -delete
+
+	if ! use doc; then
+		einfo "Removing documentation"
+		rm -r "${S}/${M_TARGET}/Documentation"
+	fi
+
 	# move all over
 	mv "${S}"/opt "${D}"/opt || die
 
@@ -51,7 +61,7 @@ src_install() {
 	for name in ${M_BINARIES} ; do
 		einfo "Generating wrapper for ${name}"
 		echo '#!/bin/sh' >> "${T}/${name}"
-		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /opt/Wolfram/${MPN}/${MPV}/Executables/${name} \$*" \
+		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /${M_TARGET}/Executables/${name} \$*" \
 			>> "${T}/${name}"
 		dobin "${T}/${name}"
 	done
@@ -61,17 +71,16 @@ src_install() {
 	done
 
 	# fix some embedded paths and install desktop files
-	insinto /usr/share/applications
-	for filename in $(find "${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name "wolfram-mathematica.desktop") ; do
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica.desktop") ; do
 		echo Fixing "${filename}"
 		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
 		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
-		doins "${filename}"
+		domenu "${filename}"
 	done
 
 	# install mime types
 	insinto /usr/share/mime/application
-	for filename in $(find "${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name "application-*.xml"); do
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do
 		basefilename=$(basename "${filename}")
 		mv "${filename}" "${T}/${basefilename#application-}"
 		doins "${T}/${basefilename#application-}"
diff --git a/sci-mathematics/mathematica/mathematica-12.1.1.ebuild b/sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild
index 51e74ad3cc99..b15d9ff67885 100644
--- a/sci-mathematics/mathematica/mathematica-12.1.1.ebuild
+++ b/sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib versionator xdg
+inherit desktop multilib xdg
 
 DESCRIPTION="Wolfram Mathematica"
 SRC_URI="Mathematica_${PV}_LINUX.sh"
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.wolfram.com/mathematica/"
 LICENSE="all-rights-reserved"
 KEYWORDS="-* ~amd64"
 SLOT="0"
-IUSE=""
+IUSE="+doc"
 
 RESTRICT="strip mirror bindist fetch"
 
@@ -26,8 +26,9 @@ RDEPEND="
 
 # we need this a few times
 MPN="Mathematica"
-MPV=$(get_version_component_range 1-2)
+MPV=$(ver_cut 1-2)
 M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel WolframScript math mathematica mcc wolfram"
+M_TARGET="opt/Wolfram/${MPN}/${MPV}"
 
 # we might as well list all files in all QA variables...
 QA_PREBUILT="opt/*"
@@ -35,12 +36,21 @@ QA_PREBUILT="opt/*"
 S=${WORKDIR}
 
 src_unpack() {
-	/bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die
+	/bin/sh "${DISTDIR}/${A}" --nox11 --confirm -- -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die
 }
 
 src_install() {
 	local ARCH='-x86-64'
 
+	if ! use doc; then
+		einfo "Removing documentation"
+		rm -r "${S}/${M_TARGET}/Documentation"
+	fi
+
+	einfo 'Removing MacOS- and Windows-specific files'
+	find AddOns SystemFiles -type d -\( -name Windows -o -name Windows-x86-64 \
+		-o -name MacOSX -o -name MacOSX-x86-64 -\) -delete
+
 	# move all over
 	mv "${S}"/opt "${D}"/opt || die
 
@@ -51,7 +61,7 @@ src_install() {
 	for name in ${M_BINARIES} ; do
 		einfo "Generating wrapper for ${name}"
 		echo '#!/bin/sh' >> "${T}/${name}"
-		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /opt/Wolfram/${MPN}/${MPV}/Executables/${name} \$*" \
+		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /${M_TARGET}/Executables/${name} \$*" \
 			>> "${T}/${name}"
 		dobin "${T}/${name}"
 	done
@@ -61,17 +71,16 @@ src_install() {
 	done
 
 	# fix some embedded paths and install desktop files
-	insinto /usr/share/applications
-	for filename in $(find "${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name "wolfram-mathematica.desktop") ; do
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica.desktop") ; do
 		echo Fixing "${filename}"
 		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
 		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
-		doins "${filename}"
+		domenu "${filename}"
 	done
 
 	# install mime types
 	insinto /usr/share/mime/application
-	for filename in $(find "${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name "application-*.xml"); do
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do
 		basefilename=$(basename "${filename}")
 		mv "${filename}" "${T}/${basefilename#application-}"
 		doins "${T}/${basefilename#application-}"
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index f9e573fe561a..7791eccd29b4 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -17,9 +17,9 @@ DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a
 DIST maxima-5.42.2.tar.gz 41840181 BLAKE2B bca8a94366f1fe2f508436fdef8de80107b19c9b267a4b72dc6f56870078d35b3feb7dbdda384589b38c5351d6eeede1b9738a5ec2152063de2afacd1ced48c4 SHA512 5033b02272121f6aacff5ededf90eaad5e644a06d0c62aafd745401c08429da979ecd8274f7aa12596a0e32ddb614659af14e4273f59d372fe1ecbec081e7829
 DIST maxima-5.43.2.tar.gz 40871773 BLAKE2B a00a6ca06159d5acde195d9dc0f59d3a4b72738b2690997c18a9d1b2c642983b3a2005aee98544d4f45d8bc9ee5d9c6b0e43e4be40df4224b0174662bd75f71d SHA512 b2503440b2c4d515de9a39dd6acbe1c8dfae5daf083c47b6af2ffce381ad48923d1fa4e5f25ec1dc0621ad592b23cebc4c456b8ee2ee52bea958df6fb9df26fd
 DIST maxima-5.44.0.tar.gz 34976354 BLAKE2B d6870b6fb0581d9e60d6ed97c7daed8ce12b8b1ae49d0edb7b8d31dd723f9b879eb70440659ff958f53cee16d8d2a92f80dcaa3898d9f6dbabd79a5059073a65 SHA512 1e043bebb7c6d002c113d8de20a98d58d1a8e7bedfc9bcf52819e7c7554655991dc2f42f0333889706574249736db833a237b3e59b967e7e42ede28262e31f2f
-EBUILD maxima-5.38.1.ebuild 4833 BLAKE2B 2c5ebe02be239596fbc93f30c9e135eac32f50a968283a18584d05c3739136d5f0bd1bcb4ce6e810016bb0d66f1e46139e7d208cc381a704a027bc3c99ace3b8 SHA512 cb3273aaaae70bff0b29ed8c9eee4e4aba0fe7b49cdf3249f478c4016be8ea2610adbb15490b1852f11c9f51beaf7bd5d62eb9ff9c53f9c4a541c7af52dbea93
-EBUILD maxima-5.42.1.ebuild 4917 BLAKE2B a8d765381cd94518b530811e67ca3c47899af78db8e0ac524c490619885944189fecff035b6f7dfcdd3fb5abdd94c40b62a8b97e1819544fbbc7120ea1bf075f SHA512 ad0e0c1d56cab25e2b3c0f494b2746c1dc7e670e02e6f002bf4a4e6728daefd7c975142cd22741347c11ea4e8c2262780c3e88f9adb86fdbe135031ca3a28759
-EBUILD maxima-5.42.2.ebuild 4920 BLAKE2B 200ad44b31fd224c37c302aa4dcfb6b46a83d7cf462d1aaaaf933f91d753d8375914ad0b6f254f3c8f4eae4f89b0bbdf1885c3e943cbe8587ccfb93999a4204f SHA512 6fdbedf61012c414dad5e9d2dbf6e705967d43dfced240a4378dd523aba99e51082cd4bce283c683192f780854a1f694461ef4600b49415ef33503a8f1d03c2e
-EBUILD maxima-5.43.2.ebuild 4981 BLAKE2B 1533fed6bce9d74afa336783ae413a1ce282d1e84887b226c57d67da6afc2a909ac7ab0d23b31145098e9dc5270c12a5e29dd0bc7668e7ff12745d8277c9d90a SHA512 045f36bc99313f2d8e065ce5c450e346701e88ddf9a8f0f8fff05505ed141896c72fc413b233e651645bf72c5ae6079d782abf090f323550a353ffc50243459a
-EBUILD maxima-5.44.0.ebuild 4756 BLAKE2B fa4d2d41abf5630cd8d25f0c3923c6a8da2bbe569db90fa3c7aa6e8ed69d1a669b16194b69290502f56783085d845c2ad2284422f315d7d45fcd357004ffde3c SHA512 1160a0a8d6620e910d12225917a23024843706791fe0a02f983d0d0507b8da847cfe0fd2c44f7a9ca6f40b0f8a5f8f715d13570eb4428e1311a3f932cb447cb3
+EBUILD maxima-5.38.1.ebuild 4811 BLAKE2B 8293968748eaa4f0cfbefda5bb33e6c7ee15b30b51a2b37380399f1d7b46b4b062832f35a75952b732ab238dc7e45649efb0df07d91a1b9a12d806040be108cc SHA512 e9a43d569928453e41bffd6d59a44517d433fc0fc7c1462e623ab82fdfed73bc21a2e7830a5d7b99d094d644b84f23f7b41921130e74c41624ad86836654f44a
+EBUILD maxima-5.42.1.ebuild 4895 BLAKE2B dd388cfe14cef36137a91ff71912c23390e176d796ce02c36f59cbb1e8993a03b16ee32b4e6d792e59d95bad3bcd90e3e9ded23abb1e3c371f466bd53f44502c SHA512 64c8a759525fff99c99831be56ea268b213392c65b1ef2e9db133addfaefead39710264c6a599eee7c53262ef16f75fbdbb35a9516a7054f0934d6fd46303520
+EBUILD maxima-5.42.2.ebuild 4898 BLAKE2B e3ff4af436e237e7bfb3d0fa45a730e87b5e0d90b479893f10ef089e04b884f555db98a41cd0f65c58f6e530dc8d02fddb0c6ebca82a139c596d9ff0dcee3d90 SHA512 f49e865243b9a8bbbfe51b7131dc9afcc3f312138b540c8617e396f72ea50a2ae61412a251dd002c8c9dd43a2166a621d6a10d3f50e189bff33e112cf2266048
+EBUILD maxima-5.43.2.ebuild 4959 BLAKE2B 0034cefd2c30e8adcfd4e278fa5ff4192cc5eaac75ea3f0c759b6cf0b396e1afe1625f66ad3b923c55d69e582debdf7ffacdbdd564c12dbf55f8fe17111cf528 SHA512 bf67bd46fe364e533ddfc80c145b6dfcd12c6b84ee54afc44ddf9d22e59e011471af338602c375806083bdaddf364c5addec8f76db87d4bd3c68e1128364830f
+EBUILD maxima-5.44.0.ebuild 4734 BLAKE2B dcd011520dd59a9d31f0e652c8f6c2d71ab8d4b60ba188c85f87a5c95dc2585edaa9338c8e841c819e5ffc1185e7e5c9817097ac0bebb206105528263efe6435 SHA512 0a996621e2ac31d3104690d1184e18493095f709de2fab773f7a0147cfdbedb4570c8afdfaee4564ad6677ec2076626d7c2a056b17787d4e2ee6e65dc7faba3e
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/maxima-5.38.1.ebuild b/sci-mathematics/maxima/maxima-5.38.1.ebuild
index a97ec7dee443..5725c52e4060 100644
--- a/sci-mathematics/maxima/maxima-5.38.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.38.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 # Supported lisps
 LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
diff --git a/sci-mathematics/maxima/maxima-5.42.1.ebuild b/sci-mathematics/maxima/maxima-5.42.1.ebuild
index 215a11d12fe9..fa012edc92b3 100644
--- a/sci-mathematics/maxima/maxima-5.42.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.42.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 # Supported lisps
 LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
diff --git a/sci-mathematics/maxima/maxima-5.42.2.ebuild b/sci-mathematics/maxima/maxima-5.42.2.ebuild
index 17150f7e4e35..68329d1041c7 100644
--- a/sci-mathematics/maxima/maxima-5.42.2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.42.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 # Supported lisps
 LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
diff --git a/sci-mathematics/maxima/maxima-5.43.2.ebuild b/sci-mathematics/maxima/maxima-5.43.2.ebuild
index d139d3dcda03..4952aea0d09e 100644
--- a/sci-mathematics/maxima/maxima-5.43.2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.43.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 # Supported lisps
 LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
diff --git a/sci-mathematics/maxima/maxima-5.44.0.ebuild b/sci-mathematics/maxima/maxima-5.44.0.ebuild
index af3557fd4f39..6588716b4947 100644
--- a/sci-mathematics/maxima/maxima-5.44.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.44.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 # Supported lisps
 LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
diff --git a/sci-mathematics/nestedsums/Manifest b/sci-mathematics/nestedsums/Manifest
index 5596c5111021..b2c877695477 100644
--- a/sci-mathematics/nestedsums/Manifest
+++ b/sci-mathematics/nestedsums/Manifest
@@ -1,3 +1,3 @@
 DIST nestedsums-1.5.2.tar.gz 511806 BLAKE2B 9c40f4b3405134ea058aad356e131b29f7f0a058b68ed3081bbcc51d451e850bccd8ec26448a8ac391524913da7eccbce4fae1b9e4119c8692b8fca59a17d885 SHA512 2b7dd54e02695a741bbe8cc0b45a3804dc7c1cb6d0b46ad7c152489e952718b438b84d60b844ff0ed92b32c78186dac2d4ee8e705ad82f965bbec923c1970d33
-EBUILD nestedsums-1.5.2.ebuild 827 BLAKE2B 2a8fa6a9d64e94d08ca0fa3756b211aac0c3af1eddb14af56e7f1fec6f9c518358ba03922f53842ca9e3ad0e5ede5f74d90b96587bf88776450799590c3c8e54 SHA512 55a253f7fbb5b2bd579eefbc88cf5f86cbddb5fda9fc396a119f9ddd360dcb0cc1ca4bd5ab653494d66ee367d1e0287f00d52de3a0269712b68bc4538c1db099
+EBUILD nestedsums-1.5.2-r1.ebuild 996 BLAKE2B 859641ac39630571df447b112d3e2a85afd9e2a75b42f68c25cf946aabfc69df6e9a24bb419b3309a2ebd265e009c04aa6c95531bdfcb07b7b47ebf21a01d85e SHA512 1b56798b8eb0f3dde04b62e9d7a6250c2687a95dc17e45ffa8c33325d604a68c7ab94f05f80c2bb264181ff347892e8759bb4c5ce40e663c067e9d54d16cb51e
 MISC metadata.xml 501 BLAKE2B dd148f912baaaece32f3d6ebc779762b01496f1384f88a54e83c98e9f6a913d52e1dd6da962ae64a3a223846d83d4597cba0ced20c6ea6c7fc35775f7376d1f2 SHA512 5869e4268ec16289d392ec2911f1297e19e06cff94b8dac6f4cf57adaeb9fba1dba8853433bed1154a3bd2048cf5b762d6560a70a30fb5de230b5ce6ce1b775c
diff --git a/sci-mathematics/nestedsums/nestedsums-1.5.2.ebuild b/sci-mathematics/nestedsums/nestedsums-1.5.2-r1.ebuild
index 3f4b9497fb6b..99a09d617d4b 100644
--- a/sci-mathematics/nestedsums/nestedsums-1.5.2.ebuild
+++ b/sci-mathematics/nestedsums/nestedsums-1.5.2-r1.ebuild
@@ -3,19 +3,24 @@
 
 EAPI=7
 
-inherit flag-o-matic
+inherit multilib flag-o-matic
 
 DESCRIPTION="A GiNaC-based library for symbolic expansion of certain transcendental functions"
 HOMEPAGE="https://particlephysics.uni-mainz.de/weinzierl/nestedsums/"
-IUSE="doc"
+IUSE="doc static-libs"
 SRC_URI="http://particlephysics.uni-mainz.de/weinzierl/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RDEPEND=">=sci-mathematics/ginac-1.7"
+RDEPEND=">=sci-mathematics/ginac-1.7[static-libs=]"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
+src_configure() {
+	append-cxxflags -std=c++14
+	econf $(use_enable static-libs static)
+}
+
 src_compile() {
 	default
 
@@ -30,7 +35,7 @@ src_test() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/lib/*.la
+	rm "${D}"/usr/$(get_libdir)/lib${PN}.la || die "cannot rm lib${PN}.la"
 	dodoc AUTHORS ChangeLog
 
 	if use doc; then
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index a1cd6144e538..d0365faad5c1 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -5,5 +5,5 @@ AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.11.4.tar.gz 4445000 BLAKE2B e910783186eeb71e74a369681c113b77271abd7f87d7a9f366aea83f36ab984f02e312cd451fad7ee6efb2fa285780e8fa78540bb1fd4b135a62d265176c80e0 SHA512 1312f452244cd1d814a1e43e108378c956669b614845f21199b7039fe6462881168983d4badb8a80bb1bac202cd82d92788a2b4f3c23d16f993cae6e251c4fe1
-EBUILD pari-2.11.4.ebuild 3318 BLAKE2B 12d63e5caa4a9c23053bd5d86756dec39cc36b8a614efa123150edb0ed7ef411f71b521905f916ec814e3105b0e9b0d837a044a14086efeb04e2fd8e9b5f222c SHA512 e79121ab53c3bc7755907535a0bb8f62ee9734d8cce559bac9cbc309da9a4fff7a7e264ad77b2e4fdb3be52f8de582a7d3faf17c347841727e36e684f6aa2e86
+EBUILD pari-2.11.4.ebuild 3294 BLAKE2B 8656b6ec3b21763250c075f024c27786756a693c4ba365aa216547134734f91103c5ad38a03cf1ee0ee34c6564823d3f8deb2f75b1c3dd35aed1bf33ced1ee2b SHA512 fcc513c16a48d2d8cdc4b47f7f5d8799fe59b03fe593379b8c4b5f4ab60d9d5d6f6bd75de09cfccbd5a04783b36ef7ad93ccbfd0c8a57d0cca29ceb69db4cb07
 MISC metadata.xml 1734 BLAKE2B ffb61a9e3818ed778cd30e0b41279413fec1e624aef0c490e71f501b9797703bbd24413b180b588896d6d74af988e6102f58a04fc1c645f2b876ac2731a399c1 SHA512 b5caa3c3b98405d89681fb25c97dabb3302e971c68fda94e337b10dfc14761963ea548b4689ccb4ac59661425a85a53ea0d424b6acb35a475f42ef145ce9060e
diff --git a/sci-mathematics/pari/pari-2.11.4.ebuild b/sci-mathematics/pari/pari-2.11.4.ebuild
index 83c80f0b2269..83c7847848a6 100644
--- a/sci-mathematics/pari/pari-2.11.4.ebuild
+++ b/sci-mathematics/pari/pari-2.11.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 9e8a45e50785..a637da34bf58 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -10,6 +10,8 @@ AUX rstudio-1.2.5033-paths.patch 6055 BLAKE2B 1c389cbd2980031080955c104e614d2bbc
 AUX rstudio-1.2.5033-prefs.patch 3684 BLAKE2B dfa5f7289a7e752704b6481dd6e02f8e88a91aaa36b25c91e8154f17bf3fbfcb2b674fcc790a82ae14deb0718b1d001f4931de6d6ccb99d1ed4dc9c8e71d6149 SHA512 86436aec19da35d99ec64ad1d4c243efad85a277ee72c2eaf94627c49389ba8d4bc626177a9d599bb95d00bc3e66210472e11a5ff38ed74a7a353a719f64fe4d
 AUX rstudio-1.2.5042-R-4.0.0.patch 3516 BLAKE2B ee54ab84f373c2d89c9bac238cbb500e10e542953522dede105885675e7cae319a5cd99ebd9cbceab903532925b950e827ab218cae8ce91ca58b0221ec223659 SHA512 872335efd1fbd8ec01c812ce652285220dda0ab9b53a0a044758ea7d7798a37ab3969e5c82e909139591f18716b0fd50538ec3ae264946ecd037b6bb1f84af38
 AUX rstudio-1.2.5042-boost-1.73.0.patch 728 BLAKE2B 675e5ff75ce5c3242bff5d92b32ca6391e8ceb68c504c2f161f2f30c083ae842e5e9a9c519e848595704bb6d639c5a8dc13a296dcfa445db19295f8ee78168e0 SHA512 214751fff5b027f407b093f397e70e701ed9016451a3972b240dcd4999d9b27a1309b47fb22a9f4f3944c47dc6de6bd8f1165a70a7046b5133bd88923d1b46a6
+AUX rstudio-1.3.1056-R-4.0.0.patch 1900 BLAKE2B 6429fd40c65a67a8159fda98b517f37133ff070b0b4885e14cbe9acf20516263407e4b5c96833dd6bacaf5f58cf74d65da701e52cf91c38de94c55bfa765647e SHA512 1c7ce8791b6c2f04dbad875433620efacef309b5b84d0c461617b5c52661634ca80e40d9a0fa94e606f992289972f3ce4ae015333de7f4c52b3d498e97746920
+AUX rstudio-1.3.1056-boost-1.74.0.patch 1126 BLAKE2B 289631a75eed12417f0091e20d393ce4687a849bfef47f3665c5cfc4d17da8ed9894e4bbded43c39255d58db021fc765e9f66ea0cdbcfe7cec463e271ee71c8e SHA512 c2ad2c189b845002f2b65dcdf3f7f093381759e294fec70148312a5cc5096ed9a1d47fb57d7e9f6c9b7efe174751c4d94dffd4060fc352a986c5c835d23ac5fa
 AUX rstudio-1.3.959-R-4.0.0.patch 3514 BLAKE2B 9cdadbf402f4f90f9b6e43155ec22d0bf22bcd33c817b7ce67646895b3d5672e5fe412e2ea891d6997ad4eb76dc4c514cb5f8ab06467e4c79c52875476bac7d1 SHA512 59b80b284bac4f1435a160c07a7959a4db4c7c3474d13c1c0e90f5bee34b017fd507618914fd249c14fef41535c06e78dfed22860c104c679e95a4782b1bfac3
 AUX rstudio-1.3.959-core.patch 7302 BLAKE2B eceff2aa67fc1a1cb36433bfa0956a4a45da3a017f80987e14893018737b3fc40cf1bbf9641e900311db3f5182828b11452c960b40c4e20ed83e5c3692e458bd SHA512 cf4e0682e3961c1208f14055bc604c2b8b8cc6db955216858ef4d95ca91154ab4d1eef58fcb5cdea84b2b755c98cd837b9028dad1520dd9dba222a45074a68f8
 AUX rstudio-1.3.959-pandoc-mathjax.patch 1997 BLAKE2B 71d40c2299b0598f9687175fe464d334e821762972dc0c4027f71c124eef2fd6795030c4426cec56c6b4fe81b8b72598f97214bab1d2b2b2a4c0c551cc1421a7 SHA512 6a5a76898500d3a8a20636a3854d459e5b8d806f68b0a4a08fcf3dae98feeebe751c14a7e4f8275c02ad47de9795168d90505d4dada19ccbdfbef0e07229cb66
@@ -22,8 +24,10 @@ AUX rstudio-server.service.in 161 BLAKE2B 0be9cb83304063c9123c6fa13b7751b2f848ad
 DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9
 DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf
 DIST rstudio-1.2.5042.tar.gz 20456999 BLAKE2B 3251ab2511daefefa395256fedb273ecc36dbc8118457474e3647f7616baea91301e597896582ad4b191195fc7baf17645c4c25b9a957a0c17a6251151b1dd87 SHA512 e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9
+DIST rstudio-1.3.1056.tar.gz 89584544 BLAKE2B 0e758ad97f9faa2d3932a49dafd92bc21199a5c0a20e2d8480267ebbb7cd11dc38596b4bb697e04add7bfe6b126f7b2ae6675040a0ac8caca5a5cf737f5ad6eb SHA512 8a9077c2ae021e0cf4cca41b374a50534087b35fd2c1e4b18bdd5ba3672e1ab275046e483ec8a3aba729a8e39f961149fb03a053ea005d8a32873b51201baca2
 DIST rstudio-1.3.959.tar.gz 89639419 BLAKE2B d45b2c1b0e426ddb5a945e59a8127ddfd47f6230ef0929639c4b525382ae57437a273df6ade85cfbf3a29911cf0158ee2e0808bfa94e783d70d4615f6c228f31 SHA512 e5d8bfe16011790ff4723c731043f44070d8fe48f85c5a9ab8389c9a2b7a1d3813e9362063ec4c6a6ca3b0a0857e2190481cbb74191650a129c0d2e10b342fac
 EBUILD rstudio-1.2.5033.ebuild 7256 BLAKE2B 5b6481bbe0d02d6751ab19df0ac2a12e8d71399cb13999d65f1c6b0ce2fab49eb0ad7e55b458933d6c3fc2490f2ecc2a5e4e0c5b41c7e36a978bf825bc27f8c5 SHA512 14a307c42c979fb18c19ccf0bb68322d9382dba785421120c21c77aac666b0517e069cb60f408baa53c349c1f3b6f8ab2a59db442ec377a244ce462b395ddb1c
 EBUILD rstudio-1.2.5042.ebuild 7256 BLAKE2B 24303ced907ff45ff66fbab6638f7bda958849ae977e0b3f37e00eb396b7ff6169ae7e10b2285c804e9cec2131cce8d45bfa8197096774fef06fc859460c5aad SHA512 f5c36843edbd62a80891b1a148081e163254fcdbdc94aafd4c9051992d63704dc360c0ee129ba92b9cc0a63e39c8cf6be258606db3b1a8831f1ee8a7110ad08c
+EBUILD rstudio-1.3.1056.ebuild 7067 BLAKE2B 3e9c18d653602ad25aaa3dfd9bfbdeb34260bfe4464559c9a8ade653e5487f89d0cf043549ae212c68542f6e1fa53fab14a733f1175189af81c9daf0e019906c SHA512 e5450ef5bb210f02f7250bfb21492f94c9a694f5e59e23fe3437da91f18d34d7036de6b64cb7ef14d61f771ee18fe311b421b8dc8204b44c87356fb35f5d5263
 EBUILD rstudio-1.3.959.ebuild 7047 BLAKE2B 78861c03e1b7aff68ba63cc00503e09eca8d67b77df12161f8bed33d226440fc70e76b584cfb4a6236836250791d6d50f127c57c9ffc36add95866db7b19ca5e SHA512 0ae6d91439d4fb22eb27d9e58d9d5bf05f6cb063e947f4431593f9cb5c60b85e9e817cd668cb1a5d8313d74ed6cb6f0136ef370a45ef4da7f1f17a9e7c8ba0ca
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/files/rstudio-1.3.1056-R-4.0.0.patch b/sci-mathematics/rstudio/files/rstudio-1.3.1056-R-4.0.0.patch
new file mode 100644
index 000000000000..662089e93a01
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.3.1056-R-4.0.0.patch
@@ -0,0 +1,58 @@
+From 71b1a935762efd24a79de193662450de5a89f67e Mon Sep 17 00:00:00 2001
+From: Jonathan McPherson <jonathan@rstudio.com>
+Date: Tue, 14 Jan 2020 12:53:20 -0800
+Subject: [PATCH] use R_NoSave over R_Slave for R 4.0+
+
+---
+ src/cpp/r/CMakeLists.txt             | 12 ++++++++++++
+ src/cpp/r/config.h.in                |  8 +++++++-
+ src/cpp/r/session/REmbeddedPosix.cpp | 20 ++++++++++++++------
+ 3 files changed, 33 insertions(+), 7 deletions(-)
+
+diff --git a/src/cpp/r/CMakeLists.txt b/src/cpp/r/CMakeLists.txt
+index 6984ae309c..29784b8b67 100644
+--- a/src/cpp/r/CMakeLists.txt
++++ b/src/cpp/r/CMakeLists.txt
+@@ -15,6 +15,18 @@
+ 
+ project (R)
+ 
++# find the version of R in play
++find_package(LibR REQUIRED)
++execute_process(
++    COMMAND "${LIBR_EXECUTABLE}" "--vanilla" "--slave" "-e" "cat(as.character(getRversion()))"
++    OUTPUT_VARIABLE LIBR_VERSION)
++
++# parse and save the R version to a variable
++string(REPLACE "." ";" R_VERSION_LIST "${LIBR_VERSION}")
++list(GET R_VERSION_LIST 0 R_VERSION_MAJOR)
++list(GET R_VERSION_LIST 1 R_VERSION_MINOR)
++list(GET R_VERSION_LIST 2 R_VERSION_PATCH)
++
+ # include files
+ file(GLOB_RECURSE R_HEADER_FILES "*.h*")
+ 
+diff --git a/src/cpp/r/config.h.in b/src/cpp/r/config.h.in
+index 6ba67c8e09..00bc8b6191 100644
+--- a/src/cpp/r/config.h.in
++++ b/src/cpp/r/config.h.in
+@@ -1,7 +1,7 @@
+ /*
+  * config.h.in
+  *
+- * Copyright (C) 2009-12 by RStudio, PBC
++ * Copyright (C) 2009-20 by RStudio, Inc.
+  *
+  * Unless you have received this program directly from RStudio pursuant
+  * to the terms of a commercial license agreement with RStudio, then
+@@ -16,4 +16,10 @@
+ 
+ #cmakedefine PANGO_CAIRO_FOUND
+ 
++// Important: These variables represent the version of R found during
++// compile/link time, NOT the version of R present at runtime.
++#define R_VERSION_MAJOR ${R_VERSION_MAJOR}
++#define R_VERSION_MINOR ${R_VERSION_MINOR}
++#define R_VERSION_PATCH ${R_VERSION_PATCH}
++
+ 
diff --git a/sci-mathematics/rstudio/files/rstudio-1.3.1056-boost-1.74.0.patch b/sci-mathematics/rstudio/files/rstudio-1.3.1056-boost-1.74.0.patch
new file mode 100644
index 000000000000..2fde3119e2a4
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.3.1056-boost-1.74.0.patch
@@ -0,0 +1,30 @@
+--- rstudio-1.3.1056-orig/src/cpp/core/file_lock/FileLock.cpp	2020-07-08 08:25:03.000000000 +1000
++++ rstudio-1.3.1056/src/cpp/core/file_lock/FileLock.cpp	2020-07-17 18:01:57.016882590 +1000
+@@ -26,6 +26,7 @@
+ #include <core/system/Environment.hpp>
+ 
+ #include <boost/algorithm/string.hpp>
++#include <boost/bind.hpp>
+ 
+ // borrowed from SessionConstants.hpp
+ #define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"
+--- rstudio-1.3.1056-orig/src/cpp/core/HtmlUtils.cpp	2020-07-08 08:25:03.000000000 +1000
++++ rstudio-1.3.1056/src/cpp/core/HtmlUtils.cpp	2020-07-17 18:01:58.129886387 +1000
+@@ -19,6 +19,7 @@
+ 
+ #include <boost/format.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
++#include <boost/bind.hpp>
+ 
+ #include <core/Base64.hpp>
+ #include <core/FileSerializer.hpp>
+--- rstudio-1.3.1056-orig/src/cpp/r/session/RStdCallbacks.cpp	2020-07-08 08:25:03.000000000 +1000
++++ rstudio-1.3.1056/src/cpp/r/session/RStdCallbacks.cpp	2020-07-17 18:32:09.044071640 +1000
+@@ -19,6 +19,7 @@
+ 
+ #include <boost/function.hpp>
+ #include <boost/regex.hpp>
++#include <boost/bind.hpp>
+ 
+ #include <r/RExec.hpp>
+ #include <r/ROptions.hpp>
diff --git a/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild
new file mode 100644
index 000000000000..49d75885be5f
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils cmake pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
+
+# TODO
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+GIN_VER=2.1.2
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
+# It should be PANDOC_VER=2.7.3 however >=app-text/pandoc-2.7.3 is not yet in portage
+PANDOC_VER=1.19.2.1
+# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
+QT_VER=5.12.6
+QT_SLOT=5
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated libressl server"
+
+RDEPEND="
+	>=app-text/pandoc-${PANDOC_VER}
+	dev-java/aopalliance:1
+	dev-java/gin:2.1
+	dev-java/javax-inject
+	=dev-java/validation-api-1.0*:1.0[source]
+	dev-haskell/pandoc-citeproc
+	dev-lang/R
+	dev-libs/boost:=
+	>=dev-libs/mathjax-2.7.4
+	sys-apps/util-linux
+	sys-devel/clang:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( sys-libs/pam )
+	)
+	dedicated? ( sys-libs/pam )
+	dedicated? (
+		sys-libs/pam
+		acct-user/rstudio-server
+		acct-group/rstudio-server
+	)
+	server? (
+		acct-user/rstudio-server
+		acct-group/rstudio-server
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.959-prefs.patch
+	"${FILESDIR}"/${PN}-1.3.959-paths.patch
+	"${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch
+	"${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
+	"${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch
+	"${FILESDIR}"/${PN}-1.0.44-systemd.patch
+	"${FILESDIR}"/${PN}-1.3.959-core.patch
+	"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
+	"${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch
+	"${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	mkdir -p dependencies/common/dictionaries
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
+	sed -i \
+		-e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
+		src/cpp/server/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v${PV}
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 5a4dee980c998d9a270a83b582b367126f3914cf@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| die
+
+	eprefixify src/gwt/build.xml
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
+	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
+	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		-DRSTUDIO_USE_SYSTEM_BOOST=TRUE
+		)
+
+	if use !dedicated; then
+		mycmakeargs+=(
+			-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+			-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	local JAVA_ANT_REWRITE_CLASSPATH="yes"
+	local EANT_BUILD_XML="src/gwt/build.xml"
+	local EANT_BUILD_TARGET="clean"
+	java-pkg-2_src_compile
+
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake_src_install
+	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update ;}
+}
+
+pkg_postrm() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update ;}
+}
diff --git a/sci-mathematics/sympow/Manifest b/sci-mathematics/sympow/Manifest
index b97c2cec1e77..b7c06ee170f3 100644
--- a/sci-mathematics/sympow/Manifest
+++ b/sci-mathematics/sympow/Manifest
@@ -1,5 +1,5 @@
 AUX sympow-2.023.6-dont-force-O3.patch 2145 BLAKE2B 711d252e625690400ee7215f9f8d4e7c695945101d2114e18259d1c852795de9803f0b0866b37a6c99346ef3a398f45f6ee41fee949eb8aa8b5ae75042dc46d4 SHA512 6a60fb9f44867d2ba6aa33cfc34d6db7616da62a2d9c8a4ba1881459790c8760f162d0084b2d254938e8b5374fd929ca7f3a827312e76002587796ea516fbe6b
 AUX sympow-2.023.6-no-pkgdatafilesbindir-warnings.patch 2289 BLAKE2B 845125575e201767360ebe38ecbf321a254d01d5eadfeee4d36e7c350e939804d7726299d33de0c564f455b5a559c05542f0da5d54e6bcceb22c02907ec0599a SHA512 a5840039ff0bf6c99cd6ef5609bb46aeff48858a57a253e051a04b180839a0f8b36480fffee10e22ef76672073b08ca58a399cb078a477aa447bbbc0c05dd6cf
 DIST sympow-v2.023.6.tar.gz 68142 BLAKE2B accff25cb1da5b6935a91179fa399d76148709be54bbd434c0dc6143e88e9cd0f0a3cd96c683da3214366a29d6d0dbb7236d2623ef3f9322b6d4d54c6bad9882 SHA512 efe3b09fff0629e136b029ea615aa09ac1a4f225c06636d653ac921c7de01bf75e2b392a138c3c1af92f2b4f889f5949beeeba5b6e5e6b49e02c605bb9c16ceb
-EBUILD sympow-2.023.6.ebuild 1072 BLAKE2B 9862340cf5cc7262f660dec9eed43407ba0c3aa6642231677480983dc9d9b0ed6192023b7a3c92d4e849b8a43ec4640fd49726c0d266549695b640d682f61c69 SHA512 7b319c0994b88e87945c6bf535e13380dce1725070ebb3836e04076942bb26a24ca8b9e71fd534a8a08be6c9a8657c7fac0e2ce738b2f75ee90c2ca20b9f65ff
+EBUILD sympow-2.023.6.ebuild 1071 BLAKE2B f535e2beb531d6701be16eff04f20cf73d24ca4443f8b8ba3d886e9aed49770a2dc3a2bbbd04a819ac5059cbca1732d32a20d8e0cb027be5130db9cc817591fb SHA512 f3b674275e559814c785abbce90c64a68b558cf8738f8870bf850fd574c05f1c6c2b2e1ca6223d0d657f1c7c06d783b07e114330a450e5bcb8fa849eaba2b850
 MISC metadata.xml 740 BLAKE2B f7bf31eef4f6a42b64105e8ce1725e4792d5303d0adb524a23fb7286430449d15f4f2ecef1afa64bdb0b4e6941928aa75d081b8fdb0c3f7b679afdb7c71c2052 SHA512 45e110738e271c8b71325023e4e371dbaee1d9e7b7318d82dcc72b6e1d094799ab230e0a14d282a3a5badbe53c54f2ca44933c4acad5f1bd24798848ac663318
diff --git a/sci-mathematics/sympow/sympow-2.023.6.ebuild b/sci-mathematics/sympow/sympow-2.023.6.ebuild
index 4e5e5566a81b..1c69175f15e0 100644
--- a/sci-mathematics/sympow/sympow-2.023.6.ebuild
+++ b/sci-mathematics/sympow/sympow-2.023.6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="Sympow-BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 # Pari is used at build time to generate data.
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 8191a112a643..f5b4713c87a8 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -3,11 +3,11 @@ DIST wxmaxima-20.01.1.tar.gz 14011946 BLAKE2B ed80f02158aa0c43f37c040225010b35ee
 DIST wxmaxima-20.01.3.tar.gz 14221966 BLAKE2B cdaf62f5456446fe6edf1247323faa9f0aeb84dbe890cb03028f9f441c4c6bd3e7acf806b71a86b156ea7f10664c0188517b8f2aa15536e3350e16e3307f412c SHA512 4a977bd293255ac3c010610c74aa39fba8b8468aaa9fc59707bab69ede7a427e261ce827bae8d302ee1343bb0fce5e7aa5ee3c59f17198d5c473637571667abd
 DIST wxmaxima-20.02.4.tar.gz 15242422 BLAKE2B ea9dc613fa94d046a9d461c56a9d1564001f4fa28d90a553040e85b7dd442df025521dd9501257d12c808a2e9285b7f34b04c9f10d4ce658bc6d423055c9fbd7 SHA512 d5eb0e09de55c3e6ebafeaa95957ca8bbdacac9ec1d99f6041fa99b7fa59364b3228336675f9bffa71b879b17268b80c695f16c9259bee6d5cab9ef7ed86294b
 DIST wxmaxima-20.04.0.tar.gz 15313618 BLAKE2B 04a9544aeb1a7084250696fad99c51be21bf0b119581cebdf62b8dece3034ebcc1469b9d07576bfed8d72efe77ce6db47b5a29c4185a5e85114b552d3385caf9 SHA512 8caf9effa0167c3307eff4a6895a3b19b41aab37f845e4cdc139f3cdd03d9a061adc9ea4ad8ca7e0f28d83faf34d15f828f03c86d05ad7d83f0e28aee82aba70
-DIST wxmaxima-20.06.6.tar.gz 15627532 BLAKE2B b445cd0195561ec55d4f7c750eb2f44386267fa153638faf0d90b084e2c43d6d2cec5160011e2b0a6cadd662c31ca63f72df80328aef37234e1e5dfce9ee1f64 SHA512 65b4f93f8baf3c1b93ac1cac21b0a531e3d5fbf219540a0db4f6f66744909e3e787765ba1eb387823805df7201e6fa08bca165cdea2e0acb2687261fbd3cb269
+DIST wxmaxima-20.07.0.tar.gz 15723971 BLAKE2B cdec59e8ca17d0f4577a316a68e90795424d3d31829130e1854d908d76e54c02b125d20ce3a41ad5b4b06d57d918156bbbce7dead114b05daade34845d045124 SHA512 7272df5314ac79248154ee899397361da0570a6188ddc464b0479d2d6ac556ddf3941cf1ac17c9e6642e77d79a8458b902e70513dfdea15bc6a6d36d76b0bec2
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
 EBUILD wxmaxima-20.01.1.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.01.3.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.02.4.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 EBUILD wxmaxima-20.04.0.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
-EBUILD wxmaxima-20.06.6.ebuild 1357 BLAKE2B 0cc3478c4ddf5be4ace1b8f0af26d9a9e723767bd0a1aa90eb95b1e20fbd2285c3e4a8cf73365525603c382f6fa2f39837a76abee4e0d1d5e793b3df1b4e9d9d SHA512 44ad67131a56ced20f76829f1a87e226ab3aaefe76fcfca09e865ac474d488b491c063922e984e9b1fcf794ea0cf4c07e40b4093c2c3a3d0404281d1378963c3
+EBUILD wxmaxima-20.07.0.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.06.6.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild
index da8eef70a616..9a2b704c52cf 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-20.06.6.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild
@@ -12,11 +12,11 @@ SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 S="${WORKDIR}"/${PN}-Version-${PV}
 
-DEPEND="app-text/pandoc
+DEPEND="
 	dev-libs/libxml2:2
 	x11-libs/wxGTK:${WX_GTK_VER}"
 RDEPEND="${DEPEND}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index cf107e8dabe8..644d2eb9eccb 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,5 +1,3 @@
-DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46 SHA512 d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1
 DIST z3-4.8.8.tar.gz 4520119 BLAKE2B 8d3d9fac61ac7d5a9d8c44323db9f67a7b24ee510b12e67867b249062cbcfe9a3bd0fa3b24c03c9eccd2aaf90451083ff5e9a9253a87c3e8e943fc5cf08a1893 SHA512 a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f
-EBUILD z3-4.8.6.ebuild 2335 BLAKE2B e980e31d4d6ab4443b7b385c66aa1a71ab062d4783e1947d1a2d9688986729a19769813e22cb7395d9a8a1a45e1fb898da1a8e6c923c8486aa8dccd601f9874b SHA512 214122932dcbb1cef0e3d3617e37e3057936b28afc7d70fff2fe08bfcaad963516d48f20fe65efaf80729f5ab070b562aa574c163f908c82b620846e5cda7982
-EBUILD z3-4.8.8.ebuild 2419 BLAKE2B 9ce7a230328d75a750d8dd035388cacf7805ed2acdb827ee7d23337872b31fb281d2e8b46a3670028eb88872ecdb2a6b7ceced85b57d5df88ab9cb9469504571 SHA512 17f721bcf8019eb6d2be6d0a4003187a76c6490f550fed9d488dda8d1cb372ff3b4192fd5906de45713ec3b60be8b7387d960818b386d5827977cf9db81c0213
+EBUILD z3-4.8.8.ebuild 2414 BLAKE2B f20a02f52a68dcc203acaa79b39efac293b45e142798c0ed362845b4897e4400be4816fd37f26f7fb54d7a824b7d7da074bf9824f76e8a8b305a789d8dfec263 SHA512 f4feff2c7c64feefa4a54c65d1c135cd2924daeb4c5276d34d3c4f2e1b4224aad0a45abf9fe4a56eea6947679938fe1e0a77b47e34d11448ddb629fc9a195f0f
 MISC metadata.xml 616 BLAKE2B aeef1be6d9c4a94062310c6e2c3ac7fb1efe39bb608d96c143a01e9a01585f11ee25aa56d8f67d0a96d880b543882f2cb781247c034eda75e7f6f030767bf660 SHA512 aed4bbc517cc4f9e78ad3f5d50af5837757efa2985aa61a3faf40e39203179d356830a1d6fd4712422257eb244a67ae5eb5c4b2db76ab75769f5fe5e6d045a0c
diff --git a/sci-mathematics/z3/z3-4.8.6.ebuild b/sci-mathematics/z3/z3-4.8.6.ebuild
deleted file mode 100644
index fca0f4ef0b6c..000000000000
--- a/sci-mathematics/z3/z3-4.8.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )"
-BDEPEND="
-	doc? ( app-doc/doxygen )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DUSE_LIB_GMP=$(usex gmp)
-		-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.8.ebuild b/sci-mathematics/z3/z3-4.8.8.ebuild
index c6b4ae89c61e..7ca54108075f 100644
--- a/sci-mathematics/z3/z3-4.8.8.ebuild
+++ b/sci-mathematics/z3/z3-4.8.8.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"