gentoo resync : 20.06.2021

22 files changed, 58 insertions, 33 deletions

diff --git a/sci-mathematics/4ti2/4ti2-1.6.7.ebuild b/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild
index 407b3e930895..01db73004d5b 100644
--- a/sci-mathematics/4ti2/4ti2-1.6.7.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sci-mathematics/glpk:=[gmp]
-	dev-libs/gmp:0=[cxx]"
+	dev-libs/gmp:0=[cxx(+)]"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.3.2-gold.patch )
diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest
index e2455565a2e4..cda4c8823211 100644
--- a/sci-mathematics/4ti2/Manifest
+++ b/sci-mathematics/4ti2/Manifest
@@ -1,4 +1,4 @@
 AUX 4ti2-1.3.2-gold.patch 434 BLAKE2B 38162dea9fa7e7072966fc7c5fc72c05e2d122dbfbb25aa0027f992f0fe23bd1232245c670b8f3d3a2b75e67319a217aead99850ec6d1a025c6c4a890605b2c3 SHA512 109f89dcf1f66fae079d9ba4c265b0a9ad0a60b88848ae38175d98c51b8b8fce3e92b0f862191340f4a8dd8c60a768c77b1504d0a797553b5cd1fe5bc95189ff
 DIST 4ti2-1.6.7.tar.gz 5649869 BLAKE2B ab0e7da1de88e5e99ead0b8fa7f7a72773b84ae903a31dc3134e83364ea45069889f8ce9812bb471cf72b824fe013756d557489b4d2ab31216141d5b6347acfc SHA512 38d638fe01ff3cef1aebae1eefd276cf02f808978851b4465e132f77d3ab34ea51d512e2ea28a42ac65263b458c43cf420dc5f8ac930f959dd0c14916cef9841
-EBUILD 4ti2-1.6.7.ebuild 837 BLAKE2B 8941e012632fc48e15cf19d2e626a8db10c300daf0bd9bf928abff567708b283514b7ef81f11d342020dfae4e269e83ca5f7d7406c81b1b3af4e9e9b223cdfa0 SHA512 fb2912138e15cb6becd29dcf668e856a18a4a8c8d50abf15a4e50699892a7e684ab242bf362cc7cf16f48676c04e10da78da29731b4eaaaa8eb782ffb315d690
+EBUILD 4ti2-1.6.7-r1.ebuild 840 BLAKE2B 2f870e3cdb8cdf9e7edb0ff280bde4ce0e3c4e163fcdbeb0aace34cf90575a17c82919e991f9ff385f36742b78a1a6769dd651ab6ab44f6a851dc8c06f27df81 SHA512 b491da700df1da0ad0e9f1418a858932664b654e8bc12a42cc05af87237d897b12f7db9b58b717f2969750f53ad0b7bed1ffbe83b63cf1a9ab4eeffc433c33a9
 MISC metadata.xml 446 BLAKE2B ce737e287f6b8f420aee86ca0ce72aa4952474a3ba717239dc8d10261038faddbc9b06f93a04bc8f8c48b36606254780865bbc5038564d4fb9252241e45a7a4b SHA512 2c7950b353c54597eebcff1f50e5045f792ef37cfe59f0142160bdf5ea47ff6be57bd698b051e6c56863b109fde983c1aeeca87827289abde96838af1aa3f7d1
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index d8e29a514148..20f2f517449e 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index f798fee795b3..e49b708abc86 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -5,7 +5,7 @@ DIST CGAL-5.2-doc_html.tar.xz 51123300 BLAKE2B 748b94d199343402baf6aef298b352fc2
 DIST CGAL-5.2.1-doc_html.tar.xz 47740788 BLAKE2B 5b18210fdff768c3cc3fed5bcbe8f41c7fd89592120ba9dc540ae2d1e3952676f9bb86150dac2f3e185ba0f9e92fe3fc3a240ca42d3f20a76a76810b7d45a03c SHA512 d013c4aacd031040e55aebe6de15c7ad232ccf70ff5fedfeda12435a2929b57d81183d8cac9ad2130cd3e164901a26b73748d44139ea4eb77f3a1df7d583c05d
 DIST CGAL-5.2.1.tar.xz 23256952 BLAKE2B a6a720011dde4df80a6ec74e2ee4658cf3239aefcceafdfa764d42478b1c2a7b24da135dc22a74db9ea41c624bed6768c71a19d1f7f03aa541a17a6236184309 SHA512 b1eb40a6b3231bc707fdbc43325dd88655cb6faad5d001caf891f7f5f3890b316c439b762540afcf702f87442b2b96e4e30ae7c06a1bada8cca9ee76f1f83bd5
 DIST CGAL-5.2.tar.xz 23250240 BLAKE2B eb80a81dd01b2b2e30fe72f45cceee0861b36f47e395d1c905f8551e23d57c36dd9a7c66e32f6c2a0a2cfbd4c780fd5d5ae098709bfc1072e7ac7f761d328fd3 SHA512 8dddec18bd7e375ea3b18c636ddb2ca4f3a318e177305058f702206b830e2605837024e4b1265789f1bdc46dda80133d6fa8d61a036cda3c93a227f4c244cc1a
