8 files changed, 180 insertions, 21 deletions
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index d32e219ec8ad..c7b896928f81 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1 +1,5 @@
-DIST alcotest-0.8.2.tar.gz 25456 BLAKE2B 6f3362dd83d127600710a9efcf5428ce1d960a2a8798a533c3216d7c8934dadd38f672f383e45c0a0ab441e723b4c6477a3c92905e2351e81bbfda324e373e69 SHA512 df1cf5ab42e91a66cae2913504d6825f842169332b8673047faea769966f62d61cb1c288325a840211df0b22c31208566cf754b0816bfdf5d8ef34e8c5127668
+DIST alcotest-1.2.3.tar.gz 274177 BLAKE2B 1c38baf8932fe16ec3899cd1dd747099065cf93677271aad5ec33706ed7b6fd82dac84f9ed7518c56d178bf1f98a0b131d5e0f4745d47b07021f0fef932fde28 SHA512 0f3e2a5f56a17b6ddf5173d490b8a1aa2b23382bd0535d9d8be09fb8d4dd02dd1b92f9d00b957b11843d671262469e28b3be4f987538e373eb5e1f30c3a406a3
+DIST alcotest-1.4.0.tar.gz 279675 BLAKE2B 3cc50ab37a16948ceca9b5e6aa885fa50bbe0722c6132ed4991fb64c568253d9913287d1b9e5547f59a210d6803e2a83565f02950fb12cb91ed9f8e24d7864c1 SHA512 adb73c8b2be6f47cb406bbc49dba7dc86e990a60e2e68302592a24dcc24e11e76e2aa6fc2f003c1e4fdbb79744df6ab601daff9540cd7b0096ac9f9bff18098c
+DIST alcotest-1.5.0.tar.gz 288227 BLAKE2B 6af28f2516888273903bbb7750ba583778c54447157ece29ad8053323492dddfde9b901699be26c868f1f3835ad89d6f163176033f52ffdccc82fa2609e57b64 SHA512 9f496d1b14a78a9cba5dfde71cbda41d3090d2083bc9895dc9d9f54876b86630079219e678f13f6ffd382deb2a1a298b61b2a222fc65d25d4a242d8c280b4784
+DIST alcotest-1.6.0.tar.gz 288586 BLAKE2B 6e7ab4618d899346de3d8ef63c1b81f92d9cdca06e9df03bf2ea5f0a6b7d5b8ae5a231dc92aca5ebc268e3fda93d448f6edd12333ad6c657ef5361921e31f838 SHA512 58079596334c193d00f22c5fc708952f01b40593eabb26cf9725d51250fc5b816d0bf40c70bab50e9b88a973008a9889f95601127731e8c1583e4ef17173fe9e
+DIST alcotest-1.7.0.tar.gz 293433 BLAKE2B 83a9b1bb3a6d9ec09de739e77a6e1085bbca328f5be39f6ab28931a7bc16d223d571917f924598ddcc399910f986df95eb72ae61f28512221d9de6174ffe3988 SHA512 6e29cc39109f5d83a175578f48ff1b48fdf13913b7cdd332823a660c681ab0cd5dec41b10322226102b023d7c74620decf964458926abed56ae835e4e565014e
diff --git a/dev-ml/alcotest/alcotest-1.2.3-r4.ebuild b/dev-ml/alcotest/alcotest-1.2.3-r4.ebuild
new file mode 100644
index 000000000000..38ceb8300287
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-1.2.3-r4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/astring:=
+	dev-ml/async_unix:=
+	<dev-ml/cmdliner-1.1.0:=
+	<dev-ml/core-0.15:=
+	dev-ml/core_kernel:=
+	dev-ml/duration:=
+	>=dev-ml/fmt-0.8.9:=
+	dev-ml/lwt:=
+	dev-ml/mirage-clock:=
+	dev-ml/re:=
+	dev-ml/result:=
+	dev-ml/logs:=
+	dev-ml/uutf:=
+	dev-ml/uuidm:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/alcotest/alcotest-0.8.2.ebuild b/dev-ml/alcotest/alcotest-1.4.0-r1.ebuild
index b0d314768165..dc71e978a2ab 100644
--- a/dev-ml/alcotest/alcotest-0.8.2.ebuild
+++ b/dev-ml/alcotest/alcotest-1.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit opam
+inherit dune
 
 DESCRIPTION="A lightweight and colourful test framework"
 HOMEPAGE="https://github.com/mirage/alcotest/"
