gentoo resync : 03.07.2021

12 files changed, 160 insertions, 11 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index e912b8eb7857..b87fe32dd77b 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
index 7ca06ae53abf..8c03306ce6f4 100644
--- a/sci-mathematics/eclib/Manifest
+++ b/sci-mathematics/eclib/Manifest
@@ -1,5 +1,5 @@
 DIST eclib-20190909.tar.bz2 914900 BLAKE2B df57972792f96e65b25db5a2ab1063d5a8f1ad05edbed77d9ca2632ddfb4af2cb8586e572155beec09cc0c03472300d1e6fcbdda3527c36e9106006239f50600 SHA512 df829b10c353f528f2040b55d6198e3a48eba179b9a80e71794e4c6d46ee9bb13b3eccec15c7d286ec5d8252e6ba91157c2a08ac4e2da86969a4158450a41960
-DIST eclib-20210503.tar.bz2 920919 BLAKE2B 5481769d6e9152d85f69a15d856701b5faf0b2d7d8c5fd0e2b6452d7be1f5de23ec2c3f60603d87e4d95f25295ef2a2f44dacf5c844c6970e96a83cd61bdfe66 SHA512 a3ee992d97c00ec5069a090d19914b9e1d00b25f5f1fff1ccd02deb1d240e4773bcfe0e00366808b7afe3a24e0aed8bb2fc4e9cb4f9f97dfc6ef70c43362bd38
+DIST eclib-20210625.tar.bz2 921173 BLAKE2B 8ecfde35fd6e557601c0a4e5f877ec49e355dbd5bb4248256c89b1160406992f59568db1060a835bad482d6ba4f1f0cc7719af5f03ecdc79abbe2ca0c9ed713e SHA512 a1319e91790decbc5219e02edbad5b86a6d3e5400bec3a9a9f2c60b89d340a0b915458f93c86f63d21c4b72995aa5fe65e0b5346241f297fe54ba2d3fc183ae3
 EBUILD eclib-20190909.ebuild 1009 BLAKE2B 78281fa5043db50b79b5462af2098f09fc36d386da6f4c0d521eeae24b2faa4fb910881000c415ccde92016dfae358b84305829b9deaff742bba79906d4b4c77 SHA512 41eb82fb56e18fe7695eaaa1a523bf0eff903ab8e0fa852f431b7ce21ddfa3f11462999f15c48bc7e4e1218b59a7ec3022674d5363c33e7861dd3d9a1cc49b26
-EBUILD eclib-20210503.ebuild 870 BLAKE2B 159301f20949ea573a1eb184eecf142bc2f4a340ccd18ea43b34149a307914300d8a28cb31b17f0d40d602ddb5898c65af9fb21620ca3bb26c2f5aefe056ffee SHA512 d72323b79721ec38424c190470be0cafb2fc8201e71c080fb405a9da77022644b18834119b4ecc5d502dd5515b13b8bb9899f882d963b65070dedf8fcda219bd
+EBUILD eclib-20210625.ebuild 870 BLAKE2B 506dbcd5f522de66a04b25ba57c877e5bfd20cd9cc129f3347c1eaee3ea659e342fed91a0b9d906ad75a32d1a59f6df7db26ac7760bdd2e693b6ee357519a599 SHA512 2ada0f8638eb7c472188ca523abc8b679a111a5c819b7358ed79f5414dddab35eaa0fe2d45662cc26fab09105292d245a9bc5aefee33324299011d1051255241
 MISC metadata.xml 1088 BLAKE2B fec21e6f44389bcd376f3a6c9ba97c54cafb40a92c0c591f7d840b5a33d663e41a8481bd16567267be2fe664964da8b14e6ccdd5fccc3c53a25a2843548f82f5 SHA512 db99aa5762f72baeb9183aaf9c3b561fd53b9fc85368af3bdc13be34e81a5540a95e175874df2dae05243902ba687d6eb609f4dd7def059dee580affd3be74c8
