gentoo resync : 12.05.2022

4 files changed, 54 insertions, 9 deletions

diff --git a/sci-mathematics/easycrypt/Manifest b/sci-mathematics/easycrypt/Manifest
index 5236f5665c12..de5be6a92a95 100644
--- a/sci-mathematics/easycrypt/Manifest
+++ b/sci-mathematics/easycrypt/Manifest
@@ -1,5 +1,7 @@
-DIST easycrypt-1.0_pre20211210.tar.gz 1185137 BLAKE2B 3557a8b0423109a3b3e6e02f6d1ad88f07847d105015546c90b5a46cf514f1311390d3a6f6476c042420b91a62ad095919f7ab616adee2778165d9d081070730 SHA512 0043eac02e916dc46ed1cb4f278f148f915d09f336e904b1a711c18d62cda177e434fc13682ec095a085e458ba90ca8dd02968206af60f0b80a378f16b205553
 DIST easycrypt-1.0_pre20220303.tar.gz 1193244 BLAKE2B f4d4b0661b7c58d9dd2c344efac45aa4257b46122cef81f98ced05792c1e4dd49d332421f09d0b11a28893096042a98a7415d06e1624aaa59cea0c71f17f4bb8 SHA512 bd9f1638631c9539aea3ee369705fbaafa06d575db395b3d170642af2450b7df735a18fe8f6aa6e8904eae62bdcd30743ab734f7c17c583ece7c146fee1bcf77
-EBUILD easycrypt-1.0_pre20211210-r2.ebuild 997 BLAKE2B 478ad9edc20d1da5f92c52fecf0d642591d926accc3040eb0eec9406fe99db24455b525d4334d5859bcc20e0cc472cb49ff005dc042151ba403cc0fc765f94a9 SHA512 ab80d2e314d2bde1877967bbec78c9226750fa5d8b80bddd5cdb2beeea26b478f5b4274ac10e4d3fba3d3c5e49a7762b061e1b4f433d51008dd4a60aa6a3f468
-EBUILD easycrypt-1.0_pre20220303.ebuild 997 BLAKE2B 323b45bd51376db37ac84b6205fc5d82647019a2a8473c34fe2d3fe53fe72b4d2e5a01aa13f862088b240328ae13d5aeb8d75b194cd84a73dd13ab76c2803e37 SHA512 ad99ec439aa7e855fb602d6ddcfde4a7bd829b28950c7489b9a50166fa862db1784d592e6bcdc6b863243a528de179a07ef65a3c3a2990d9eaf9a9e27770751b
+DIST easycrypt-2022.04.tar.gz 1277930 BLAKE2B 4bb68325b9894e28dcf33f2b78f63c029375ba4f77d0df06cedff3a26be768827c9fb25f49cc8ecc8a2d341191fb0b9371825979f0f7cd14c69b3ced16ddc32c SHA512 9234de7f28999a6de79a3ecd27d3499ffb15fe651b2a577cf0b49fc73e034bbe1b4d99c2a7aafd3df70d9b4e095d1ae09ed8ff7a7885c020f9e5c990afe9b592
+DIST easycrypt-2022.04_p20220505.tar.gz 1279876 BLAKE2B 10ae22e216b8a35973ad7d1dbffe1dba9ce328b67319577cd1a7fad957f08174d1651ee6c1bab8cdf12d8fda20cb85d5a334ad41dfb3e55f9ee8beb8a233a2eb SHA512 b1231e0be787a667c836d970236d47311e490443a66bc0a3834963557b32358ad9db2008e32d427d232f2a94c72afc65bd3330b6db1eb938335791ea997b4013
+EBUILD easycrypt-1.0_pre20220303-r1.ebuild 1025 BLAKE2B c4460c36a18f69a1fa1f43f9921427f9e53bfce1a34b8f07415ebaf1079d63ebf44e7e81580425c176a4c85ef98390b5e3f8a2a41154c7be0b6ce7925a06e3a3 SHA512 23fccb37b6c1900488c6dd7ebd35f807179d221d5bcc6e08403627e2682e91f850fc0ee44b498061f2ac597ece28043b6f9bcedb9c2e3a7f686da9fbd058fcae
+EBUILD easycrypt-2022.04-r1.ebuild 971 BLAKE2B 8887540e64030be55d90ba605fa29956ca5d4d14c329beb66f5894b1e88d2ad2c838d8b97be54679296a5f2fe2a3a1308e909eebbc40430f71238dedcf0ca033 SHA512 b87dcb1187f50164b95f3869503d3ab7e91a5a43b361f5d6cfb40df9bfd23da4908272e81044fbd2cf4bcfbdcce2759d5993a1e55753e6e3a0a94826cfb1eb59
+EBUILD easycrypt-2022.04_p20220505.ebuild 1012 BLAKE2B 95a9c43ec8869b7873020327e26f2052b5897c3b3ed44ba64c05037138852ff72bd135daa42bb0edf7308f42b599b5790bf4bb876e908af31b67436efbf9e66b SHA512 0563ec8ba74bb0946c80981d5d02ed80bae89e439c9e635e8fac8a8f7402f08d9351697db4d5335ced5963212bca316bba4706dfd85e0980aa89388abff79cf6
 MISC metadata.xml 799 BLAKE2B 967a758171a2fe87b648a29bf2663beaae7834119e55a7619c98518c96cfe459e59fe5dc72a9faea071c0b488dc8144f1c0e43677ac63646f1ba12cf831f4a88 SHA512 411ff1acad400c3e70e546fd59b20db13b0f1db121aca9f1af23da708cd82340114bc966f64cfb5a35e84967c1131c660ab260f867639932c67edf47c859c4ca
