gentoo resync : 22.01.2021

4 files changed, 14 insertions, 46 deletions

diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index b57b041d11e6..36a12938fc46 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,5 +1,3 @@
-DIST alt-ergo-1.30.tar.gz 380329 BLAKE2B fab16757ed110474cf8f9d01ab53f76b6a300eb478b32bbfd6bb79d7603b1f5c2fc5c97bf44358eb138283f3487ef90febd23865723a4721b01bd870cfdd6507 SHA512 6ac6abdc6602b0ba89ee58eb96c66ac93e8195e0b4f75595381eded86365c2dd881251de2b77e2f1137684651ddc7fd94f922509de0be2964d81f52a6fb0f2f2
 DIST alt-ergo-2.3.0.tar.gz 455577 BLAKE2B 1836782be452df5147fc3041517fd267f3ce7facd15ad460c3e1dfba2b6ea455fee79ad8264ccb12cf21622c21a54c186c9943e7bffb392daab15d046ff93863 SHA512 a2f209b62b8494bfefe84328cdc786185e0534c5e224e212b83045b078352a51d2ab02622f72c22c74c7de95c7a554cbdae2a9a8a0c41f3f26c841f8c72f6b21
-EBUILD alt-ergo-1.30.ebuild 705 BLAKE2B 2ed4bdb55ba084ae8364cf49200a61b9b4c64941817acc1a448ebb5124eaaac264c8d895e5d98e4093fca05a9b7d6db638cf89a808d95af313c49a79cc94f9b9 SHA512 aa1f48cb7fb8d99d7745d77edbc9f69f9f591029c354018243d309f6d27be7e595758ae2f46a7854e82b456afc5405205e31d5f84e974949ad6e9248dc48cd39
-EBUILD alt-ergo-2.3.0.ebuild 1192 BLAKE2B d67021c7185ee7c260941dd90e704e707c06d45c042fb49b7e621875cde88155d01e94f32a2e9a76d72e639c6a54644b8bc57901b52ffe45e1b67ec734c9dbc1 SHA512 feec299d55489c1ee62bd30428effd73c421ee960e08621b0e3989a8f5c6690e85005b803fe934e9bd8c89ef3b97bc414d7eaea6f7ea8b09c0b012af6307f96a
-MISC metadata.xml 670 BLAKE2B 5f03c359cb298cc9a0fea6ef3a5deb092e5ccca7acfb2b7a5630303659bfd853fe86277ebbfb1fb7b6677d45dde2d5c68d55fffa8d3d8187acac3765f52df7c9 SHA512 9e514e4da2b92aa1e8e8e084450f478b51947172b689664dfe6c0fe0eb139e278e13689c8ba53825cb3bc32140cfd4cd7a68fede0d013cd065d5339d34931e8d
+EBUILD alt-ergo-2.3.0.ebuild 1207 BLAKE2B 395779b3fa2c360a9162ee18b5a8266f978ac96ac09e4da308efbb3f3eabc1cff770c2404dd1e2c0531d8b74b40b82e11331b5a5a69ef92bfe589ddcd7fbfa05 SHA512 d4611afe608836003b93f7e6942da711799116cffaed63ccbbbd1b36a8d8de638a5fee103d3cc751df8cb332e54e28bcaff72142b1be2a3fa1ba4bea1349b257
+MISC metadata.xml 752 BLAKE2B f01d0f3db111709d36917dafe391a9c6c95d9b814efe638ece98750b5fb69275b38cc1c0161820d11fcc8a9e4bbc757e892c6dff0272e30851c2effc2e6067c5 SHA512 0c8a0a93610fb79a3d54611182af60f77e77594caa212e1d8b91b6d9aed240f3a55f5078ddd1e991d07909c610983bc6a4f56934fa51085e96109991d7746a12
diff --git a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild b/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
deleted file mode 100644
index 197ea8a7f2dd..000000000000
--- a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Automatic theorem prover"
-HOMEPAGE="https://alt-ergo.ocamlpro.com"
-SRC_URI="https://alt-ergo.ocamlpro.com/http/${P}/${P}.tar.gz"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples gtk +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-3.12.1[ocamlopt?]
-	dev-ml/zarith
-	gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] )
-	dev-ml/camlzip
-	<=dev-ml/ocplib-simplex-0.3"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES INSTALL.md README.md )
-
-src_compile() {
-	emake
-	use gtk && emake gui
-}
-
-src_install() {
-	default
-	use gtk && emake DESTDIR="${D}" install-gui
-	use examples && dodoc -r examples
-}
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
index 7f950f433a25..bbe4688b7840 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.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
@@ -12,16 +12,16 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="examples gtk +ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt?]
-	dev-ml/zarith
-	dev-ml/lablgtk:2[sourceview,ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=]
+	dev-ml/zarith:=
+	dev-ml/lablgtk:2=[sourceview,ocamlopt=]
 	dev-ml/camlzip
 	sci-mathematics/psmt2-frontend
-	>=dev-ml/ocplib-simplex-0.4
-	>=dev-ml/menhir-20181006
-	dev-ml/seq
-	dev-ml/dune
-	dev-ml/num"
+	>=dev-ml/ocplib-simplex-0.4:=
+	>=dev-ml/menhir-20181006:=
+	dev-ml/seq:=
+	dev-ml/dune:=
+	dev-ml/num:="
 RDEPEND="${DEPEND}"
 
 DOCS=( CHANGES INSTALL.md README.md )
diff --git a/sci-mathematics/alt-ergo/metadata.xml b/sci-mathematics/alt-ergo/metadata.xml
index 8e305fa324a8..f428be9bb600 100644
--- a/sci-mathematics/alt-ergo/metadata.xml
+++ b/sci-mathematics/alt-ergo/metadata.xml
@@ -13,4 +13,7 @@
 		various domains such as hardware design, software verification and
 		formal testing.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">OCamlPro/alt-ergo</remote-id>
+	</upstream>
 </pkgmetadata>