gentoo resync : 15.06.2021

27 files changed, 426 insertions, 28 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 6a43a26397a6..a4aad804b50c 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 7f81b5fab4d4..e3d17e1b4cb1 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -10,4 +10,4 @@ DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7
 EBUILD flint-2.5.2-r1.ebuild 1715 BLAKE2B 3805ac1b99b797b928655535fb506a7851f6072edc96c7f3ed4fd2b93df130d4068a23bec0d3807d188c5198883683a95a5a5ed876eaf71ec6fe44907ace8b7d SHA512 eccb82bd32103efe2f3c732d680be5cfd8ef503e5b24c8b5086942412f59d898b8380759b80bb9ab3faad32943764e6a937e1abeb3ae35480656e1819ab6537c
 EBUILD flint-2.6.3-r1.ebuild 1170 BLAKE2B 48d562711cbc2dc0fb758b9f24679a9529e912ccf0008fbeb46d639f099798f69189266e2bda1a6b4c7337dd6dbd82f6fddd9db6a4b1cf7639c4e0d1b5ae3372 SHA512 891e482a3182179ffad15aeced9d8232c8b85b8ff399c3f396c7c36a053746a9e5cdbfb7633d60aa0f6935f41434f1001eb19445ea9dbd9740b8d5a1a901998e
 EBUILD flint-2.7.1-r1.ebuild 1372 BLAKE2B 4026ba6637f534d522ad3b7390ec491e764e440a913094fc98d9765b8cd3f89a0388099a56eb9805a2c588efc870d8cb7139b1d4daf8223314aed166b46b3162 SHA512 4f5cdebc04ff9888f5a235f4409b0428ba8ce4c18548c709cc0abf296254e6724f18d081f248f32c447c253af5dd7a71935bbd202e5789dd2b79981dd691a33e
-MISC metadata.xml 852 BLAKE2B 9d4e42cbf30d12f45eee522daebfa264095ecc7da2a031a0c7676066f2dadb18e71d7c53fd1f5c7220c78276029532999e44ccacad31903fb174ce2bf36ae3d0 SHA512 f05df1daaf10afa63535a1db4bf5a75185e9523aced9329d90df59e5ca5d1eeee23b30dfe3fab6a11bdcc95b1b5e9a8b1012a19457c66e3dccbdab5a6e303e4d
+MISC metadata.xml 737 BLAKE2B 1f88d93a32f6d74075c11e0d29f8f5b8c7cbfed6d2eb943284c49b05bd20484ba392ed5acc7fbdb40defefc76355ce029a882e71f74ee1cc01eed4873a91073a SHA512 36de4a606c13677c8abc469378888f41590a5b8b02be101a106bb7765c2a2f9084d64de59db55106558bbc086e2bb9905c6609e92ea0c03e3a2b4bfcf170ced9
diff --git a/sci-mathematics/flint/metadata.xml b/sci-mathematics/flint/metadata.xml
index d7a6c834fe0c..d0d5374ab2f5 100644
--- a/sci-mathematics/flint/metadata.xml
+++ b/sci-mathematics/flint/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-
-  <maintainer type="person">
     <email>mjo@gentoo.org</email>
   </maintainer>
 
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 34605f7595db..9c5912a1735c 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,6 +1,7 @@
+AUX gmp-ecm-7.0.4-execstack.patch 1568 BLAKE2B ccf8b74074bf357e74bc6126c505ebc77c389c851ee0ec35743c99270b6f36fa92d26c9df4b1f1a20e125a3b6dbd53522fa441d91fc4f8427d3b6d6ab50be07a SHA512 874924dd2f81c2e85dd4cdb0d8a14d1e22a9aca0c3883a9e16f1888f61b5af9b26a8c80469b65566a4becefce6a1d37ecdbba029648b4d62dc320f9e5a776453
 AUX gmp-ecm-7.0.4-openmp.patch 795 BLAKE2B 2a857cba5e0bc4e7dfe710c250bcb721dd2fd5e0c9c049987f8505d2efc758ff026b313bc92a2b18472bbebc320c8d1187c8506eaea6d2f1f6d51da284bca3ae SHA512 063d20e5a4cf088aaed31eb79c6b253ef4747d3d449c70936b4079c519480767f4f19dc259894422dc6d5783c9c360fc2c3a9fda4bb9b2a124a0e7bd90c08554
 DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
 DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
 EBUILD gmp-ecm-7.0.4-r2.ebuild 1215 BLAKE2B c018b48131e2baeb0f373993b32c2a1e05b9669932ac54ece52ba30b8e0b63a6e59ff4506cbcd85bcb1d7e3ace665d993d4bae830ecb9f2909530fc41d3a78db SHA512 912183343a5a87f9fb27934de2e729a4eef66dec2a72ef6afbdb59eff91da2e2222647976b4304d186c40ef65a79a3536103527fbf0d9346419a46ddc3e5b476