diff --git a/sci-mathematics/eclib/eclib-20210503.ebuild b/sci-mathematics/eclib/eclib-20210625.ebuild
index 30537d59eb49..64c4360ac565 100644
--- a/sci-mathematics/eclib/eclib-20210503.ebuild
+++ b/sci-mathematics/eclib/eclib-20210625.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/${PV}/${P}.tar.b
 LICENSE="GPL-2"
 
 # Major version of /usr/lib64/libec.so
-SLOT="0/7"
+SLOT="0/8"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="boost flint minimal static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/lcalc/Manifest b/sci-mathematics/lcalc/Manifest
new file mode 100644
index 000000000000..2b67c379bd2a
--- /dev/null
+++ b/sci-mathematics/lcalc/Manifest
@@ -0,0 +1,3 @@
+DIST lcalc-2.0.1.tar.xz 849260 BLAKE2B 141044939b50903f5aa631ee7ca76ed1ffc65fd0604701376b67172a8f70bcded2a9303ac3f653b20b8a05da44034f21f775dbe98f6efd38cd4097957f5f5466 SHA512 cf7210cd79dad416e3c4cdc08a6ed276d88483b8dfc425fe2ed4a1592b8a31f82ed5ec7cc7b6308ac80d44cf20e9a07484e2004bbfdeabbbabf843d24d15cc2a
+EBUILD lcalc-2.0.1.ebuild 925 BLAKE2B 3fe06e50cdd46a985d2c56ae5c98b2620a46c8fe8e546175b6d93b36ffcee179ea0dc54213e8cd93b480d8b850448b0756542dafbab5ac848712505c6c55bb40 SHA512 8069e85f186ee4d9e69e3255b206a4747acc327dc8dc432b467435243a021dcfdc96565083377ac76705613d2f11256be2689edf9ab4a837bd329de1b9bd4578
+MISC metadata.xml 1164 BLAKE2B 0b8bfe9b7d489fba6618a15f52b58a176247d656c36e985d37a67fbc53af2a3479e3b87a113e96c958235758ff88f1c1ed3905c45e74f093359fd70605b03ccf SHA512 424af9bcee1342d88f3b5ec6a4fca3bc4be9a2fda41db399526c805b73bf67896a0f0e12b876166cc72b0093b0add8764d325b387476b2bf61cb560d7b41fdce
diff --git a/sci-mathematics/lcalc/lcalc-2.0.1.ebuild b/sci-mathematics/lcalc/lcalc-2.0.1.ebuild
new file mode 100644
index 000000000000..31632d687e6c
--- /dev/null
+++ b/sci-mathematics/lcalc/lcalc-2.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Command-line utility and library for L-function computations"
+HOMEPAGE="https://gitlab.com/sagemath/lcalc"
+SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/01b46cdbbf3e67a322320dc0b2750d50/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+# The subslot is the libLfunction soname major version
+SLOT="0/1"
+KEYWORDS="~amd64"
+
+# Omit USE=mpfr for now because it's broken upstream:
+#
+#   https://gitlab.com/sagemath/lcalc/-/issues/7
+#
+IUSE="+double double-double quad-double pari"
+REQUIRED_USE="^^ ( double double-double quad-double )"
+
+BDEPEND="dev-util/gengetopt"
+DEPEND="double-double? ( sci-libs/qd:= )
+	quad-double? ( sci-libs/qd:= )
+	pari? ( sci-mathematics/pari:= )"
+REPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with pari) \
+		  --enable-precision="$(usev double)$(usev double-double)$(usev quad-double)"
+}
diff --git a/sci-mathematics/lcalc/metadata.xml b/sci-mathematics/lcalc/metadata.xml
new file mode 100644
index 000000000000..9a24558f38a7
--- /dev/null
+++ b/sci-mathematics/lcalc/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <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>
+
+  <upstream>
+    <remote-id type="gitlab">sagemath/lcalc</remote-id>
+  </upstream>
+  <use>
+    <flag name="double">Use double precision (the upstream default)</flag>
+    <flag name="double-double">
+      Use <pkg>sci-libs/qd</pkg>for double-double precision
+    </flag>
+    <!-- Broken upstream: https://gitlab.com/sagemath/lcalc/-/issues/7
+    <flag name="multiple-precision">
+      Use <pkg>dev-libs/mpfr</pkg>for multiple precision
+    </flag>
+    -->
+    <flag name="pari">
+      Use <pkg>sci-mathematics/pari</pkg> for elliptic curve L-functions
+    </flag>
+    <flag name="quad-double">
+      Use <pkg>sci-libs/qd</pkg>for quad-double precision
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 6b369c917a31..af8cd148f9cb 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,11 +1,12 @@
 AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91d1a359e058fc654c6778456174d6cee9242f7fcaf81bf1464f47f43604b9e4eb298f051c6a4daba4630ca SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431
 AUX singular-4.0.3-gfan_linking.patch 705 BLAKE2B 9ec4dafad75885132d4f6bea65f945a5f6f383e39f3d375a70e12a86db983cc3d64e14b148db07c9577a46d2a8f534f43988d264fdb43dc61b247843af5f438d SHA512 4c2ab45f449f9c3d79165e1c9a0634fb08a9cd34dbc898e0e172409f6914ccd6e1c4e1719ccf0b36e591b4840e8cba08576ac1b57fadd08f8344b45e1af40d89
 AUX singular-4.1.3-doc_install.patch 2834 BLAKE2B d8e35169534ed9087fc1faf6029a111819d2198d5fa61134ba083920604f93a346e6f274da02361b0c03ba05fea2c4f1b23fe2af8a46d8e6705cf4ccd025751a SHA512 36d3b6f2d90479ae508c7771d4fd7724ada5f5102ece78c4d5bc113c23848973706f19a9e1467de322ecee29712dc1d915f41b491bef23529a43380ff69d84ef