-EBUILD cgal-5.1.ebuild 1668 BLAKE2B 50a42e49445d31b98fcf87a949ce9eeb2aded5c0a3ded30efb401c9b199518b1bdabc1d51da607c21f7cfaad859ec72b46c5d0c249f61af7e6746cecdaec9fa5 SHA512 e5d289e5d3e79a46a876b51b8c319f6e1c4c1076c7a3b8c1b51374144947d3ebdca42579c90058896f50890be603573b7fe2d303ae936ad3173a76d3fb58a9da
-EBUILD cgal-5.2.1.ebuild 1667 BLAKE2B 7f573b8c7d5a2b18813e8b8f6137e5f4e6eaa253497b44957b2a7bca7ef25966ad2404b6a9de2b822e80eb08392af96487a42a9f2fa1fe74ea94522e2629f7d0 SHA512 b2452630483fa3b40ab400cac8071e9c416dc345670fb930738b15c63cf939c8b98bc2d329af05bd8c93cd3bba49e0e96e4090206e099dd7b32573d542eb5ac4
-EBUILD cgal-5.2.ebuild 1666 BLAKE2B 5cc82ca832411b175f72a72e68542ddacc21d9795c6067d9223b28b99da108eea63c7b3630c039e2679ad5649f270caea0b95a367c3309cbb69e4e8b48b2832b SHA512 80827eda045dcca0e2a8b145b21037979adae365caff09e88f7cbaa77bbaa43a5f59275e8deb237bca53783ad14da3bf29d201e4dad1786df39bf5a4c4b9a709
+EBUILD cgal-5.1-r2.ebuild 1676 BLAKE2B 0cf776ec3975dd081ea09e200ec920aee26a1735229ef80406a136a933fde69508e4d17a58b151cbe3dd9e0953aa70bdf7055b72d58d35d1f80db9ab39665d1f SHA512 8b024e072f13de1399341cef016babbde013a1c3a39b127347957759369cace58feda41e5bea3e09c74feac7280d8a802c4036556189f688aab3e76f532a68e3
+EBUILD cgal-5.2-r2.ebuild 1674 BLAKE2B 48c4bce712df40a9d9f5a105c84724233c6e001b5a5017d37c129576a2c800c46f7ad08303e102916cda08c6906f301dac09db8613655a2924836b475de286ac SHA512 475a747f8a3a6cd040b902df9e2eac6b357c75b528857ed56808a3af00fc623d2f91295cc2aef99cd41d35da59a7fcba03195593d09291b6dd4ab67006427cd9
+EBUILD cgal-5.2.1-r2.ebuild 1675 BLAKE2B f84212edbd883992b6edfb08637ea27b23a5226096dedf502d546f04034508d8e782c94eb8b11395843f7af58ca043e4f3dcfbab82ed9d95ed3070caaf639ee0 SHA512 5cc4b5d5d78b5b156cf33a18f44d8dfe62197e5f3d2f106c8fe0b545b875edd8b9ac6a993a906486e5d0fb91b8ae99f1b7371b91f96275e17622d4b0c4d5d951
 MISC metadata.xml 1582 BLAKE2B 2bdefdfc9eb63f4ce6049710ea57e8988e91dd32bc67ba32707b86f814e6b75471eb6ee49785adbe2f90bbe4d3adfa22d95bc9e050d3caced232d6267e9e81a9 SHA512 cc4c6580fe29d50c8ffadab4e3c84cb327a755c4b335709b07a2521e7de150556cf272a8c58d7b05fa3380b78c297efccd170c03fc9c27827359702ad6c80bfe
diff --git a/sci-mathematics/cgal/cgal-5.1.ebuild b/sci-mathematics/cgal/cgal-5.1-r2.ebuild
index 64859c1c1764..37647b5559eb 100644
--- a/sci-mathematics/cgal/cgal-5.1.ebuild
+++ b/sci-mathematics/cgal/cgal-5.1-r2.ebuild
@@ -22,15 +22,15 @@ IUSE="doc examples +gmp mpfi ntl qt5"
 
 RDEPEND="
 	dev-cpp/eigen
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	dev-libs/mpfr:=
 	sys-libs/zlib
 	x11-libs/libX11:=
 	virtual/glu:=
 	virtual/opengl:=