-EBUILD gmp-ecm-7.0.4-r3.ebuild 1430 BLAKE2B eb29cc60000a5348eb82b90d8a3167877b9703fa68332accf175766786066587dc3a228e7a34f711ceeef2b1d5c2e6cd25ca81c6b1d60a4b0fdcca785f52ba03 SHA512 ba4fdcaf9b304114619669f6e6af012bc5845d301a0734131abaf76663ea489766c2690545d4f97008ecacca60c3205a5e7caa0d1ad230989539dbf42fcbbd7b
-MISC metadata.xml 384 BLAKE2B 168807abd87bddc88522015f01126d5ec0bde8716aa38b6e619054d39e9bb12a6ffdaa3082328ecb56c0398b498c964c8e28c818d3887919fbe3065a28673f2a SHA512 a8a7aa64869c88ac293347281a80158cbd3cc84fc9f5ca56531d3d53b33601f9baa5c4f66c93508d6763dc54779a563faa09c4a473c670a9b217610efecca25c
+EBUILD gmp-ecm-7.0.4-r4.ebuild 2006 BLAKE2B 103f94466d63669a880d9b883799e2fbefb4f3d887eef3711569bf6e55aca319599c91b2b1b1979f922d9633e9491df3276037ff7f7100e85ed091001dc54b3b SHA512 c66648073d3097233010fccbcf55c16437910833cf521d8aad0cd22f272a0b65ea008809750abfecb1fe96d88828041382b3541a1740e6e35757593dd8003c40
+MISC metadata.xml 642 BLAKE2B 1fd7ded8fc3297865351312b2fe01357ba0f5cecdc7286204f584ebd8691f5d2dc42124ab22e11bb1e7afc99ca81a366de1c6438516ba299a37ac591c90c5115 SHA512 ae6a010d64adf5d6d6fcc3170e054f3fe6b5af6a996620ebf5d7cac6f4decca05562767706857143d9e4f75225e3ca21504b816248df1912c71b8eb4f02da771
diff --git a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch
new file mode 100644
index 000000000000..6cca19161911
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch
@@ -0,0 +1,49 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index e92d2c9..b602f12 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -604,32 +604,3 @@ AC_SUBST(CUDALDFLAGS)
+ AC_SUBST(CUDARPATH)
+ 
+ ])
+-
+-dnl Checks whether the stack can be marked nonexecutable by passing an option
+-dnl to the C-compiler when acting on .s files. Appends that option to ASMFLAGS.
+-dnl This macro is adapted from one found in GMP 6.1.1.
+-dnl FIXME: This test looks broken. It tests that a file with .note.GNU-stack...
+-dnl can be compiled/assembled with -Wa,--noexecstack.  It does not determine
+-dnl if that command-line option has any effect on general asm code.
+-AC_DEFUN([CL_AS_NOEXECSTACK],[
+-dnl AC_REQUIRE([AC_PROG_CC]) GMP uses something else
+-AC_CACHE_CHECK([whether assembler supports --noexecstack option],
+-cl_cv_as_noexecstack, [dnl
+-  cat > conftest.c <<EOF
+-void foo() {}
+-EOF
+-  if AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS
+-                     -S -o conftest.s conftest.c >/dev/null]) \
+-     && grep .note.GNU-stack conftest.s >/dev/null \
+-     && AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS -Wa,--noexecstack
+-                       -c -o conftest.o conftest.s >/dev/null])
+-  then
+-    cl_cv_as_noexecstack=yes
+-  else
+-    cl_cv_as_noexecstack=no
+-  fi
+-  rm -f conftest*])
+-  if test "$cl_cv_as_noexecstack" = yes; then
+-    LIBECM_LDFLAGS="$LIBECM_LDFLAGS -Wl,-znoexecstack"
+-  fi
+-])
+diff --git a/configure.ac b/configure.ac
+index 66a18dc..25b9aba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -590,7 +590,6 @@ error
+   fi
+   ;;
+ esac
+-CL_AS_NOEXECSTACK
+ AC_SUBST([LIBECM_LDFLAGS])
+ 
+ 
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index f36a15f13d2c..800fcf6b3584 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_PN="ecm"
 MY_P="${MY_PN}-${PV}"
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.4-openmp.patch
+	"${FILESDIR}"/${PN}-7.0.4-execstack.patch
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -29,6 +30,29 @@ pkg_pretend() {
 	use openmp && tc-check-openmp
 }
 