+AUX singular-4.2.0-doc_install-v2.patch 2918 BLAKE2B 9b844a51165425e696db1270dcbdf6343356c313e797cee04bf8c0bad3c0c659302a88866877b729d50ba2e5717b4a1ec209f8ff57c1f71509e551ccc780f4bf SHA512 fc3aaf5b330057b1283a877d1ee5c97e6088a2eadfeaa2d85667ca3f8c661f400d52f7e29eb27da94c6be7b9809f8aea88dc2e33affc4b3a29d334b3e5798e78
 AUX singular-4.2.0-doc_install.patch 3390 BLAKE2B 753101890dadfdbd5c0e53a7e2c94572a02d43f0370f861ea164b4db38daf010ec30c8b939f030998f3b18e49f397b4a379991ad91f9edc83c26bc06354fe53f SHA512 8a6e95ca94faada5b9d4c568e1e2f2fa67ff34b514eba7c9d9f8b0701a1e1eb56d26d7740818149f534b28e6c98c08205d429297efaa905549def320573c7a26
 AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae
 AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
 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 2293 BLAKE2B 0140766a5e343a2650f6be85e1311ddf42670a8adbdc255b304b2e601c4ccb531a627e7525f2333d38ebd12c228f7209da0d1a23bb1e54a8cf31aa3b8dba368b SHA512 080c1bbb24d9af2a7d374cb1def71a896fe457424a631febbfce0df513fb1a70572514de7c70d6ad0887748720d3ece45f9efeba7d6670e13c8ac9b8ea6c462d