@@ -11,24 +11,23 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/fmt:=
 	dev-ml/astring:=
+	dev-ml/async_unix:=
 	dev-ml/cmdliner:=
+	<dev-ml/core-0.15:=
+	dev-ml/core_kernel:=
+	dev-ml/duration:=
+	>=dev-ml/fmt-0.8.9:=
+	dev-ml/lwt:=
+	dev-ml/mirage-clock:=
+	dev-ml/re:=
 	dev-ml/result:=
+	dev-ml/logs:=
+	dev-ml/uutf:=
+	dev-ml/uuidm:=
 "
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/findlib"
-
-src_compile() {
-	jbuilder build -p alcotest || die
-}
-
-src_test() {
-	jbuilder runtest -p alcotest || die
-}
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/alcotest/alcotest-1.5.0-r3.ebuild b/dev-ml/alcotest/alcotest-1.5.0-r3.ebuild
new file mode 100644
index 000000000000..a5d841de974a
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-1.5.0-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/dune-2.8:=
+	dev-ml/astring:=
+	dev-ml/async_unix:0/0.14.0
+	dev-ml/cmdliner:=
+	<dev-ml/core-0.15:=
+	dev-ml/core_kernel:=
+	dev-ml/duration:=
+	>=dev-ml/fmt-0.8.9:=
+	dev-ml/lwt:=
+	dev-ml/mirage-clock:=
+	dev-ml/re:=
+	dev-ml/result:=
+	dev-ml/logs:=
+	dev-ml/uutf:=
+	dev-ml/uuidm:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( >=dev-ml/cmdliner-1.1.0 )"
+
+src_prepare() {
+	cp "${FILESDIR}"/unknown_option.processed \
+		test/e2e/alcotest/failing/unknown_option.expected \
+		|| die
+	default
+}
diff --git a/dev-ml/alcotest/alcotest-1.6.0-r2.ebuild b/dev-ml/alcotest/alcotest-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..76ddf6ebc43f
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-1.6.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-ml/dune-2.8:=
+	dev-ml/astring:=
+	dev-ml/async_kernel:=
+	dev-ml/async:=
+	>=dev-ml/async_unix-0.15.0:=
+	dev-ml/base:=
+	dev-ml/cmdliner:=
+	>=dev-ml/core-0.15.0:=
+	dev-ml/core_unix:0/0.15
+	dev-ml/duration:=
+	>=dev-ml/fmt-0.8.9:=
+	dev-ml/lwt:=
+	dev-ml/mirage-clock:=
+	dev-ml/re:=
+	dev-ml/result:=
+	dev-ml/logs:=
+	dev-ml/uutf:=
+	dev-ml/uuidm:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/alcotest/alcotest-1.7.0.ebuild b/dev-ml/alcotest/alcotest-1.7.0.ebuild
new file mode 100644
index 000000000000..8c39a207fc4e
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-1.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-ml/dune-3.0:=
+	dev-ml/astring:=
+	dev-ml/async_kernel:=
+	dev-ml/async:=
+	>=dev-ml/async_unix-0.15.0:=
+	dev-ml/base:=
+	dev-ml/cmdliner:=
+	>=dev-ml/core-0.15.0:=
+	dev-ml/core_unix:0/0.15
+	dev-ml/duration:=
+	>=dev-ml/fmt-0.8.9:=
+	dev-ml/lwt:=
+	dev-ml/mirage-clock:=
+	dev-ml/re:=
+	dev-ml/result:=
+	dev-ml/logs:=
+	dev-ml/uutf:=
+	dev-ml/uuidm:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/alcotest/files/unknown_option.processed b/dev-ml/alcotest/files/unknown_option.processed
new file mode 100644
index 000000000000..fc26b53daeb6
--- /dev/null
+++ b/dev-ml/alcotest/files/unknown_option.processed
@@ -0,0 +1,3 @@
+unknown_option.<ext>: unknown option '--dry-runn'.
+Usage: unknown_option.<ext> [COMMAND] …
+Try 'unknown_option.<ext> --help' for more information.
diff --git a/dev-ml/alcotest/metadata.xml b/dev-ml/alcotest/metadata.xml
index b73d0d4e9531..33063c514b9c 100644
--- a/dev-ml/alcotest/metadata.xml
+++ b/dev-ml/alcotest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mirage/alcotest</remote-id>
 	</upstream>