-	gmp? ( dev-libs/gmp:=[cxx] )
+	gmp? ( dev-libs/gmp:=[cxx(+)] )
 	mpfi? ( sci-libs/mpfi )
-	ntl? ( dev-libs/ntl )
+	ntl? ( dev-libs/ntl:= )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
diff --git a/sci-mathematics/cgal/cgal-5.2.ebuild b/sci-mathematics/cgal/cgal-5.2-r2.ebuild
index 2d3ea4c90a8c..75a0a7bbadd8 100644
--- a/sci-mathematics/cgal/cgal-5.2.ebuild
+++ b/sci-mathematics/cgal/cgal-5.2-r2.ebuild
@@ -20,15 +20,15 @@ IUSE="doc examples +gmp mpfi ntl qt5"
 
 RDEPEND="
 	dev-cpp/eigen
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	dev-libs/mpfr:=
 	sys-libs/zlib
 	x11-libs/libX11:=
 	virtual/glu:=
 	virtual/opengl:=
-	gmp? ( dev-libs/gmp:=[cxx] )
+	gmp? ( dev-libs/gmp:=[cxx(+)] )
 	mpfi? ( sci-libs/mpfi )
-	ntl? ( dev-libs/ntl )
+	ntl? ( dev-libs/ntl:= )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
diff --git a/sci-mathematics/cgal/cgal-5.2.1.ebuild b/sci-mathematics/cgal/cgal-5.2.1-r2.ebuild
index 1f67e7a5ce52..c8b6a7545f8d 100644
--- a/sci-mathematics/cgal/cgal-5.2.1.ebuild
+++ b/sci-mathematics/cgal/cgal-5.2.1-r2.ebuild
@@ -20,15 +20,15 @@ IUSE="doc examples +gmp mpfi ntl qt5"
 
 RDEPEND="
 	dev-cpp/eigen
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	dev-libs/mpfr:=
 	sys-libs/zlib
 	x11-libs/libX11:=
 	virtual/glu:=
 	virtual/opengl:=
-	gmp? ( dev-libs/gmp:=[cxx] )
+	gmp? ( dev-libs/gmp:=[cxx(+)] )
 	mpfi? ( sci-libs/mpfi )
-	ntl? ( dev-libs/ntl )
+	ntl? ( dev-libs/ntl:= )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
diff --git a/sci-mathematics/frobby/Manifest b/sci-mathematics/frobby/Manifest
index f48f0ec9d783..effc63f64815 100644
--- a/sci-mathematics/frobby/Manifest
+++ b/sci-mathematics/frobby/Manifest
@@ -2,5 +2,5 @@ AUX frobby-cflags-no-strip-soname.patch 1273 BLAKE2B 42eadf37029f1ecd679e7591fa9
 AUX frobby-gcc-4.7.patch 974 BLAKE2B 1d8b6194866fd865858dfde063b5cc454c9b1a33106b5f49b9d3e595a0742039c434b287da9a000bace6dbf3f376fa2805ea9748a4a92a997b7ea05053262333 SHA512 2e1895b16064cd7121145202f865b0b9ca1cdb3e5088d82f9f80c8a2fdc8ef4a76f734e326d8685465b06218eea1a502d48ee0e6dd51fe92965bc3f8830fc13f
 AUX frobby-gmp-5.1.patch 482 BLAKE2B b807633ea98da37c51207276cfcc991db411cbb049dec30313013bfc2cbb1c1aaf1df60ed0136348fe52769b0f56295550302aabbf9360dcf2ad298363e6dff8 SHA512 a0e113c8a7c25c442a13425baf3fd3259ef48dfa67db25dcc1c87c9a2b1d2453d7daf9778a7c46ce9298db4f59177b63b7811eb4085f206c5a73e538488d174b
 DIST frobby_v0.9.0.tar.gz 852524 BLAKE2B 7cb2a617e85dee8c39c94973520e6dd42118145f1fbf09e7d16c3712a190407f216affd5bcea2ce4b6124b984b18c462118700c161168ae29bf4eebdb9bd1e53 SHA512 b1f64d7a8630ba7f5464e36f66a06a7a7909bc42f2e52898b2967b8ad6288da8ce11a5d79ebfbbfe2f3933930ad26444173f721465ae9a42b6dcf3eef7ecc59e
