7 files changed, 31 insertions, 25 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d5f704a8b020..b5037bb1ff59 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest
index fb32d829db76..e89ebc3a70d1 100644
--- a/dev-ml/camlbz2/Manifest
+++ b/dev-ml/camlbz2/Manifest
@@ -1,5 +1,5 @@
 DIST camlbz2-0.7.0.tar.bz2 21300 BLAKE2B 6b4830a957c98aafe2dfa164a5b9160724e3509dcc9686ee825224ede4b0a05eb5e8407707b4ee99e30417111552ca3023b79b0b4e6f93ef2e58212af9b4a46e SHA512 5f5c9e75014b2c869907150919ea1faa142d42868cc4f1d19feb19dfc586fbf8f871f21e3e77995e1253d01352827084619f7351bd960d76464e0cd8ad9dbaa7
 DIST camlbz2-0.8.0.tar.bz2 16560 BLAKE2B 818a656e0bd61669341f5dafa9adcaf14de13e452fd29ccf91a1216fdda0fb3f61b069781613e65794079d89fb666ed5dbfbdce91a3b39f64963fc61173596fa SHA512 5d8f8ff20676d77aa9c418bd8ba8a3c14aeb6e44e2d458f03ead29f703c97f3f7b5999e2b0a3fc3c78c5a77e7fbd55e5f8c8aeed154f4d46030f7f92f7f1f38a
 EBUILD camlbz2-0.7.0.ebuild 692 BLAKE2B 852d0e37a7f54907e8f76682357e78cfc94a47de45a5f5729e9f5422919efb895ec5508a4119bcbfa1d22654cc0ec812f1f0f1e22309d725a2a23272a25abe00 SHA512 eca18c33df5ff4ed54be3d609f268fdf108b0cefee0970e916b30b7bf7ccb2dcc311d9824e6dc983624a3ab5323433965be69df461d0f1be2373a4747b0a26b9
-EBUILD camlbz2-0.8.0.ebuild 464 BLAKE2B 8d23133db8ed410248f46bb996c09a4379812617ccd3e9c81e7d8e2726ab8415ec6dab3d33278bf35b239167f9246e0cc60d732bb03a6b14c048296c3955d131 SHA512 f9c681bdac61ce417ffbc0d959f713e82c73a90ea64acd22d7096d4db560b375bddb7a7cd04e3a1a386de271f00d9e8a38681475e22e62784fa5ed1c25146017
+EBUILD camlbz2-0.8.0-r1.ebuild 498 BLAKE2B e18b8feb2331673189ad3f715639fa2cda795bd69ff6eae70c5537f4e310e2231627774266cc44e677c40fece94586f9f1bb4a92e6dc5067c6e24e009a16f497 SHA512 f6a07a9f83d5ed7f68042fb93fec959cc796bd9f160a41bf79dd16d0968bb1181d56577ddfe39a1407fd705134f520168a89a967825f92c758918e5f38d6154d
 MISC metadata.xml 311 BLAKE2B c2dbc5de76ff3f244e0db6bf7f6bb40e8b7fd54a4b35f851ecae1baf40246f3342450a03c3c5bf0feed67d951be9fbfcce768d044ae24a653b4dda0f0d470541 SHA512 cb08fb63c78381badd180aafd7f9b7ea3046dec3f16daf523c548081d1d1a84759c0640e1df488138c6af2d7ae81dc040854f306778c57daa1fd9183726750bb
diff --git a/dev-ml/camlbz2/camlbz2-0.8.0.ebuild b/dev-ml/camlbz2/camlbz2-0.8.0-r1.ebuild
index 6c4986072a98..c78454058687 100644
--- a/dev-ml/camlbz2/camlbz2-0.8.0.ebuild
+++ b/dev-ml/camlbz2/camlbz2-0.8.0-r1.ebuild
@@ -15,5 +15,6 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
-DEPEND="app-arch/bzip2"
+DEPEND="app-arch/bzip2
+	dev-ml/stdlib-shims:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/charinfo_width/Manifest b/dev-ml/charinfo_width/Manifest
index eca669b18715..2b9410d6559b 100644
--- a/dev-ml/charinfo_width/Manifest
+++ b/dev-ml/charinfo_width/Manifest
@@ -1,3 +1,5 @@
 DIST charinfo_width-1.1.0.tar.gz 8307 BLAKE2B fcb37b82e2eb914322c78bcfebf901d713b55edc1c069b46cb157bbe1292b63aa69f4679f9077308a17e7d31d7c972e6b636ce7dad22fc963aedc33039dfbcfb SHA512 c8dac9eb6f520213de69b23433e2f0d6a21578c70ae69fb682065e707363968959395a6ddc6c88893e08372a138287318634b52a8b4fb70ac988b4ad4a18b140