+src_prepare(){
+	default
+
+	# patch the asm files
+	# create a sample with the assembly code needed
+	# Quote around # are needed because the files will be processed by M4.
+	cat <<-EOF > "${T}/sample.asm"
+	
+	\`#'if defined(__linux__) && defined(__ELF__)
+	.section .note.GNU-stack,"",%progbits
+	\`#'endif
+	EOF
+
+	# patch the asm files
+	cat "${T}/sample.asm" >> x86_64/mulredc1.asm
+	for i in {2..20} ; do
+		cat "${T}/sample.asm" >> x86_64/mulredc"$i".asm
+		cat "${T}/sample.asm" >> x86_64/mulredc1_"$i".asm
+	done
+
+	eautoreconf
+}
+
 src_compile() {
 	default
 	if use custom-tune; then
diff --git a/sci-mathematics/gmp-ecm/metadata.xml b/sci-mathematics/gmp-ecm/metadata.xml
index b5bb0a9997ee..1922e4c13f31 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/metadata.xml
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+
   <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
+    <email>mjo@gentoo.org</email>
   </maintainer>
+
+  <maintainer type="person" proxied="yes">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
   <use>
-    <flag name="custom-tune">Improve performance of some operations by selecting machine-specific defaults</flag>
+    <flag name="custom-tune">
+      Improve performance of some operations by selecting
+      machine-specific defaults
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index b8f5cbb3610f..879e4473510e 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -5,5 +5,5 @@ AUX gsl-shell-nogui.patch 809 BLAKE2B 47f242696886a87179c91efd17b783dd81a74fbfbc
 AUX gsl-shell-strip.patch 361 BLAKE2B 7152b2fde2ac264cc9a78eb9f5b3a440e84a907e666b27361ad4a94d9e380bc9d3873066da959af8f1e67b5e165c90fb74e33425e8a83e2501cc3b07a8464330 SHA512 ecb78c52f34d678ecec5ca5f6ee9c85cf954866347501aaf2fd31133357d8085bbbaf3d6118ae2cd20e8375927ae9c1958732bfab09bf308bde7fc3255fa35bf
 AUX gsl-shell-usr.patch 250 BLAKE2B 6678c7fdd9f656be498025fc3d00b4d757c29e6aa451a95d71b78d81db9426ecd4fcc83ccd36352283a5c62c8084dae56d53feb85c144b7b725b5604141b4bc5 SHA512 e10df17a16969ad700e7f16c8fcf694e9c5f2d346e6db7ad5d616122c5160d9ea3d894354aef4214e48233a17e101b20b51c939fdbcb29b25169a4c6c07bc0c3
 DIST gsl-shell-2.3.0-beta1.tar.gz 3380519 BLAKE2B 3f63c74d48f01d1cd181a275facd979d31a06089004ac0db3b060d77cdcf4fb195ad064a76c64a7a13a6641102864cb79845b8f15573bc1481365952835f1fd7 SHA512 627c0b6bb35bc1a33bab16d0bb2b193b5a005a1d97a96e6a9038fbe7144936427131197983a2ef347ed91c655a82a4d477430a610d9e36453a2669ef0baae231
-EBUILD gsl-shell-2.3.0_beta1.ebuild 1580 BLAKE2B 9c38a701c95ee4f23d260609ccc685f374e0f3c3dd8115ebf3bbe97badba7f6b74d887ca9acb237195140e493afdedb0b172ca5905e4918fb10f133560bcaf9b SHA512 0ea48b4301d2150b1f6df5fe9fbaf8d5e8511a1754614ebedd9fb6145d77fba7e21099d35a34806237cceeefb95ee6cf8df1da4da2439851c23771f8975b4520
+EBUILD gsl-shell-2.3.0_beta1-r1.ebuild 1582 BLAKE2B 2bb262fde5efa8729670639cc627cc6f7062f83d7705dd2dfa30e47af8b75dff252d8744c515d0e2b55dda4555a7d4d35393799fb311f53fc770c7bf0401bad2 SHA512 607243850f9a6071047ef192235b898816b25e42a48d97ac52335bc71e055c862d5419042d608359c71ed367c039e410cbd554af5a4b60b2913d95659a3dd6b3
 MISC metadata.xml 849 BLAKE2B 8e574c5c621b89222cbf6c4b50abc7f54a84fa0f91cda62b924b9439ef19cc13e2d2a112b83c56514daa404acaca0bfd4bc4db27d8d39e6189726bbf467dd663 SHA512 27284450a3bfe41bdf8af180d9d51675ae4e7008990c73522d199bee926da0e434a74d5e6dffbecb22934f5f968fce44a97a4acd10792ac5d325bb7509947de7
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1-r1.ebuild
index f182d5168c48..2ee665f06083 100644
--- a/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild
+++ b/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc fox"
 
 RDEPEND="
-	>=sci-libs/gsl-1.14
+	>=sci-libs/gsl-1.14:=
 	virtual/blas
 	>=x11-libs/agg-2.5
 	>=media-libs/freetype-2.4.10
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 225e2da1d0a6..c3c90d3e41d5 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -19,5 +19,5 @@ DIST maxima-5.45.0.tar.gz 39946933 BLAKE2B bdccb6cb88d458eec4359b7bc0b5337c9d1d0
 EBUILD maxima-5.42.1.ebuild 4895 BLAKE2B dd388cfe14cef36137a91ff71912c23390e176d796ce02c36f59cbb1e8993a03b16ee32b4e6d792e59d95bad3bcd90e3e9ded23abb1e3c371f466bd53f44502c SHA512 64c8a759525fff99c99831be56ea268b213392c65b1ef2e9db133addfaefead39710264c6a599eee7c53262ef16f75fbdbb35a9516a7054f0934d6fd46303520
 EBUILD maxima-5.44.0-r4.ebuild 6278 BLAKE2B 9da7f0e09a3b6f370b20ce11915e4d9e893c1e1ea499ebfcf22d81ee2a0c17053b1e38450551855ac62356e3d4b8201f9a067ff94e169a00eb6c5a42ed73d82d SHA512 03083941bd72b72341edd0d5b35501b309a62d14bde6be6555d670e6a21b85ed800c35810dec1a713d6ffc59e0b8279a4daa4fb85385676412d0bff877d94dd4
 EBUILD maxima-5.44.0-r8.ebuild 6352 BLAKE2B e74faa47dd0ba27775e386b81c04e57cc94e992a7b2d0aa78aa24002bfa8256f9baaab8aab6414971d035f57a1bdcc522240975b523fe45c00d588e48af46684 SHA512 5ef06927b60d9c4071cd0a696ab9e3c66ebfc4ea0e8f48ee53675345804de996385da1f65666df4f6583a523c90493705485aa4c809daa7db58b24bd7639f5e4
-EBUILD maxima-5.45.0.ebuild 6349 BLAKE2B f9027a22e01e173860cc2752198db6286164fe9af92ca27bb79a7ecc6794981968322ff42762f3ddd620affcab1163035250aebffe719c03d20247c2350bb294 SHA512 3415b2e32d7b7ee9bf0f936ee950d5c911d98de90720d07cbb0e249dada4a0bedb556c2d7bb7116570cbc16af6f8fc9c5599bb45a774d8ffcf64c1eb47f2126d
+EBUILD maxima-5.45.0.ebuild 6347 BLAKE2B c366546e7eb20f9c5273425f0cb5e799d04c9c498fecfbaaf00382495caf2e8d72519a7b700ce703fc6692cf6e4eb78498e120c5ba7307fcdba4dad988f579c9 SHA512 81f3a18c6d1631e0f8bcd0b54f1cdebed967e735484b21fb648430b6ec276827d3f2a01c2210e3299806537e99118650cfa162d0cf6048f88adb0057bd012480
 MISC metadata.xml 1733 BLAKE2B 30e06c199d4c4919ea90aa5a0b3091b124b4b43fc7791d758afdb0d94069edfafe386ddd7ddbeb9aa2589a5ec3866ecabd9d71c1b41380db6212529ad376c846 SHA512 2a9ccad0ef037a65f7dae3ac3769ab0bdf54ac8789387d3bcab0e022f9dfb77b019d14dc03bd7777937076e822c837511c12fd8198e7b9bd7eb6e621e46c0be4
diff --git a/sci-mathematics/maxima/maxima-5.45.0.ebuild b/sci-mathematics/maxima/maxima-5.45.0.ebuild
index 32f16ada3d35..d76b8b910379 100644
--- a/sci-mathematics/maxima/maxima-5.45.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.45.0.ebuild
@@ -47,7 +47,7 @@ BDEPEND="
 
 DEPEND="
 	${LISP_DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? ( >=app-editors/emacs-26:* )
 	gui? ( dev-lang/tk:0 )
 "
 
diff --git a/sci-mathematics/relational/Manifest b/sci-mathematics/relational/Manifest
index 600584f00ad4..97cf2eb58bec 100644
--- a/sci-mathematics/relational/Manifest
+++ b/sci-mathematics/relational/Manifest
@@ -1,4 +1,4 @@
 AUX relational-2.5-no-qtwebkit.patch 3307 BLAKE2B d0a1c4aa6261e5f52017b73e6d3ab8d689d328cca2ce9af1af3ee916edd52f99a6f5782b5a5abc723589d8b11ab04c088e0d80a89306a105da55eb59941d6c78 SHA512 9ac91976ec18b87647767f6cff525fa32c0e35749a04ed9d280016ee3b0346f12fd341b22e36a8fa97650058c12b858dbbcdd0c3c1964f554342bc8ef6d059c2
 DIST relational_2.5.orig.tar.gz 118776 BLAKE2B bec1a8c1a3c7973b9200f9a61e65aa144998558a9798e1e869d970ba15d2f7970be8dad865cfa779f05ee535638011851534a3be0c354d216eb35f38f135cb4d SHA512 588e35a57cf915e544d62749b76ed81927ac06fd88271f0d4d88ee5f221928c2c24e2a88165aae63c1b9b120ddaa20e15e21fe9c207eac3150b744274ae45a8a
-EBUILD relational-2.5-r2.ebuild 952 BLAKE2B 1c4bc81688025d843a5d4209b07d5392265818ecd365788c84b8f8fcff156a110f5a5851ae6e8ce330774d912f2bc53121d78f1ecac69b577eeaed645637ee54 SHA512 df3a23e535e6786b2c4b0c3b64190ce836cfc6d27ad5524df88572613b155ac39b50b50b348f56a296369242f64d4ef3643e59d81ff35b6c5c452e4a38e06d8e
+EBUILD relational-2.5-r2.ebuild 953 BLAKE2B 6bba4f6861a12843ee41eb2a7ddabb8bb8c1fdaa3c1636808f74c45f7b2ee8c0538ed4d3efbe5ec1ee2b292f9d47866eb058c9eef9491ee22abfc6c4b55507c6 SHA512 cfcf392622291188fb233c27c3c67b491b201f565e9b160ad4871bfdbcac4514e4e18d5e69f0db6bc604e913ed77ac931a7c749115634e4dcba1d3efd3a7a1d3
 MISC metadata.xml 329 BLAKE2B af279e80c33a9c850fdf197cda6d3d649deccd92a4360f6524194ac549c3c02b46975067c8f5ee2dc45dc6f5e6ece260cdf8664ef9c916bdb3871b1020c685ec SHA512 27c79174fb317ea692be0a1f32fe608dc0947351875e0f0ec0acaaaa613dbac8929188522d41682f591da663a3ab934e5d362b71d9aad763248a6076f2057419
diff --git a/sci-mathematics/relational/relational-2.5-r2.ebuild b/sci-mathematics/relational/relational-2.5-r2.ebuild
index c751c62d6c57..708b76f72de9 100644
--- a/sci-mathematics/relational/relational-2.5-r2.ebuild
+++ b/sci-mathematics/relational/relational-2.5-r2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit python-single-r1
 
 DESCRIPTION="Educational tool for relational algebra"
 HOMEPAGE="https://ltworf.github.io/relational/"
 SRC_URI="https://github.com/ltworf/${PN}/releases/download/${PV}/${PN}_${PV}.orig.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,8 +26,6 @@ DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
-
 PATCHES=( "${FILESDIR}/${P}-no-qtwebkit.patch" )
 
 src_prepare() {
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index cde7611291d7..5b0ebdde45c9 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -4,15 +4,16 @@ AUX rstudio-1.2.1335-linker_flags.patch 505 BLAKE2B ac0ebca22f6dfcb799dd151e3c91
 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.1093-boost-1.76.patch 1420 BLAKE2B d6e88da35c646f649f0487a1993a75ce5e2edeea34dbd383b927a06d635136772bc24efb4598d8c12eaca188406958d71e3bac58e324b1e7e6792d037e73aa3a SHA512 99d0198f14a0d5966cedb96e6585dfeb5e23c7392b71f41a54ccd7ef3f81d067343805cf39fe118e6174e30b42689cffb08e7001c3ae0001388a5f241468c140
 AUX rstudio-1.3.959-core.patch 7302 BLAKE2B eceff2aa67fc1a1cb36433bfa0956a4a45da3a017f80987e14893018737b3fc40cf1bbf9641e900311db3f5182828b11452c960b40c4e20ed83e5c3692e458bd SHA512 cf4e0682e3961c1208f14055bc604c2b8b8cc6db955216858ef4d95ca91154ab4d1eef58fcb5cdea84b2b755c98cd837b9028dad1520dd9dba222a45074a68f8
 AUX rstudio-1.3.959-pandoc-mathjax.patch 1997 BLAKE2B 71d40c2299b0598f9687175fe464d334e821762972dc0c4027f71c124eef2fd6795030c4426cec56c6b4fe81b8b72598f97214bab1d2b2b2a4c0c551cc1421a7 SHA512 6a5a76898500d3a8a20636a3854d459e5b8d806f68b0a4a08fcf3dae98feeebe751c14a7e4f8275c02ad47de9795168d90505d4dada19ccbdfbef0e07229cb66
 AUX rstudio-1.3.959-paths.patch 6142 BLAKE2B ed7ea6025e919e24228ea55679b198496446bc711e0efd355e1bc4ed4822078b8a486fb8390aaf6cf5852447fc9405ca68099e4a566b24521d341744c7e719a7 SHA512 9ee6c13619d6dac9f7af85557be1c4430d801424c3b29cbc73b657686d2cba49476083ae2bf87f7cef0039672116d3385fb51a03e803d9ae02e4a721403e614a
 AUX rstudio-1.3.959-prefs.patch 3132 BLAKE2B b2d815c8c08b1f9fde82e41fe1c865d0d70c9ecec729e7c62bf858cc48ab00afbc99c59086b0c2c7ab1e0a0a956fa6f448dd407750d4e92101e6609ec2e59ee9 SHA512 0e9541dd7fba278339b0ed409be9997c86ef3ed536de791cce98f9b718476e9144c53be1572fd3f4d2396ddede05df625b4d584aa7e83add7e9ddc41989c9fcd
 AUX rstudio-1.3.959-qtsingleapplication.patch 2149 BLAKE2B 5d7170aeb02fff87bfde9ad55c004a3690c6f0d2ea73602e22c17a79efa81a207ed83d23595e4e071375fb6df60d57c9f17380fe3726f57b3e126c0448560fe8 SHA512 b98761454a0afb64806409f1e330557379cce7f23aaafd3bdfe913f6d41b56738bcc746e99cf5031c8559fac5368dcd299bcbe31b7f40e3a3a7a8f92217ace05
 AUX rstudio-server.conf 1337 BLAKE2B a9a85c76a1c7c5f32f55606c6e3c9b72662dbd25e4b005f9702ed301afc21425906faf06fca91c18328524c53437aee7c9c4aee26cf293cdc72375e91ec7f701 SHA512 f166f1aa4bd370fcfcb44c5694d4e6af8bc64c5f43671e0c1def10c555d248bebf54199097f37d628a083c65913f522b7b44c3bd6a1227c011cf25eed1dba4a6
-AUX rstudio-server.initd 377 BLAKE2B 4f49b9ae2a81cd60565f79f121d60f5531746febd1f6f68cc93863985bd9af28d4ef04f647bd1b492ca69273724c282bcaedcfb5d08b8f2ac237ddb6f5baa438 SHA512 828a485338088d129c57debec6557ad35db5b042c61489ae4341717ce2218bec59a873541c270f964bb9c708b75896f1a3e2e64a4245a1713979d3bd42c9d5c8
-AUX rstudio-server.service.in 161 BLAKE2B 0be9cb83304063c9123c6fa13b7751b2f848adde282fc586acccfa4110f902e4de9962211ca0c871f66f3563319fe195c9f230daa4d4e429357ff74701e4d2d7 SHA512 bcf1f30e460dd5f0562b20489ca5544c6bcfbfb0ee1c636c4365df433e97e02e9e3b233e4159a0c71ad6d319f34f93c22b8fbf6b36463e29f22df2acd71da173
+AUX rstudio-server.initd 398 BLAKE2B 0a621dbb4a931a225913c8197d652a13e8fd1abf5a4381a05b06e8304abe3155465e388c1d060dcda4b894344762bbbe6cf38a55b5fc8bdfbe4ada29f27b9468 SHA512 3ebda251177a20acc1e52da7cbdec6bf28b702a0aa3809739f570a9be1d1e81ae46515c2af1ce14404eb2db44c18fc293e69b05e88f1502419c07f9b370c4dbf
+AUX rstudio-server.service.in 182 BLAKE2B 36ae7ad62cc7f4b1280841039d668255ea3de541043039fc624a5d9c2595278c3fff4e8c6f056d52e0edd155025be5b3ea9564a4446bbdefd1f30cf3b2b80a60 SHA512 983484b9b970ee7a9294a78edcbba801520c2d1ace7920c961f4c2a38f27e07af11ed328b4de539be8f724ce04fbffb177374fa51918bbe4c5bc8194db15a4f9
 DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9
 DIST rstudio-1.3.1093.tar.gz 89554292 BLAKE2B defd68e65a2cbc570aaf6fb14bd16342946154cda7322549d426281aea48d923803f061c1cd7d74b65b000a67ed62713dd06d311617e54130cb7c08147b34694 SHA512 c8a8d2312353e574dc2fb8ff2e64bd46c8aaf889c86f9c81ce22a7275e4cbec436dadfdaee513c3fc47dd3ad003e07a25baac4d8fcf47cc21df919afa084e92e
-EBUILD rstudio-1.3.1093.ebuild 6922 BLAKE2B d35f9b9bacfdef7539632043be189d82676ecc7033cafd27caadb5f7ffa58ce220176239dfb3031314aa67a69158a83d688739d4c08bcd238be68d7bea3026bd SHA512 4796b58aa3dac3d4759b0c521ffa0157978c3b12be5655f03f5bff72dfcdfac96e13d1697bde1cadbef2284fdb1c51829d59d4b6bfb6db2af080f85b723e7e87
+EBUILD rstudio-1.3.1093-r1.ebuild 7005 BLAKE2B 9fb11909d4f2356bed0d5cdd626bad7e83364c031df894920e3f645488adbb7bd5489ce99717f4af45205db9dfb528ba12bd00f799f44bde2ee8ffc897016d7d SHA512 22569476478f751bdc4b8ce16618b0cb0632a7b6b0eb225cb9efa70669556f0d3ff08199eb5cceefca3798ca9001210f1f104781fe63f687566d1c6be9294e28
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/files/rstudio-1.3.1093-boost-1.76.patch b/sci-mathematics/rstudio/files/rstudio-1.3.1093-boost-1.76.patch
new file mode 100644
index 000000000000..5e832db2883b
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.3.1093-boost-1.76.patch
@@ -0,0 +1,55 @@
+--- rstudio-1.3.1093-orig/src/cpp/r/session/RStdCallbacks.cpp
++++ rstudio-1.3.1093/src/cpp/r/session/RStdCallbacks.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <boost/function.hpp>
+ #include <boost/regex.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ 
+ #include <r/RExec.hpp>
+ #include <r/ROptions.hpp>
+@@ -58,6 +58,7 @@ __declspec(dllimport) SA_TYPE SaveAction
+ }
+ 
+ using namespace rstudio::core;
++using namespace boost::placeholders;
+ 
+ namespace rstudio {
+ namespace r {
+--- rstudio-1.3.1093-orig/src/cpp/core/HtmlUtils.cpp.orig
++++ rstudio-1.3.1093/src/cpp/core/HtmlUtils.cpp
+@@ -19,13 +19,15 @@
+ 
+ #include <boost/format.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ 
+ #include <core/Base64.hpp>
+ #include <core/FileSerializer.hpp>
+ #include <core/RegexUtils.hpp>
+ 
+ #include <core/http/Util.hpp>
++
++using namespace boost::placeholders;
+ 
+ namespace rstudio {
+ namespace core {
+--- rstudio-1.3.1093-orig/src/cpp/core/file_lock/FileLock.cpp.orig
++++ rstudio-1.3.1093/src/cpp/core/file_lock/FileLock.cpp
+@@ -26,10 +26,12 @@
+ #include <core/system/Environment.hpp>
+ 
+ #include <boost/algorithm/string.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ 
+ // borrowed from SessionConstants.hpp
+ #define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"
++
++using namespace boost::placeholders;
+ 
+ namespace rstudio {
+ namespace core {
+ 
\ No newline at end of file
diff --git a/sci-mathematics/rstudio/files/rstudio-server.initd b/sci-mathematics/rstudio/files/rstudio-server.initd
index caa7e46d5df8..96c1e4f210c1 100644
--- a/sci-mathematics/rstudio/files/rstudio-server.initd
+++ b/sci-mathematics/rstudio/files/rstudio-server.initd
@@ -1,7 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+depend() {
+	need net
+}
+
 start() {
 	ebegin "Starting RStudio Server"
 	start-stop-daemon --start --quiet --exec /usr/bin/rserver
diff --git a/sci-mathematics/rstudio/files/rstudio-server.service.in b/sci-mathematics/rstudio/files/rstudio-server.service.in
index fb3e37305e00..08965a836a27 100644
--- a/sci-mathematics/rstudio/files/rstudio-server.service.in
+++ b/sci-mathematics/rstudio/files/rstudio-server.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=RStudio Server
+After=network.target
 
 [Service]
 Type=forking
diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1093-r1.ebuild
index 4fee0074c081..851ffef54c98 100644
--- a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.3.1093-r1.ebuild
@@ -95,6 +95,7 @@ PATCHES=(
 	"${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
+	"${FILESDIR}"/${PN}-1.3.1093-boost-1.76.patch
 )
 
 src_unpack() {
@@ -177,6 +178,7 @@ src_configure() {
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		-DRSTUDIO_USE_SYSTEM_BOOST=TRUE
+		-DRSTUDIO_BOOST_SIGNALS_VERSION=2
 		)
 
 	if use !dedicated; then
diff --git a/sci-mathematics/sha1-polyml/Manifest b/sci-mathematics/sha1-polyml/Manifest
index c966d6393a2b..3fc7d24d0e40 100644
--- a/sci-mathematics/sha1-polyml/Manifest
+++ b/sci-mathematics/sha1-polyml/Manifest
@@ -1,3 +1,3 @@
 DIST polyml-5.6-1.tar.gz 22041657 BLAKE2B c097dda273b12dfe013706e5fa313f210f1f0bf6b32766db6e459ce1bca46f93504baef3d7644922c60d119431d659cbd69d8cd273fcc94609eadff058d3cb9b SHA512 3107f4a5b17283dc3873b0ecf7eb1c607c42e14e859b50345b666f19412a2592e359ea29f03e56d390491e9104a71e0bf80eb39884f51d8724b37f8f935fa7d2
-EBUILD sha1-polyml-5.6_p1.ebuild 1898 BLAKE2B e876a967fa77cdef8bda9f03f5c24a0060769c5992e88e16b3f288ca36e4e4b3dc7a0856ab448449e5ba0217b108e125c1779331b22ddaf70399d15532584ba9 SHA512 2bf6adb9a8f691972a47ce317a766ce5a42b6030449ea240db813e4e52114e2fc03021f220f1bd60eec9ab412928919befc3c945e3ef22d56e15369fcf83edff
+EBUILD sha1-polyml-5.6_p1.ebuild 1903 BLAKE2B 96d2cce56fd919dfc19b90aee63621083cd22994649f32809f1e4b7c0371ac4a4703ecb28e4627cb2afb58d5a2eb16c9803881faa4f08a9d257bf632b8c2a3e6 SHA512 f9b5b23f1a4341f7341537c318a4b835f2acdacc3bf7529d57a3b10fca6e985589b29a10287d93403550d1043559d76bc083e85eb3e788d4eb32c7ea1eca501a
 MISC metadata.xml 631 BLAKE2B f1ea7f8c4cde6c764c3c0649d2977636de0984756e1d3953f0ec142688ac75b6c2f909220766115408059e81a596cde28a31b6d9684b41080b0cc6cc36e2904e SHA512 ce2a008b92696040b1de592443a3bf1ca927aa95380bc92e4558c0d362dd1d2dc33c023a522946fe0295936feb95a2b920cbe0fbd44e65d7c9d5ca3f955bb7b1
diff --git a/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild b/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild
index 20d02506c3c9..a76fba862963 100644
--- a/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild
+++ b/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild
@@ -53,7 +53,8 @@ src_test() {
 
 src_install() {
 	dodoc README
-	local ld="${ROOT}usr/"$(get_libdir)"/${PN}"
+
+	local ld="${EPREFIX%/}/usr/$(get_libdir)/${PN}"
 	dodir ${ld}
 	exeinto ${ld}
 	doexe libsha1.so
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 731216862618..6b369c917a31 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -7,5 +7,5 @@ AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
 EBUILD singular-4.2.0_p1.ebuild 2258 BLAKE2B d74e8ad0c98142364ff097e5e2d8585d01ba863021178d9c5206507c2318e71c0484bf620d77bae4927722395ef9b785d6e00be0d7d7bbd91086d71a2f54e143 SHA512 a9339d04e4beb91f440caede447bd565bf1576cab72b93e44ae39ce9be6ef26e294713b39526baa8c5ff68c867cbcddb9e87c42f19c27ca6e82786e4a5b2bf12
-EBUILD singular-4.2.0_p3.ebuild 2261 BLAKE2B 2e68d795ff1ce9984b01dd470b7715e561ba5dd32f5aefe812c4626aced0f2ac540615bfe20d7c5e2d933e91b02c3b764fdfd79e703e511a07dae4b283a480fa SHA512 19bc85354919eaafd0e244d423f44b6b4026e49a286df4613fcb2e55cade16568c5a9c4cad9890825de9bc7f0b8feac4bdaf280ac234ef767bd8c33ed07dab77
+EBUILD singular-4.2.0_p3.ebuild 2293 BLAKE2B 0140766a5e343a2650f6be85e1311ddf42670a8adbdc255b304b2e601c4ccb531a627e7525f2333d38ebd12c228f7209da0d1a23bb1e54a8cf31aa3b8dba368b SHA512 080c1bbb24d9af2a7d374cb1def71a896fe457424a631febbfce0df513fb1a70572514de7c70d6ad0887748720d3ece45f9efeba7d6670e13c8ac9b8ea6c462d
 MISC metadata.xml 275 BLAKE2B aaeef273b6352edaadf69ef76545573fbe0d22a6062f9567bcb34b1fdea4e2fb140b9aa0b4d8f44a3c3e31108f34eb555dded6f5808fac84fd29a83ef184da88 SHA512 e7e449f8bf039a1fc4707c0b12706d27b237fb3e7bee5e457bc79e032a04d7b9eb2901059b007350cc3617689638b76f97fbbd672e2d0101e2071448642415a7
diff --git a/sci-mathematics/singular/singular-4.2.0_p3.ebuild b/sci-mathematics/singular/singular-4.2.0_p3.ebuild
index df77bad38d57..2e0528d5512a 100644
--- a/sci-mathematics/singular/singular-4.2.0_p3.ebuild
+++ b/sci-mathematics/singular/singular-4.2.0_p3.ebuild
@@ -57,6 +57,7 @@ src_configure() {
 		--enable-libfac \
 		--enable-IntegerProgramming \
 		--disable-polymake \
+		--disable-optimizationflags \
 		$(use_enable static-libs static) \
 		$(use_enable emacs) \
 		$(use_with readline)
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index d22aab801b3b..2fdadb0b29f4 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -4,10 +4,13 @@ AUX why3-for-spark-2019-gentoo.patch 764 BLAKE2B ba9fd2c8ff6dfba4783c527cb02a5d4
 AUX why3-for-spark-2020-bibtex.patch 288 BLAKE2B 50459e0dfe6ef3d5b455993e9e7fbc3c8093d40a83dc2c0b8660c1d69d7d45cfc3fc657cb06dd3794741e7c3d923b46c0a0b7330c656be908aac72f921e7885d SHA512 0ce636357b9c3c31762bdfcb7487f812a6cfcb49c4c412236b7a6b1ec69f4c74f1b29ac80f4e441d872fe251ab050bc1b186acf514473c52e3680f2d274f4f9b
 AUX why3-for-spark-2020-flags.patch 841 BLAKE2B bc6b02a65cff3c705368a6612dcb1764c56c0aa5bade48ce79e5b8f75e36d6bc0b92257caea7bd531c92a8827d7c532875d6470e1dd4486863f320951061a865 SHA512 ea4148711def812c8fc7259ad046e6e29f383bd889c2fffea36cd8558026a3cba84702e47f06c372dc26c43dff87f5b5dbe98a162648d612059a5adc15c6415f
 AUX why3-for-spark-2020-gentoo.patch 332 BLAKE2B d71897d1d253a95f2a783483ee7bb0d243961cbc7218e05f3717a95388da0613e3f162a39cb4dac816035d6381ac69f189e352f2d83530b70b46b2439f7b92c3 SHA512 766de53c5cdede4bfdbac671851ec7de5060712622d4c89ce9117ef31596c2e4bd938bd2fe50d6a969f93ae252c40c83c2f782ad710fd52ab652434765483f90
+AUX why3-for-spark-2021-flags.patch 857 BLAKE2B 45ddb72200d4f4032d19e4bae0fb4f5b4e9c6b30d850f2c93be0b31b2369d2e061cff6e37bf5ae6cb6faa1970e05e90b685e7a677be7d93d3e2c33e623d01412 SHA512 9a66423e9b3f0a13f0bd7fa6e0e71a98a686d1259f2b1148c9ce7b7857bdfecce86d8e87f1407a5d6cf7c832d2008301ada5ee97df8f42fd8791de799ad3db99
 DIST 8bb5801e17b8b23453262da69c981c091959eec7?filename=why3-2020-20200429-199EF-src.tar.gz 9739066 BLAKE2B c7c11a92d4926f90be9ffa94d74e65ad78423953b53ee617565ccfcea4a5a60b251367b0712c30d170ab717d5868f7d95d62694f38c3d2f52805a28a6522ab8a SHA512 61cd5509957230ff81186d2507b9749b182cdc44698f6658337ce294d210742e57164d25d7c0eb3eb5ea0c53f5f46dea099e6a0769fadcb709a5a8557ed3cae3
 DIST why3-2019-20190517-197BB-src.tar.gz 9439414 BLAKE2B 68072064e8ee9152528c90afc948047a1f4d58b960ac05b276761fdca5ba1204100c75f33db7bb0ea1a8a646b734e62892ed41bd875b954354f52b8f9d498d4a SHA512 9169a4ff9ee994a19f9f04b689d1b9c679f5340bcd631d7d49b4c55064f505bd5a6ca8149077e5d24d36f5365f0cab58587094e86f352a9105fc46f10c0746ba
+DIST why3-2021-20210519-19ADF-src.tar.gz 10386938 BLAKE2B 93b6323c562126244f5cccef34088a521fe3dc1cec07c966e94472503ec8492707b20a641936449307f0439e711a82260d36679cbc69f53df8e7886a1d3673c3 SHA512 65e3c1430001962f2c7cce786f3e30f14b5295cff89c4087d95c1545e81743723319ba0309dbe15c4c46552110b25ff57addc3ee085dade02ea59a2273b127db
 DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
 EBUILD why3-for-spark-2018.ebuild 1729 BLAKE2B 14002f870711eaf350aa38c4fa8bcf3947585e08c873b6d9509756009caae20f52d389db22ef288c4c92146622ee43053cf784013331b638d6370278c5189772 SHA512 e3fac3fafa90980c2d3cf068e19477baa45cb01f517ee5dc235a7984f07f8dffb95f6ef329082bf6d5e88cfb8b02ae617b509010fdbb448644c3742b22d1733f
 EBUILD why3-for-spark-2019-r2.ebuild 3000 BLAKE2B c6f405a6e36086f7763e1717f610d2c3139e48ef259652b5489be6d0ac536efe17cada609b693e7d0d848d1c5a4d6b321015e03d7ee2f2ebff71a9ef23b08620 SHA512 27a484e227f693ad50b026e658bbe0fbdc230f7a96ee30115e8fe38149ebc9e574c638fa9e0012b6099aa5a03df3ac83ae5800b611ef6ad2406b18571831109a
 EBUILD why3-for-spark-2020.ebuild 2929 BLAKE2B 9a6dd9ee12f38a9c90899759318b7b4934bcdeb109320900c43b8b07f945f28988b8745771d88a3e284df2318280d08ea23cd72f4fd6fd98e23d3e7882990bb9 SHA512 eec3c1e053b2baaa97ef2808a4ccbff43358af9469e18cb14e30ceca043da68c3ec2ed848feff1cd1aeb0f31ef89f40cf192a9d47f9f8af11e0a487da8fba5ac
+EBUILD why3-for-spark-2021.ebuild 2894 BLAKE2B 374b928ca35a91de504caa2d083fae0fa63259b287a1459a8af67e995c7345af93b3475bddcf5ab5e5730fbfbb3ea0f8369ab1c8c3b294e6b218ae0618492cef SHA512 9620b825443e02741b8ce17c46399f431ed10497bc47fafadd86fe53bae898ecc43087bc4e6ac86cec81df5f157f545230fc2bebeb23b5ea20b78056177d0c48
 MISC metadata.xml 1363 BLAKE2B 820bfc974ca6984f78340f223f8f19d12f0313016118110a35cfe149129c2dc189d6f03f34bf3d30c9d3e5d9c9ab90bba33dca4320c034821a7a89f97b92a7f9 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2021-flags.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2021-flags.patch
new file mode 100644
index 000000000000..7f6dfd0f446f
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2021-flags.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.in	2020-06-12 21:03:33.375534124 +0200
++++ b/Makefile.in	2020-06-12 21:03:48.623283408 +0200
+@@ -127,7 +127,7 @@
+ 
+ WARNINGS = A-4-9-41-44-45-50-52@5@8@48
+ 
+-FLAGS = -w $(WARNINGS) -safe-string -keep-locs -bin-annot -dtypes -g -thread $(INCLUDES)
++FLAGS = -w $(WARNINGS) -safe-string -keep-locs -bin-annot -dtypes -g -thread $(INCLUDES) -cclib "$(LDFLAGS)" -ccopt "$(CFLAGS)"
+ OFLAGS = $(FLAGS)
+ BFLAGS = $(FLAGS)
+ 
+@@ -778,13 +778,13 @@
+ all: $(TOOLS)
+ 
+ lib/why3server$(EXE): $(SERVER_O)
+-	$(CC) -Wall -o $@ $^
++	$(CC) -Wall $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ lib/why3cpulimit$(EXE): $(CPULIM_O)
+-	$(CC) -Wall -o $@ $^
++	$(CC) -Wall $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ %.o: %.c
+-	$(CC) -Wall -O -g -o $@ -c $<
++	$(CC) -Wall $(CFLAGS) -O -g -o $@ -c $<
+ 
+ uninstall-bin::
+ 	rm -f $(LIBDIR)/why3/why3server$(EXE) $(LIBDIR)/why3/why3cpulimit$(EXE)
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2021.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2021.ebuild
new file mode 100644
index 000000000000..04dd0ae9fcb9
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2021.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=dd74ae7ecfd7d56aff7b17cee7a35559384a600f
+MYP=why3-${PV}-20210519-19ADF-src
+
+DESCRIPTION="Platform for deductive program verification"
+HOMEPAGE="http://why3.lri.fr/"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="coq doc emacs gtk html +ocamlopt zarith zip"
+RESTRICT="strip"
+
+DEPEND="dev-lang/ocaml:0/4.11[ocamlopt?]
+	dev-ml/menhir:=
+	dev-ml/num:=
+	dev-ml/yojson:=
+	coq? (
+		sci-mathematics/coq
+	)
+	doc? (
+		dev-tex/rubber
+		dev-python/sphinx
+		media-gfx/graphviz
+		dev-python/sphinxcontrib-bibtex
+	)
+	gtk? ( dev-ml/lablgtk:=[sourceview] )
+	emacs? ( app-editors/emacs:* )
+	html? ( dev-tex/hevea:= )
+	zarith? ( dev-ml/zarith:= )
+	zip? ( dev-ml/camlzip:= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020-gentoo.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${PN}-2020-bibtex.patch
+)
+
+QA_FLAGS_IGNORED=(
+	/usr/lib64/why3/commands/why3shell
+	/usr/lib64/why3/commands/why3extract
+	/usr/lib64/why3/commands/why3execute
+	/usr/lib64/why3/commands/why3prove
+	/usr/lib64/why3/commands/why3wc
+	/usr/lib64/why3/commands/why3doc
+	/usr/lib64/why3/commands/why3replay
+	/usr/lib64/why3/commands/why3webserver
+	/usr/lib64/why3/plugins/'.*'.cmxs
+	/usr/lib64/ocaml/why3/why3.cmxs
+	/usr/lib64/ocaml/why3/why3extract.cmxs
+	/usr/bin/why3
+	/usr/bin/why3config
+	/usr/bin/why3session
+	/usr/bin/gnat_server
+	/usr/bin/gnatwhy3
+	/usr/bin/why3realize
+)
+
+REQUIRED_USE="html? ( doc )"
+
+src_prepare() {
+	find examples -name \*gz | xargs gunzip
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-pvs-libs \
+		--disable-isabelle-libs \
+		--enable-verbose-make \
+		$(use_enable coq coq-libs) \
+		$(use_enable doc) \
+		$(use_enable emacs emacs-compilation) \
+		$(use_enable gtk ide) \
+		$(use_enable html html-pdf) \
+		$(use_enable ocamlopt native-code) \
+		$(use_enable zarith) \
+		$(use_enable zip)
+}
+
+src_compile() {
+	emake -j1
+	if use ocamlopt; then
+		emake byte
+	fi
+	use doc && emake doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install
+	emake DESTDIR="${D}" -j1 install-lib
+	emake DESTDIR="${D}" install_spark2014_dev
+	local cmdPath=/usr/$(get_libdir)/why3/commands
+	dosym ../why3server ${cmdPath}/why3server
+	# Remove duplicated files
+	for filename in config ide realize server session; do
+		if [[ -e "${D}"${cmdPath}/why3${filename} ]]; then
+			rm "${D}"${cmdPath}/why3${filename}
+			dosym ../../../bin/why3${filename} ${cmdPath}/why3${filename}
+		fi
+	done
+	rm "${D}"/usr/$(get_libdir)/why3/why3cpulimit
+	dosym ../../bin/why3cpulimit /usr/$(get_libdir)/why3/why3cpulimit
+
+	einstalldocs
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r examples
+	if use doc; then
+		use html && dodoc -r doc/html
+	fi
+}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index b309dd9d7303..52dc2747dbe8 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,5 @@
 DIST z3-4.8.10.tar.gz 4731869 BLAKE2B 92487f71a0c8d961949dc23032d8fa3ff157fe7acc29b41d0d79326f8b59c60e19f43527cccf4e51872c0f0664598f9063876b04cc581f918aa48c37a13c4f3f SHA512 d2741d7ad3e1d5ee3fec92095b061a96a700c3327b2eb2090d4162bdcaeaebca8c072ef79c5daac1f6de3456165c2cc38e13f1045bc707779d1027b943837c5b
+DIST z3-4.8.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
 MISC metadata.xml 616 BLAKE2B c35cac6f5810148c69a612d6b04ed4cacdbf066e61951ea1433336f14b2b058c4dd50530b547021007489122f5e94407b30641dc9ccf3b59a345e7a09e5fdd28 SHA512 eaf72a29601e96d5312120a1fc01a0b3dd2b7d8dbee70f6052e8ff7a7e07ae8b768d1417b7f4b523e755e5569092f2685bba77beaf3d7c455ccbd057cc9b670a
diff --git a/sci-mathematics/z3/z3-4.8.11.ebuild b/sci-mathematics/z3/z3-4.8.11.ebuild
new file mode 100644
index 000000000000..fdef20fc1775
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.11.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake-multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="https://github.com/Z3Prover/z3/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
+S=${WORKDIR}/z3-${P}
+
+SLOT="0/4.8"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc examples gmp isabelle java python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )"
+BDEPEND="
+	doc? ( app-doc/doxygen )"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DZ3_USE_LIB_GMP=$(usex gmp)
+		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
+		-DZ3_INCLUDE_GIT_HASH=OFF
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md RELEASE_NOTES
+	use examples && dodoc -r examples
+	use python && python_optimize
+
+	if use isabelle; then
+		insinto /usr/share/Isabelle/contrib/${P}/etc
+		newins - settings <<-EOF
+			Z3_COMPONENT="\$COMPONENT"
+			Z3_HOME="${EPREFIX}/usr/bin"
+			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+			Z3_REMOTE_SOLVER="z3"
+			Z3_VERSION="${PV}"
+			Z3_INSTALLED="yes"
+			Z3_NON_COMMERCIAL="yes"
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use isabelle; then
+		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
+			sed -e "/contrib\/${PN}-[0-9.]*/d" \
+				-i "${ROOT}/etc/isabelle/components" || die
+			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
+				contrib/${P}
+			EOF
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use isabelle; then
+		if [[ ! ${REPLACING_VERSIONS} ]]; then
+			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
+				# Note: this sed should only match the version of this ebuild
+				# Which is what we want as we do not want to remove the line
+				# of a new Isabelle component being installed during an upgrade.
+				sed -e "/contrib\/${P}/d" \
+					-i "${ROOT}/etc/isabelle/components" || die
+			fi
+		fi
+	fi
+}