-EBUILD frobby-0.9.0-r2.ebuild 1302 BLAKE2B b71839ffe47a505bd11ead1b7d99009576d361f881944b93875c2120d7260c726f431be54134898c91ae6028cb12c5f5b830ac9c8184d205628024c9c8cf92bc SHA512 7d4f918f97b25108b3522bce98537b4c7e6ea66beed05e80c8593689c8aaf7f77c5677ac4f60142cdcc0e220f21adf2da4f569fe0ca2b636209cea8ffd19e4cb
+EBUILD frobby-0.9.0-r3.ebuild 1302 BLAKE2B ea9905cec63a05a6b180046dd9b07e6872f444ebe6934c7267ba46a31418a9c81a426c7b4eacbc6a1b4186b0056a7935553af310682671e55edc88ccd96a72c6 SHA512 9025dc010c189cfd56ccca9fcc1c14dc1424f883e9643ecd3d6ec104cb228ec0b08adab6a4b05ea95f6172381640285408575555e4f1fa2ad27927f8b9ad9de5
 MISC metadata.xml 269 BLAKE2B 5511cf8f01948aaca0488a6ed41ed923b130bfea9ba90d49f39bff86cfbd1e956b662d07406c76ca8e7e1d2ceb54547740e9f61a0a16041e5fcf18d713f90f03 SHA512 ecf9121172cdf04793bdbf6684060c7f15fb2a25606e53d8fc7dbc78efe24e264affa600c1ee3106ce8216b7093dff66eced3f78dd6ca7bd6ee589d1c7912cd6
diff --git a/sci-mathematics/frobby/frobby-0.9.0-r2.ebuild b/sci-mathematics/frobby/frobby-0.9.0-r3.ebuild
index 3632bf9afd6d..ae7086641b0d 100644
--- a/sci-mathematics/frobby/frobby-0.9.0-r2.ebuild
+++ b/sci-mathematics/frobby/frobby-0.9.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="doc static-libs"
 
-RDEPEND="dev-libs/gmp:0=[cxx]"
+RDEPEND="dev-libs/gmp:0=[cxx(+)]"
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base )"
 
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index 712226a7b288..58e06df97627 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -2,6 +2,6 @@ AUX gfan-0.6.2-Makefile.patch 6603 BLAKE2B 48f9b4280418aef41d502d770c070ec1dcef9
 AUX gfan-0.6.2-testsuite.patch 3223 BLAKE2B ddb94775a13bd503df5c9563750a6b4b68c9e72e1a19aaa0415c5484e07765dfd28ba02b3a0fab65a0b9cd5c61afafbc6a3d862a1de68ece57ef9d8bb2835c16 SHA512 d62e765a39ee1a8cb149fcae8afb538b19a91206dd0b8cf0ac2b681b28569e44f492b770b9e61d7573f2d52f265ad4cf25671197c204238a89075709753a83e6
 AUX gfan-0.6.2-xcode9.3_compat.patch 367 BLAKE2B fb7c685a4dd811fed83e2734a16507b1792e3a97c666d0e7de1d2ed53a7b9b43c5319517f9eef829f47147dc725f2c4ead38968fa3868baa1d16630a8b844636 SHA512 129d2c35777f82bf2a1581450ecb12dd6811fb72b583748b30665c0f9b20d39646233d9b40fb64a3c7790360514a51b30e49c53d83c34d259f664bf820ae1ce2
 DIST gfan0.6.2.tar.gz 1321059 BLAKE2B 1ed61e1e084a1ceb65dd21848440bc3a90486c0ce4012b3b64c8029e89636696d2b0e5446ea156d2cf050b5db179c7c2f25c97e683cecf6e9616e8553d8513bf SHA512 5961820750af2522fdc1a86c0254742c3b003607a8707df5d6cd5f0bc6461e4d3db3b1d3cb537979d57eb9dff387974a58aeb91d0b5246d7c701cadc5a2cf4cf