+EBUILD singular-4.2.0_p3-r1.ebuild 2428 BLAKE2B af72aae39de23df410fe1d6dfe475c3179f6355fffe1775d4d408bec6fe80aa37022e6a9838a45014488666b56cfaa627f1fc1d007d360fbbe6987f4b3ead197 SHA512 0921b4991019b449054fb7c7c60a9bd39ec6434a19321b79f63470f2e15889945f24bc15f48e12ba16a24ff23c368a73b0b062d0150104d39aa715511766bc55
 MISC metadata.xml 275 BLAKE2B aaeef273b6352edaadf69ef76545573fbe0d22a6062f9567bcb34b1fdea4e2fb140b9aa0b4d8f44a3c3e31108f34eb555dded6f5808fac84fd29a83ef184da88 SHA512 e7e449f8bf039a1fc4707c0b12706d27b237fb3e7bee5e457bc79e032a04d7b9eb2901059b007350cc3617689638b76f97fbbd672e2d0101e2071448642415a7
diff --git a/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch
new file mode 100644
index 000000000000..5e485b14e0cb
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch
@@ -0,0 +1,63 @@
+diff --git a/Makefile.am b/Makefile.am
+index fbea51d..e9365ab 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,10 +16,11 @@ bin_SCRIPTS = libsingular-config
+ 
+ install-data-local:
+ 	if test -e $(srcdir)/doc/doc.tbz2; then\
+-	  (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
+-	   mkdir $(DESTDIR)$(datadir)/info;\
+-	   mkdir $(DESTDIR)$(datadir)/doc;\
+-	   mv  $(DESTDIR)$(datadir)/singular/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
++	   mkdir -p $(DESTDIR)$(docdir);\
++	   mkdir -p $(DESTDIR)$(datadir)/info;\
++	   (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(docdir); tar -jx --no-same-owner -f -));\
++	   mv  $(DESTDIR)$(docdir)/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
++	   @INSTALL_DATA@ doc/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
+ 	fi
+ 
+ uninstall-local:
+diff --git a/configure.ac b/configure.ac
+index 490a45f..997db6c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,6 +228,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ AC_SUBST(DATA_DIR, "$config_datadir")
+ 
++AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
++AX_NORMALIZE_PATH([config_docdir],['/'])
++AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
++AC_SUBST(DOC_DIR, "$config_docdir")
++
+ SING_SHOW_FLAGS([Compiler/linker flags: ])
+ 
+ 
+diff --git a/resources/configure.ac b/resources/configure.ac
+index 0dc468f..da68144 100644
+--- a/resources/configure.ac
++++ b/resources/configure.ac
+@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
+ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ 
++AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
++AX_NORMALIZE_PATH([config_htmldir],['/'])
++AC_DEFINE_UNQUOTED([HTML_DIR],"$config_datadir",[htmldir])
++
+ AC_CONFIG_FILES([singular_resources.pc Makefile])
+ AC_OUTPUT
+diff --git a/resources/feResource.cc b/resources/feResource.cc
+index 3d75bc9..7e4fc8c 100644
+--- a/resources/feResource.cc
++++ b/resources/feResource.cc
+@@ -85,7 +85,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
+   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
+   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%D/info/singular.hlp", (char *)""},
+   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%D/singular/singular.idx",  (char *)""},
+-  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%D/singular/html",              (char *)""},
++  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    HTML_DIR,              (char *)""},
+   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "https://www.singular.uni-kl.de/Manual/",    (char *)""},
+   {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
+   {"Path",      'p',    feResPath,  NULL,                   "%b;%P;$PATH",             (char *)""},
diff --git a/sci-mathematics/singular/singular-4.2.0_p3.ebuild b/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild
index 2e0528d5512a..7e20b068308c 100644
--- a/sci-mathematics/singular/singular-4.2.0_p3.ebuild
+++ b/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools elisp-common
+inherit autotools elisp-common flag-o-matic
 
 MY_PN=Singular
 MY_PV=$(ver_rs 3 '')
@@ -36,7 +36,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-gfan_linking.patch"
-	"${FILESDIR}/${PN}-4.2.0-doc_install.patch"
+	"${FILESDIR}/${PN}-4.2.0-doc_install-v2.patch"
 	"${FILESDIR}/${PN}-4.2.0-no-static.patch"
 )
 