+DIST charinfo_width-2.0.0.tar.gz 8901 BLAKE2B 46dbacfc52093f03bf694cd74e5871e1b51602e3b36f927192d7c57de063d1210a4af5944dd340b92af84d3f1700a8ad7deffb082e941854002efa5824ea14c8 SHA512 54b875465ca275cfeedcdf0d0f91777020b1425e5062421f9dded01ae8a0299f1ccd749c944861e25e27d0ea96a2b044b71f34cdfcb7fe19fc9ea0cf87a151b8
 EBUILD charinfo_width-1.1.0-r1.ebuild 557 BLAKE2B 76a4de79be94ccad47d924951d6c78081fd30f8ecd1c564734e1129805bd5acf94264f1ebcf7419011a0785e0a5729ce2b4a5d28ba551583dd95718d80093b8f SHA512 4e1d7f48e5c608b06e46a4242df2d808a6a60c8124748b06fc812b6b677b9dab2d0c15bb16fd6cc60810eb66337712791e462f2afaba9ceba98ad39fb54d4d05
+EBUILD charinfo_width-2.0.0.ebuild 591 BLAKE2B 40c591250c598146eb2d97dcfdbc29dc24fe458cbd6fb9f0766de7ac968ff0d05d0df2cbb964f90d9e1a36c21594637f91ba86a6d08efcf34c7f99c444a67e70 SHA512 f434c9bf59ca0211ce13bc0d79f00d906d948d8f7c2b137a1c0dcc754e325fffda9a51020daa07c80427eef592118eb3e468d470f7e0b34b8b674e14cfe85467
 MISC metadata.xml 400 BLAKE2B 7153a7494e177bc1660e135a0773c0012e4caad4b245eab089f893287ecc73b3f9beb131bd254e8f1ba64deb19db0cf51dc4a04bb573639a010b883e32858b97 SHA512 579ae1cdcd950e9ed124a38c6768f5bfe9d0915064ee30be5ce20a0c06d988e07ce9bfdbc31c5be43805b9183cd648402e80253331d458020a9179312b425648
diff --git a/dev-ml/charinfo_width/charinfo_width-2.0.0.ebuild b/dev-ml/charinfo_width/charinfo_width-2.0.0.ebuild
new file mode 100644
index 000000000000..f83ae74a5e3f
--- /dev/null
+++ b/dev-ml/charinfo_width/charinfo_width-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="charInfo_width"
+DUNE_PKG_NAME="${MY_PN}"
+
+inherit dune
+
+DESCRIPTION="Determine column width for a character"
+HOMEPAGE="https://github.com/kandu/charInfo_width"
+SRC_URI="https://github.com/kandu/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-ml/camomile-2.0.0:=[ocamlopt?]
+	dev-ml/ppx_expect:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 3a8351f45ae1..e9478c7f6ea3 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,5 +1,3 @@
-DIST menhir-20220210.tar.bz2 1160357 BLAKE2B a9401b50db4dfdfe56c5c10919d4d385cbb7bf27d1518932e55d6757c08989407cda17c65f72d20e21738618e4f97f20b10098c9185f3882b3391aab7f9f8bc9 SHA512 8a852e995cab57b16adc1b7708d3acdf5f8b65d13dbf907a4155ff45d71dccc65868fe369590b48a3f06d8319f74777ce2e9be05caa9dbe060c0ae3a2b37943f
 DIST menhir-20230608.tar.bz2 1195032 BLAKE2B 6d39fb89a7e5dd862cbb868170d5d7156ccab6a3524fee711535497775bc65074256f2e228da532d3365473be7577e174b7ea075fd3b5b716a402ca575c401ae SHA512 6af16eeb1e43c89a2c60ed38da100cb591726e029e58d5313c05f81a317d63511c5e15c5aa334d1e96db182b51235bfa0a9905804d8232d868e1684a630af007
-EBUILD menhir-20220210.ebuild 546 BLAKE2B ce6e3b06f0b8c330c792740ff6cb2d2a0ba582bbb6701c3fe53ae3459196f723b125ebe0208996655fd6a505d615b0b1196a6cc2f847d1529494b897b2ad7be7 SHA512 64c23c944f144611da02be78f773d44156786b3c44422d31628658eef3cca1581819dc67c5340f3141092fcff8fc7f7f36d25cf8a9fc94962a8274cf912280f9
 EBUILD menhir-20230608.ebuild 546 BLAKE2B ce6e3b06f0b8c330c792740ff6cb2d2a0ba582bbb6701c3fe53ae3459196f723b125ebe0208996655fd6a505d615b0b1196a6cc2f847d1529494b897b2ad7be7 SHA512 64c23c944f144611da02be78f773d44156786b3c44422d31628658eef3cca1581819dc67c5340f3141092fcff8fc7f7f36d25cf8a9fc94962a8274cf912280f9
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/menhir/menhir-20220210.ebuild b/dev-ml/menhir/menhir-20220210.ebuild
deleted file mode 100644
index 9c9d242694a6..000000000000
--- a/dev-ml/menhir/menhir-20220210.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="+ocamlopt"
-
-src_install() {
-	dune_src_install menhir
-	dune_src_install menhirLib
-	dune_src_install menhirSdk
-}