-EBUILD gfan-0.6.2-r1.ebuild 1663 BLAKE2B 3f417e4faa748930b9ba7d7e63f00c3ed024fd2ea9b5301da54e4a11e0801355c4d629c86680bf46549e41eeeb627dc5f28b5d507e3e12ee40202f1427a534fa SHA512 29a1ca7909dbec0912de73c47ea4600c2880b3f2eb28dcc74837306dc99b004d2477629a616ff8ccf9f9206de8aef34d88370a61942cbfa367eae31fa095d938
-EBUILD gfan-0.6.2.ebuild 1628 BLAKE2B 272e77ecdf1e7132bb3a703ed3871cea502d621d596ec47c3529459c120a44921028aa0c064936a49c6b727b6bf44f78971679ff3bf3f9450d3ae945a02193e0 SHA512 c4eaf7e2debfcca9d3a92e6f9abfc1e568c09747db8ebf7caa3ad34c3208de47b8841819d1c5ddd6866b127f9d9496e61616f2bda1cbeb1588c58b682cc0550c
+EBUILD gfan-0.6.2-r2.ebuild 1631 BLAKE2B cd0084cc50cea5303a41ca4e10d8bdb0afe1c03e1c7f92a9b6bf6e42cf901d122c0769f8218ed5aa02671479750d2c853bcdb68e5ebf77775d34176b5970e894 SHA512 5ecc3f93d6fa3da09af5340091b4a93e5b4c840b6eaa7d61575931950a99b61abda51946bde1edbfe25a0a6899f9abcdfb71bd8eb493161ab804c38247e0847f
+EBUILD gfan-0.6.2-r3.ebuild 1666 BLAKE2B c8f52e3b6de28840061c6a23f846f88f166a8a33dac5adf6d6ea536d5fd6d6423d9f208b0f5cf4cc822485c85e59d1fa5dab5a35047d0a99c8a94d54fa5455f7 SHA512 68c23c9388dcecb4cb103702fe9d238d8235f7d2a26e9d435dfac63f7c9e0fa169a4e9520f4eb5db612bee0d1ce9fa4236acdf539b53b829e6e644ee4be41d70
 MISC metadata.xml 1343 BLAKE2B 1e3385eaf888fa6a69e1e3f761bd5a1037e5a5308878664e604ba5efd096747f84a0a3343d8de7f6eb5dd3ce726d94bdb933e17b9eaf8e345b02fd071fbf821b SHA512 ca914de593af1279439f35fdcc812924b831c30bfa86366443f16cb720acd3e38267f25057f59e76a6b8ff1aa48a33ecfa72c093419aab95c92ed82c3308cd94
diff --git a/sci-mathematics/gfan/gfan-0.6.2.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
index 44e051550034..24132c367b9e 100644
--- a/sci-mathematics/gfan/gfan-0.6.2.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx]
+DEPEND="dev-libs/gmp:0=[cxx(+)]
 	sci-libs/cddlib:0="
 RDEPEND="${DEPEND}"
 
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild
index 185e558ce126..00132defd82f 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx]
+DEPEND="dev-libs/gmp:0=[cxx(+)]
 	sci-libs/cddlib:0="
 RDEPEND="${DEPEND}"
 
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index aa834378eb82..50fd24a084bb 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -2,5 +2,5 @@ AUX giac-1.6.0-pari-2.11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b
 AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88ecbc71dc450ef714f6da323128d9c945ada9d658c73647987f84638498aa4d3bbef49062424ab63b53c76defc127902 SHA512 14bfcb04e5a23933cfa4635789bf02f6d6e6a528c167504678b3d2ecb38f135d0c05583712005fe53afd7696cc9ebee5dc3ab90cac056d75bd43be786075b011
 AUX giac-1.7.0.13-xcas-desktop.patch 890 BLAKE2B 31e33a52fdcb70c610edf21f046d112df3702e1d4f635cd4956bbe17d928839c9a0a87cb5ba5d6aeff94213b482ce22bd497d1d258aaa8abd6d8fc0116031f15 SHA512 269c733edc899051fc3de23021c322a3099499dfeb559ab1cada0964258a91a9735e620b480560226e5a3b492f2f5654062ee9c2c5479ae9789b012e7a5055ca
 DIST giac_1.7.0-13.tar.gz 86447065 BLAKE2B 4d91e83608f7ec376d133c2784ffce99447a9dd78b5c8582b81a0aae0b8ac59eec4db3ee4a8bcb39202c777c300178a181f2dc2ac74ab445ddba2f3efa0ecb1b SHA512 99fff7ce5117fd8c106601ead03679805d529fe12d5372cdd4ae54824aa6fdcbdaaa1a62ea1153391a1a65af8970e38fca7d95ca9983755ff06053f1d8b6d65a
-EBUILD giac-1.7.0.13.ebuild 4243 BLAKE2B 4274b4dcb6752d1a033f6561ea3bed336db5e2e606463946ac109e0e9aa6c3530b981fea631a9257236a0de0d4e874b1028a969564185b05a8917cebc9480610 SHA512 1bd27ea2ef3f44eb4b3a9337a61baa37191668a3f2ff9dc6478a942aa77478b838085dfb1f4e711318066c76fb26a51555f549590e3840374eb6a022875a5319
+EBUILD giac-1.7.0.13-r1.ebuild 4246 BLAKE2B 82f15af165fbd0ac2dfa086137796dc368bf43a3ae386d00ecfc465a20872e35c690b36b7dc526f7045142a42ca2273430b2e184002398572bbff47af33569c9 SHA512 d44632fcf77888cfb4db888f8c2f7a1dbf0b4ceef015d2c99c232bdfff3a1272c992ed2babbe2c55dafeaef6290bd19e5a787b31d9d8191101f5f3db2a1a17cf
 MISC metadata.xml 1314 BLAKE2B c38eadb22de3e64b39e144c8dd2e2c359b88ea7910390ea6044af9f8f83a6db08cb4f0142d1217ddd0f4ff051f2bb94f846a789adc521d02d4c704763da1c50a SHA512 7554640bd7ab2b2c1cb77d492d044d419b178497f8b5a6165168f4c3ab0c421121e98b0f0f25d3d10479a8fcd6635f28cfdae4562d6e0b5143b541155f697077