@@ -47,16 +47,19 @@ src_prepare() {
 }
 
 src_configure() {
+	# singular may segfault with common optimisation such as -O2 without this flag
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
 	econf --with-gmp \
-		--with-ntl="${EPREFIX}"/usr \
+		--with-ntl \
 		--with-flint \
 		--enable-gfanlib \
 		--disable-debug \
 		--disable-doc \
 		--enable-factory \
 		--enable-libfac \
-		--enable-IntegerProgramming \
 		--disable-polymake \
+		--with-libparse \
 		--disable-optimizationflags \
 		$(use_enable static-libs static) \
 		$(use_enable emacs) \
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index 2fdadb0b29f4..2245f12a6126 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -4,7 +4,7 @@ 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
+AUX why3-for-spark-2021-flags.patch 1234 BLAKE2B 617040fbf9204382adda8161a07ab5244bb60daf1936a8c549ccd3c28a10e447c80cf8875ef2d16103751dfc9881c15e0a8f39f2877fe7d0adf9a8dd374e1e21 SHA512 abbe1b1f9ed6b5aedf0521e0f8d19b6f0267c5304000419f6df91b581bfa99a46c4b46ceed5a294ffc47c0b2f987666c6cd5801049da14b79f24885cbd227bcb
 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
@@ -12,5 +12,5 @@ DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b2
 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
+EBUILD why3-for-spark-2021.ebuild 3001 BLAKE2B a1132a71dd334a1fceea28792ecb932262ffc9d38b865ca719c1b7c65d44f37ec41fcc91539e7b1a1ef61b044d8e24e01dbd83578ea07edd1e9985ce1909d52a SHA512 c7153c57f285da11e34ee1b1b6996ce7766fc64e6a972e016ae46933265ba2569dbbf7eeb8e33afa864b2e12266be3a1438d836f832f7e1d892def4e6e2ceb78
 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
index 7f6dfd0f446f..e12ec73318b9 100644
--- 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
@@ -9,6 +9,15 @@
  OFLAGS = $(FLAGS)
  BFLAGS = $(FLAGS)
  
+@@ -572,7 +572,7 @@
+ lib/plugins/hypothesis_selection.cmo:  EXTOBJS += graph.cmo
+ ifeq (@enable_ocamlfind@,yes)
+ lib/plugins/hypothesis_selection.cmxs: FLAGS += -package ocamlgraph -dontlink "$(EXTPKGS)" -linkpkg
+-lib/plugins/hypothesis_selection.cmo:  FLAGS += -package ocamlgraph graph.cmo
++lib/plugins/hypothesis_selection.cmo:  FLAGS += -package ocamlgraph
+ endif
+ endif
+ 
 @@ -778,13 +778,13 @@
  all: $(TOOLS)
  
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2021.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2021.ebuild
index 04dd0ae9fcb9..b851107a4c41 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2021.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2021.ebuild
@@ -16,7 +16,7 @@ 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"
+IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt zarith zip"
 RESTRICT="strip"
 
 DEPEND="dev-lang/ocaml:0/4.11[ocamlopt?]
@@ -35,6 +35,7 @@ DEPEND="dev-lang/ocaml:0/4.11[ocamlopt?]
 	gtk? ( dev-ml/lablgtk:=[sourceview] )
 	emacs? ( app-editors/emacs:* )
 	html? ( dev-tex/hevea:= )
+	hypothesis-selection? ( dev-ml/ocamlgraph:= )
 	zarith? ( dev-ml/zarith:= )
 	zip? ( dev-ml/camlzip:= )"
 RDEPEND="${DEPEND}"
@@ -85,6 +86,7 @@ src_configure() {
 		$(use_enable emacs emacs-compilation) \
 		$(use_enable gtk ide) \
 		$(use_enable html html-pdf) \
+		$(use_enable hypothesis-selection) \
 		$(use_enable ocamlopt native-code) \
 		$(use_enable zarith) \
 		$(use_enable zip)