diff --git a/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303.ebuild b/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303-r1.ebuild
index 84353ee281ec..c4f262d6d87c 100644
--- a/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303.ebuild
+++ b/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303-r1.ebuild
@@ -25,7 +25,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
-	>=sci-mathematics/why3-1.4:=
+	>=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:=
 	dev-ml/batteries:=
 	dev-ml/camlzip:=
 	dev-ml/dune-build-info:=
diff --git a/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild
new file mode 100644
index 000000000000..0e74e30a9b91
--- /dev/null
+++ b/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Computer-Aided Cryptographic Proofs"
+HOMEPAGE="https://github.com/EasyCrypt/easycrypt"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/EasyCrypt/${PN}.git"
+else
+	SRC_URI="https://github.com/EasyCrypt/${PN}/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-r${PV}
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
+	>=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:=
+	dev-ml/batteries:=
+	dev-ml/camlzip:=
+	dev-ml/dune-build-info:=
+	dev-ml/dune-site:=
+	dev-ml/ocaml-inifiles:=
+	dev-ml/pcre-ocaml:=
+	dev-ml/yojson:=
+	dev-ml/zarith:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	local theories="[\"$(ocamlc -where)/easycrypt/theories\"]"
+	sed -i "s|EcRelocate\.Sites\.theories|${theories}|g" src/ec.ml || die
+
+	default
+}
diff --git a/sci-mathematics/easycrypt/easycrypt-1.0_pre20211210-r2.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04_p20220505.ebuild
index ef1279bbd12b..e83988a1a04e 100644
--- a/sci-mathematics/easycrypt/easycrypt-1.0_pre20211210-r2.ebuild
+++ b/sci-mathematics/easycrypt/easycrypt-2022.04_p20220505.ebuild
@@ -3,29 +3,29 @@
 
 EAPI=8
 
-H=49aec58ea63a64adcf5fbabcc14c6739f337b206
+H=a49a0acf5f7e2776f6b10cd49f8a201ebab0cf03
 
 inherit dune
 
 DESCRIPTION="Computer-Aided Cryptographic Proofs"
 HOMEPAGE="https://github.com/EasyCrypt/easycrypt"
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/EasyCrypt/${PN}.git"
 else
 	SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${H}"
+	S="${WORKDIR}"/${PN}-${H}
 fi
 
-LICENSE="CeCILL-B CeCILL-C"
+LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
-	>=sci-mathematics/why3-1.4:=
+	>=sci-mathematics/why3-1.5:= <sci-mathematics/why3-1.6:=
 	dev-ml/batteries:=
 	dev-ml/camlzip:=
 	dev-ml/dune-build-info:=