diff --git a/sci-mathematics/giac/giac-1.7.0.13.ebuild b/sci-mathematics/giac/giac-1.7.0.13-r1.ebuild
index 2d6ab4387bf3..79fd766d7ac3 100644
--- a/sci-mathematics/giac/giac-1.7.0.13.ebuild
+++ b/sci-mathematics/giac/giac-1.7.0.13-r1.ebuild
@@ -21,7 +21,7 @@ for X in ${LANGS} ; do
 done
 
 # nauty and cliquer are automagical dependencies
-RDEPEND="dev-libs/gmp:=[cxx]
+RDEPEND="dev-libs/gmp:=[cxx(+)]
 	sys-libs/readline:=
 	gui? ( x11-libs/fltk
 		media-libs/libpng:= )
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index eb6096d91505..ab2f8c91c3ba 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,5 +1,5 @@
 DIST normaliz-3.1.3.tar.gz 3075453 BLAKE2B 0860b466dfa5335a58a496c21f7567e7e4682b07c73e36dbbd947eb65500e03758577d32355adb02fa4e271ca2f49bc5cb0449e26f1bdd11eab2dd5dbafd8f17 SHA512 c7fb1620e758dc59de88f0d7c55f50db0f67be772a00af27205e478f30c3836b7cf012a16a8adfdee3f0367d3adb4e3f887dc7d03793a7ca1601968ddb1946ce
 DIST normaliz-3.8.10.tar.gz 5086191 BLAKE2B b40de665718dc1cee8a7246ccfb9b8496bdfa0754408f0260421352f1b4776133047ed1a5e8e0f044bdc15dde63a9f7d9ea1721773f36ecdccce3a8575493772 SHA512 8755011b1305b571d6bef7b6200e01bb56dbadce3f67de022fae0ef42c69c095b1f7cd2a2a432282098277ee39aa17caeffda15c806b28a6060a737930d5b82c
-EBUILD normaliz-3.1.3.ebuild 1659 BLAKE2B d50183eef102f41a0db131c387a4a03aa0cf85fc4b076bbafa07969a63d331e0ef71205f3683e174a3b78f4d4bb8b8cd529423a4fba4669670818f7a99b6b2a8 SHA512 01a49bb35e3aa5fec13193d67244396e31e295e3904f4c1e3dbd96ce78a4c6c3aef05d35d3e305b4b055accee30d8cfa67d1fcfbc3c564e64f9493a67ef01880
-EBUILD normaliz-3.8.10.ebuild 1119 BLAKE2B 200cb8327d24aab7eec7e3c4b2a95a2b7b7ef27ecc51df6a8d45887e69390509b7fd40b4813165bf8e9ec160484c306a0c3f93bb0d61d509e5957d552f929198 SHA512 624f581635eb35c79a52a8071a4c4ea2a3a9bfa6b91ee214f4c5168f952d6c9e0db4fe3ab317c1bc5052bdfc40d559b796728c70540f50b86e39287a17d8b945
+EBUILD normaliz-3.1.3-r1.ebuild 1662 BLAKE2B d819f3709adb1af4b60efaab9c122158e49a3b6dffc418ab2a2d35655b95bf3a6e0421bdc57ec8ad9a957a59ef3a217dab725bfb8441ec46a71c2a8d4720b382 SHA512 4f19213464518951abec233ba53ac2f5a60d683ffa59a7fc81bdeece1361182f2d7cd0f517ec259c3b130776eb9acdd200d01fe8de9b59fc4945bec75e319ed5
+EBUILD normaliz-3.8.10-r1.ebuild 1122 BLAKE2B e1b8ca747f420ab4ababde15ca902a4034739392c3d6dd939decb3083071a62d0e57af658bfbc8aae27205360585568ee0eb0c77750706c6bfeaf4482dbae9e5 SHA512 868960b4bd23cd64ba383789953250cf9b20bcaf1bfebc586974ffaed7e7db17b97af0b218972795c904bc814a90a504a3747bbcfe7839d1ce54ad778fc3c165
 MISC metadata.xml 694 BLAKE2B d14ea00cecc15244599561d12a957d298904851ca82ebfd728696344e5252cd42c05b6f1c06fa6b85ec70a9b4f75b188164fc4a87dbf2bf3e4d4151dd232c5de SHA512 f6407f218dead7d90fa4dde54fd4c77f075c2ad544371c1556e052fd719e58aec5c380dd6c9fc542ad581ab46609011e11ff255f41c06a7189ad83670d44f9fe
