gentoo auto-resync : 02:04:2023 - 05:16:35

3 files changed, 17 insertions, 56 deletions

diff --git a/sci-mathematics/easycrypt/Manifest b/sci-mathematics/easycrypt/Manifest
index a61868f5a7b6..0ebe95902171 100644
--- a/sci-mathematics/easycrypt/Manifest
+++ b/sci-mathematics/easycrypt/Manifest
@@ -1,7 +1,5 @@
-DIST easycrypt-1.0_pre20220303.tar.gz 1193244 BLAKE2B f4d4b0661b7c58d9dd2c344efac45aa4257b46122cef81f98ced05792c1e4dd49d332421f09d0b11a28893096042a98a7415d06e1624aaa59cea0c71f17f4bb8 SHA512 bd9f1638631c9539aea3ee369705fbaafa06d575db395b3d170642af2450b7df735a18fe8f6aa6e8904eae62bdcd30743ab734f7c17c583ece7c146fee1bcf77
-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 1070 BLAKE2B 3add63cc3e969bdece2c7a8ee861123d9b546803b7ee37038e9ef96e3db5365334927fcafd32288c77737c3dbff6cf734d4e401cdffa20ddbbdd2547bbd25e4e SHA512 25c0683707a25e29993c784ab7fa238123b36323b4eae6fc57a8e8699c12953f0bb5752f519ded1deef8b9d1cbc2e0fcda218a5e1732b848df312a117b33236e
-EBUILD easycrypt-2022.04-r1.ebuild 971 BLAKE2B 8887540e64030be55d90ba605fa29956ca5d4d14c329beb66f5894b1e88d2ad2c838d8b97be54679296a5f2fe2a3a1308e909eebbc40430f71238dedcf0ca033 SHA512 b87dcb1187f50164b95f3869503d3ab7e91a5a43b361f5d6cfb40df9bfd23da4908272e81044fbd2cf4bcfbdcce2759d5993a1e55753e6e3a0a94826cfb1eb59
+DIST easycrypt-2022.04_p20230324.tar.gz 1296898 BLAKE2B 119cb10ad5c2cd50db9f70eb858e2779cae0350b9e5370060b8045f36684a9de87ad746e75c6a7e7fcc7ad93e40bde2164866bb16e67dd2ebc3409657760cbd8 SHA512 917d5ff2fe65a1fd02a19d700cfb77910290746023458b6ed9eb9dc1290faa5469571a3c77510caac8734ad7d2ada6c7fbfc75bb933d0a57e9c303a8cf207026
 EBUILD easycrypt-2022.04_p20220505.ebuild 1055 BLAKE2B 5ee8fd75157312e59bcf4389d4b8b766cbd4edac7b3ed463b0783dc3a4d713b04f372ce3eb59a000dd04c459e5a5e3729c44a03d3f0903557afc87a14f6226c6 SHA512 85543f45160df62c453279109ad065d80aeb3729951b8a1c4c778c116849f530572ad812c14d23dbd64862c47c15062d0fd430e943d6967d1419dde8b32456ed
+EBUILD easycrypt-2022.04_p20230324.ebuild 1197 BLAKE2B a3f363f547cea997bf3e49953df448d00cf72cbc828a2ab495e636d9903fce7bb72c7b047cb0001859faac6d30d369fd6a38905a537a057b26075b1e490fe546 SHA512 48b15f4bd30f8c47d39009a76e0094f480822d9f50d5015e87b94a9c2b661a59df6f8512352886cfb26730f7797cfd81cda8150590a2cc56528203c41105b644
 MISC metadata.xml 799 BLAKE2B 967a758171a2fe87b648a29bf2663beaae7834119e55a7619c98518c96cfe459e59fe5dc72a9faea071c0b488dc8144f1c0e43677ac63646f1ba12cf831f4a88 SHA512 411ff1acad400c3e70e546fd59b20db13b0f1db121aca9f1af23da708cd82340114bc966f64cfb5a35e84967c1131c660ab260f867639932c67edf47c859c4ca
diff --git a/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild
deleted file mode 100644
index 0e74e30a9b91..000000000000
--- a/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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_pre20220303-r1.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04_p20230324.ebuild
index bb9b0527be75..8434aa25bbc1 100644
--- a/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303-r1.ebuild
+++ b/sci-mathematics/easycrypt/easycrypt-2022.04_p20230324.ebuild
@@ -3,30 +3,36 @@
 
 EAPI=8
 
-[[ ${PV} == *_pre20220303 ]] && COMMIT=c98b014c131b6c0b147b852902953dd6c5771603
-
 inherit dune
 
 DESCRIPTION="Computer-Aided Cryptographic Proofs"
-HOMEPAGE="https://github.com/EasyCrypt/easycrypt"
+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/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
+	if [[ ${PV} == *_p20230324 ]] ; then
+	   COMMIT=f62625928cc0970c88839c84897d1f6b17437519
+	   SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${COMMIT}.tar.gz
+			-> ${P}.tar.gz"
+	   S="${WORKDIR}"/${PN}-${COMMIT}
+	else
+		SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+	fi
+	KEYWORDS="~amd64"
 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:= <sci-mathematics/why3-1.7:=
 	dev-ml/batteries:=
+	dev-ml/camlp-streams:=
 	dev-ml/camlzip:=
 	dev-ml/dune-build-info:=
 	dev-ml/dune-site:=