diff --git a/sci-mathematics/normaliz/normaliz-3.1.3.ebuild b/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild
index 7f9223274c34..bc18fd6a3868 100644
--- a/sci-mathematics/normaliz/normaliz-3.1.3.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ~arm x86"
 IUSE="doc extras openmp"
 
 RDEPEND="
-	dev-libs/gmp[cxx]
+	dev-libs/gmp[cxx(+)]
 "
 DEPEND="${RDEPEND}
 	doc? ( app-text/texlive )
diff --git a/sci-mathematics/normaliz/normaliz-3.8.10.ebuild b/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild
index bac3b0b1866a..436607a9bad0 100644
--- a/sci-mathematics/normaliz/normaliz-3.8.10.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="doc extras openmp"
 
 # would be nice to package scip and cocoalib
 RDEPEND="
-	dev-libs/gmp:=[cxx]
+	dev-libs/gmp:=[cxx(+)]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sci-mathematics/planarity/Manifest b/sci-mathematics/planarity/Manifest
index b1f2a5a7ac7a..e794a247f9f1 100644
--- a/sci-mathematics/planarity/Manifest
+++ b/sci-mathematics/planarity/Manifest
@@ -1,4 +1,6 @@
 AUX planarity-3.0.0.5-extern.patch 591 BLAKE2B e8c6c75fdb587f10d38023daec5806ae0930dd4c4be1a74fa11fdd2d837a5b5904948a01601702a5de160725dd60214e0de2aa014f20e41dc957e0c4b24f36f4 SHA512 6fb06c58f853ddaa2fe308a8104db4fee1d6021f4ece9f3f6438ba667e65167f248ac6b3b674e997380f2c874447deda1b7be6dbec2f2c66c188ae5cc8c09bc1
 DIST planarity-3.0.0.5.tar.gz 492644 BLAKE2B d183bc07cab7246b62cc7340956206e3f6c5999aa92b223e7665ebd8ae1bc0c354011c078ea4f42d2e45efa2ae5e83e082e4c8d80e3391a4f20be1020ebf8188 SHA512 dfeb7e024e1f5758e5abbd854c4ca963b4f5d45433b2c5eb00ce85c154b5407ebccd1ace0db167488dee757db2c23367101a2aa568941a3664bac9058ea24328
+DIST planarity-3.0.1.0.tar.gz 442280 BLAKE2B c71f8770e92efd8b322d5c5d3f9a3a2917891ae39e41b3f76ac36d74e5e197f18dcfac82d802fb80eeeaac99bcfa5f1a91408f1cf82c7a289321ede7fc97fc04 SHA512 0ad6d7edbd31f29c9b39cc8c7918a9976e5849cf2ca9eefbb260478666ea8d0bac21647e939994ceef7d294436dd12a403520690da14407d45ef25267300282d
 EBUILD planarity-3.0.0.5.ebuild 965 BLAKE2B 22f69cf8ce923ef032264bfe35c95ef969b2e6efa0d59214d9e4c7b7a2305e9f4b02543ae6f76c3301d2efe591caf8755be99d6f2377e90b6a7b634b8667846b SHA512 0d61d50250dc39bef0013e9a1e9b838afd0c9edc166d6e419dc6932b50475ebaf2262cd8afaace8e0fe081aa621e4eff3b476bd3b4c14f8c2a9ca9aec1492cef
+EBUILD planarity-3.0.1.0.ebuild 577 BLAKE2B 8007512dcedb209670c8ffa8a56c4b83bd6b1809f0db485ac51d6b6aa0ac965d160f87aa0dffcc8463d273c4c88fa276fff07ad724ad1fb36247fddd5229ff4c SHA512 24dd0821c2b704d422b2518734219f5d3c287f21cdd9104b8de6315f37d69e78f71d0ae8227e188205bdbe5de85c9ea385422cd5ff68e10c2e679d08685c1af3
 MISC metadata.xml 808 BLAKE2B a7d1440f9b42358a4550ed751fd52daeba5dd83a694051bbc283de4925e1eacb8a4908a721cb04df2ff29f8c53ee5ca7f6c45850e3d41fec670724b956024627 SHA512 5cb5e8abe1447ac578a1ae0353f3e10bea3d4a0393ce61a99c1fa35b2bcb3b03e6c807d8ecf0fb6f25245db645e5054bd2b273a6d36a5018fd980862f3d20611
diff --git a/sci-mathematics/planarity/planarity-3.0.1.0.ebuild b/sci-mathematics/planarity/planarity-3.0.1.0.ebuild
new file mode 100644
index 000000000000..ff50336d2e9e
--- /dev/null
+++ b/sci-mathematics/planarity/planarity-3.0.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The edge addition planarity suite of graph algorithms"
+HOMEPAGE="https://github.com/graph-algorithms/edge-addition-planarity-suite/"
+
+SRC_URI="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${PV}/${P}.tar.gz"
+IUSE="static-libs"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 52dc2747dbe8..080df16d0c7f 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,5 +1,5 @@
 DIST z3-4.8.10.tar.gz 4731869 BLAKE2B 92487f71a0c8d961949dc23032d8fa3ff157fe7acc29b41d0d79326f8b59c60e19f43527cccf4e51872c0f0664598f9063876b04cc581f918aa48c37a13c4f3f SHA512 d2741d7ad3e1d5ee3fec92095b061a96a700c3327b2eb2090d4162bdcaeaebca8c072ef79c5daac1f6de3456165c2cc38e13f1045bc707779d1027b943837c5b
 DIST z3-4.8.11.tar.gz 4799940 BLAKE2B 5478f9f45f2dc8ea5d2b781e79d886e77eed5ae034498b434dae349aa76f05836d8fd3134a08b381830b57acb3896ac51337d5bbe480dcce4770f2cd4fbee841 SHA512 ceab703d0413d0135e0f4e6c3ba2bb58d6a4823385edb0bf7ecc96949a3073b687d415a2674c86c9f876adb52823f98f9fbbc107d799ed756dc16292f9864894
-EBUILD z3-4.8.10.ebuild 2425 BLAKE2B 23db5049ead16c9323773aa20d487b76cfb6d2126f1b93f7e507b5db93db490daf5a6a03b9a090404bd48182c0bf4a92aa3452bb9278b13cff89e235661f7e88 SHA512 3f69ea5e9b9de7dbf99ac2886791dc7947e12c9542fab93b9da9a82c8fb2273f07f5441ac54a1f5e8bc839c9f62815f95ea049e2c50e060eb11befbe676fd7ed
-EBUILD z3-4.8.11.ebuild 2430 BLAKE2B ecfd9ccb8df8578e7f2f18ebed60e95476bb7f67c95825c51d19fb50db5562bf3de65b8cbac8f868ea2bb0c1a33c4a4e3fe800800d02086b3ab76ee91261239e SHA512 7e9fea4bf7c6818f8c8035eb9ff59f1c59731f73da90dc5661709495363b1c474f8e0267fd5967a956aba7643995150b960a9d67cbf8e7568e880c4dc4c35061
+EBUILD z3-4.8.10-r1.ebuild 2428 BLAKE2B dbcf484ac1b804abc88bc0dc7405e2c161f1d80259d972d2327c7f837bec3bee355efaa0d689fe5f490d09c0a509a2ee4be7fb38588518ca3f5db92997449e31 SHA512 3a48335f2cbb5d94a24c80793c4651f244c71645a869ee494ec83600aaaa3824a8198d71a32fe3c14c8f2df80c5b76ac321f41f6e04b5c4aab05851db65bf37c
+EBUILD z3-4.8.11-r1.ebuild 2433 BLAKE2B 6289708b8c64f3aa62e98f659cc79bad7d9d189267e670d2543c45dc8b2fc60ee31b1a9950059f7a75ed2a470cf13d5a9dc5956259614985365de2aa6fd4418e SHA512 37db72f50f850d89bc9b540140d94d26a18358fda78afdd4cb95ba47b9ba3591c2afb50679acd722b776e8a9ff681688ab73899317d63d71c47687a8b8dd4d0e
 MISC metadata.xml 616 BLAKE2B c35cac6f5810148c69a612d6b04ed4cacdbf066e61951ea1433336f14b2b058c4dd50530b547021007489122f5e94407b30641dc9ccf3b59a345e7a09e5fdd28 SHA512 eaf72a29601e96d5312120a1fc01a0b3dd2b7d8dbee70f6052e8ff7a7e07ae8b768d1417b7f4b523e755e5569092f2685bba77beaf3d7c455ccbd057cc9b670a
diff --git a/sci-mathematics/z3/z3-4.8.10.ebuild b/sci-mathematics/z3/z3-4.8.10-r1.ebuild
index eb07c4a20143..2683e9fa94d9 100644
--- a/sci-mathematics/z3/z3-4.8.10.ebuild
+++ b/sci-mathematics/z3/z3-4.8.10-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
+	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.8 )"
 BDEPEND="
diff --git a/sci-mathematics/z3/z3-4.8.11.ebuild b/sci-mathematics/z3/z3-4.8.11-r1.ebuild
index fdef20fc1775..87be02fc9950 100644
--- a/sci-mathematics/z3/z3-4.8.11.ebuild
+++ b/sci-mathematics/z3/z3-4.8.11-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
+	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.8 )"
 BDEPEND="