gentoo auto-resync : 14:09:2024 - 12:32:27

11 files changed, 73 insertions, 78 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 82ec83d36fab..8929a1c376d6 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlpdf/Manifest b/dev-ml/camlpdf/Manifest
index effa9c50aca2..c74d98c28bcc 100644
--- a/dev-ml/camlpdf/Manifest
+++ b/dev-ml/camlpdf/Manifest
@@ -1,5 +1,3 @@
-DIST camlpdf-2.3.1.tar.gz 601531 BLAKE2B 9534baf9165e7dc48ae37a3fcaabb236e437845ef4e0a60a1c08874a2b240c9b1e96de5bbd6028a3ca87992221773dea34c31b0fa24e9c143632756954baf132 SHA512 0b8d91b6090221f996aee52f22f153a4b74cb85a127bbd5f84492ede8a0a581971a2349281b3879d6c37f4d5d267da583e7e8871372d97a3d636abc3231cb007
 DIST camlpdf-2.7.1.tar.gz 841886 BLAKE2B 30215949fab2517e00cf520ef4f79a6fbf49173e7e2643ac1a47d0dd945063908de2928f7181d2182ad4fe51945bb3f6a89a54aa236a889ea392cd126ef856c8 SHA512 2480a282a6ce09444ed14a3f41561375ecf7e3c57f7559a48ad9791d9f824e59820bfd39aa36910ff6bdc9b160cef76ab90dbbfe628c836c3f5c5081dfd5e452
-EBUILD camlpdf-2.3.1.ebuild 792 BLAKE2B ed804c71e8eed524e0b119f39865bc57b28f736854066f47daa5b773a793a302b692e65d6273e2e77f9908aa0f0be0f97c2eec7987a49b824d24cf87c493fbb4 SHA512 e59b4c2de92c39d6f115b4d4487a90aadebf3fea79f8921c59ed40594c2c5151fe3f3928df8a0a4006cb01e2d76271df58a55a6779529ffb2cef91bececa32d5
 EBUILD camlpdf-2.7.1.ebuild 802 BLAKE2B ac9c521f77ce083ecbf28945bb9cd7eea82d884fa6b892c2ebfb39fe9dcdf9ee35dafcb157d3a370e18044ac1c339d868a3d76740118eb382322c8cb1e036a67 SHA512 9be50ec85486928ad5d76f39f5cf31942d181c0ac55208de579c941f260ba35a2dceb772f0f3a4c9a1b2eef16d56cd4432f1191691081f363556b0f2f77f8ef3
 MISC metadata.xml 503 BLAKE2B c08f43e3c7a1c07183d22bda7df8c45a4c49c6c6f5d5edde28820bf5a92582276e10cfd2bd957acd04a08f64a4f613a6bb2da45ea3c315e1b55b5bd94358cd75 SHA512 7d778b3a9aee27e53b2138ec99f200e96253f0455ba66a0d7173765c6a556260ca70b6d234123ecf1dd65baae3fa03499c59e73502c2021d0d1abaf4971157c1
diff --git a/dev-ml/camlpdf/camlpdf-2.3.1.ebuild b/dev-ml/camlpdf/camlpdf-2.3.1.ebuild
deleted file mode 100644
index 965e0ef70c14..000000000000
--- a/dev-ml/camlpdf/camlpdf-2.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="OCaml library for reading, writing, and modifying PDF files"
-HOMEPAGE="https://github.com/johnwhitington/camlpdf/"
-SRC_URI="https://github.com/johnwhitington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# technically LGPL-2.1+ with linking exception
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-lang/ocaml:=[ocamlopt]"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# parallel make bugs
-	emake -j1
-}
-
-src_install() {
-	findlib_src_install
-	dodoc Changes README.md
-
-	if use doc ; then
-		dodoc introduction_to_camlpdf.pdf
-		dodoc -r doc/camlpdf/html
-	fi
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-ml/coq-menhirlib/Manifest b/dev-ml/coq-menhirlib/Manifest
index a8f429e7dba6..4cd4001c727e 100644
--- a/dev-ml/coq-menhirlib/Manifest
+++ b/dev-ml/coq-menhirlib/Manifest
@@ -1,5 +1,5 @@
-DIST menhir-20220210.tar.bz2 1160357 BLAKE2B a9401b50db4dfdfe56c5c10919d4d385cbb7bf27d1518932e55d6757c08989407cda17c65f72d20e21738618e4f97f20b10098c9185f3882b3391aab7f9f8bc9 SHA512 8a852e995cab57b16adc1b7708d3acdf5f8b65d13dbf907a4155ff45d71dccc65868fe369590b48a3f06d8319f74777ce2e9be05caa9dbe060c0ae3a2b37943f
 DIST menhir-20231231.tar.bz2 1245465 BLAKE2B 4ac27f693c9b0f34cf6f9c60343cba6c81cc5b4dc278df4da5c16de8484438238efc6e3e985b9f03676f72cc74a0153ea81fd93d057dd2914b86fe1f558d1f9f SHA512 6bcc3d32b9085e407d7ed7abc87bbbb7dcde52da7f5f343cbcf136df4aa2a9b640a94c3b809a125773d186d03bf9b806f9430dbc4a39ded7dd8ef685b1b1a65d
-EBUILD coq-menhirlib-20220210.ebuild 767 BLAKE2B 5ea27d09d2a1b8a3aa6436ac1e14ddab93e0d4a8098026874a36c59e14e6d1d6f09a297eab5ede5c6289c65439ffcdc850fd37d7b1b9c99e4c47d0ff44eec083 SHA512 e4d4e38874fd12826e9347dfe766f80ad5e967b1259ddbe6493d2d82b6284d591b365b8ad47114f36b205e1fec410bd335e4232cb00dcd62f140330571f7b436
-EBUILD coq-menhirlib-20231231.ebuild 900 BLAKE2B d05a13753a53e049344515931846340af521d1f22bda7b3f548c506446efe4a5bf41f41a4d9c115d5971047ca9a9fd4142a081f9a3a4338031c3e862f234c24e SHA512 d861e205ddb2bfa43dc77bbe61b58a5ac0e043e8a11959a50961e67dceb7d6c46ede96e1202bcf608c37969c98f02dc79c21b9a2a370a02ff840eaac065276ba
+DIST menhir-20240715.tar.bz2 1245971 BLAKE2B b5f1a1fb234dd53e1d3f77b095e2721f8d2af354a3aa36da2b993dc9f699767bb7c98aae13316ff3405b8bcf80f9ba3addc824ace59f5548613f0f93d105adf7 SHA512 b18da35517702dbdab0d9f5819ad711f61f2ed13ec9e51db71b92fa2d6604cbf28aa6d684c36a41364324694ebbc5dc6aaed4dbb3779c14b399e49ded6fd5db6
+EBUILD coq-menhirlib-20231231-r1.ebuild 908 BLAKE2B 59814d113d29e2df7d72732a40a0d136cd489e6f4addd8707b9f828bfc22a5e2ad381925953cb43c5f15e5d10f69c64ebaaeea29494c604523f801a0134179ce SHA512 318b4bdff670c98f6e954a9d069c71c947eb5a2e53965215bc12eddb25381d94c6d8d72aeaeb9c81ae523e353200804c7eb26ca1ef5ed95c6f06c9a57da5ea71
+EBUILD coq-menhirlib-20240715.ebuild 900 BLAKE2B d05a13753a53e049344515931846340af521d1f22bda7b3f548c506446efe4a5bf41f41a4d9c115d5971047ca9a9fd4142a081f9a3a4338031c3e862f234c24e SHA512 d861e205ddb2bfa43dc77bbe61b58a5ac0e043e8a11959a50961e67dceb7d6c46ede96e1202bcf608c37969c98f02dc79c21b9a2a370a02ff840eaac065276ba
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/coq-menhirlib/coq-menhirlib-20220210.ebuild b/dev-ml/coq-menhirlib/coq-menhirlib-20220210.ebuild
deleted file mode 100644
index f0f543ec6276..000000000000
--- a/dev-ml/coq-menhirlib/coq-menhirlib-20220210.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="A support library for verified Coq parsers produced by Menhir"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="https://gitlab.inria.fr/fpottier/menhir/-/archive/${PV}/menhir-${PV}.tar.bz2"
-S="${WORKDIR}"/menhir-${PV}
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	>=dev-ml/menhir-${PV}:=
-	sci-mathematics/coq:=
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake -C ${PN}
-	dune build @install --profile release -p ${PN} || die
-}
-
-src_install() {
-	emake -C ${PN} DESTDIR="${D}" install
-	dune_src_install ${PN}
-
-	dodoc ${PN}/CHANGES.md ${PN}/README.md
-}
diff --git a/dev-ml/coq-menhirlib/coq-menhirlib-20231231-r1.ebuild b/dev-ml/coq-menhirlib/coq-menhirlib-20231231-r1.ebuild
new file mode 100644
index 000000000000..c4426fec14fc
--- /dev/null
+++ b/dev-ml/coq-menhirlib/coq-menhirlib-20231231-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A support library for verified Coq parsers produced by Menhir"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.inria.fr/fpottier/menhir.git"
+else
+	SRC_URI="https://gitlab.inria.fr/fpottier/menhir/-/archive/${PV}/menhir-${PV}.tar.bz2"
+	S="${WORKDIR}/menhir-${PV}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	<sci-mathematics/coq-8.20.0:=
+	>=dev-ml/menhir-${PV}:=
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_compile() {
+	emake -C "${PN}"
+	edune build @install --profile release -p "${PN}" || die
+}
+
+src_install() {
+	emake -C "${PN}" DESTDIR="${D}" install
+	dune_src_install
+
+	dodoc "${PN}/CHANGES.md" "${PN}/README.md"
+}
diff --git a/dev-ml/coq-menhirlib/coq-menhirlib-20231231.ebuild b/dev-ml/coq-menhirlib/coq-menhirlib-20240715.ebuild
index dbad929b5119..dbad929b5119 100644
--- a/dev-ml/coq-menhirlib/coq-menhirlib-20231231.ebuild
+++ b/dev-ml/coq-menhirlib/coq-menhirlib-20240715.ebuild
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 6b8bc5a4d13d..7e2a96726a6f 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,5 +1,7 @@
 DIST menhir-20230608.tar.bz2 1195032 BLAKE2B 6d39fb89a7e5dd862cbb868170d5d7156ccab6a3524fee711535497775bc65074256f2e228da532d3365473be7577e174b7ea075fd3b5b716a402ca575c401ae SHA512 6af16eeb1e43c89a2c60ed38da100cb591726e029e58d5313c05f81a317d63511c5e15c5aa334d1e96db182b51235bfa0a9905804d8232d868e1684a630af007
 DIST menhir-20231231.tar.bz2 1245465 BLAKE2B 4ac27f693c9b0f34cf6f9c60343cba6c81cc5b4dc278df4da5c16de8484438238efc6e3e985b9f03676f72cc74a0153ea81fd93d057dd2914b86fe1f558d1f9f SHA512 6bcc3d32b9085e407d7ed7abc87bbbb7dcde52da7f5f343cbcf136df4aa2a9b640a94c3b809a125773d186d03bf9b806f9430dbc4a39ded7dd8ef685b1b1a65d
+DIST menhir-20240715.tar.bz2 1245971 BLAKE2B b5f1a1fb234dd53e1d3f77b095e2721f8d2af354a3aa36da2b993dc9f699767bb7c98aae13316ff3405b8bcf80f9ba3addc824ace59f5548613f0f93d105adf7 SHA512 b18da35517702dbdab0d9f5819ad711f61f2ed13ec9e51db71b92fa2d6604cbf28aa6d684c36a41364324694ebbc5dc6aaed4dbb3779c14b399e49ded6fd5db6
 EBUILD menhir-20230608.ebuild 546 BLAKE2B ce6e3b06f0b8c330c792740ff6cb2d2a0ba582bbb6701c3fe53ae3459196f723b125ebe0208996655fd6a505d615b0b1196a6cc2f847d1529494b897b2ad7be7 SHA512 64c23c944f144611da02be78f773d44156786b3c44422d31628658eef3cca1581819dc67c5340f3141092fcff8fc7f7f36d25cf8a9fc94962a8274cf912280f9
 EBUILD menhir-20231231.ebuild 551 BLAKE2B c6194c2b065e6f7c793af11eeb7fcbefe65ac48e55a36d793f6c6ed4c3f6a5857d22a70a94822f94eb299c4b99e3becf09f5989ddd9d0dcb9ddfa1b783d2001c SHA512 c72ddb50cce95e3ce7ad1346ec7de58e04b71eddc6387e97034f00ae7f865b85bf146895b6b1150fd80e7fd89a2aa1172ab45807f18f0922c505419259936adf
+EBUILD menhir-20240715.ebuild 551 BLAKE2B c6194c2b065e6f7c793af11eeb7fcbefe65ac48e55a36d793f6c6ed4c3f6a5857d22a70a94822f94eb299c4b99e3becf09f5989ddd9d0dcb9ddfa1b783d2001c SHA512 c72ddb50cce95e3ce7ad1346ec7de58e04b71eddc6387e97034f00ae7f865b85bf146895b6b1150fd80e7fd89a2aa1172ab45807f18f0922c505419259936adf
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/menhir/menhir-20240715.ebuild b/dev-ml/menhir/menhir-20240715.ebuild
new file mode 100644
index 000000000000..32130b511247
--- /dev/null
+++ b/dev-ml/menhir/menhir-20240715.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 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
+}
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 97335c17fdd6..8d250753c2d0 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,5 +2,5 @@ AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d
 DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29
 DIST merlin-4.13-414.tbz 1993752 BLAKE2B 8b5704252f771ddac843340bf2aa24f62a2b490f6bb03c46a1daa2560fae72226b92fb5a9720b18c82f476571e7e6ffc7c30e695c8a0e1a3de6bd65ee58461e1 SHA512 cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455
 EBUILD merlin-4.12-r1.ebuild 2174 BLAKE2B ee448ce796df926d0c7098fe76c8a13cc03ad8787f01fac289d0754bd4bf7c8f70932a2001ef1930e1eaf8ce4fa27a9a57901609403487f3d99d916f87d21bd5 SHA512 2dfae34c5a8557c9dee9dea6f0ea62a471d3b883fb0fb6713f01a398abaa9dfcf23259a9949f7df53e1da38d3dd98999f1f4ec2c4ee6847923b2e4284c821ce4
-EBUILD merlin-4.13-r3.ebuild 2304 BLAKE2B 3b1e908f6c7fc2b84c086ac6ee7cef4e9aa64edc89be3ae3acb43d7cbebf690cc59d91a0726522da57c1bbfa5c848d5499b8aaccd2ba2f0b2729c564fdda0274 SHA512 9f7dd36ec5c2b71c7e43eeee54184b0720165070b11b475e312d536b2cc95f295b1944b13bc63b9f96bf0806ffe1caf8cf0096384944024c6973290d49ad647a
+EBUILD merlin-4.13-r4.ebuild 2314 BLAKE2B 2804a0c9a0b1fa251a0a002a785fb77f1c5390f9fa3f0a6cec361b0a54740df78268c277359804a3d39f901780bbe171efb8d4cc6fc8f936a1d2eead05535e51 SHA512 92ecce4f176d01bec7f72d3cb310ccb0fa045392b9b186ecfa0311852c87144ce929e5673d719e1fc1003ea317b4343223b284dd7fa40cb66dd9f2059019df27
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.13-r3.ebuild b/dev-ml/merlin/merlin-4.13-r4.ebuild
index 18c16155ded7..d7c237c47237 100644
--- a/dev-ml/merlin/merlin-4.13-r3.ebuild
+++ b/dev-ml/merlin/merlin-4.13-r4.ebuild
@@ -22,11 +22,11 @@ RESTRICT="test"
 RDEPEND="
 	<dev-lang/ocaml-5
 	>=dev-lang/ocaml-4.14.1
-	dev-lang/ocaml:=[ocamlopt?]
+	<dev-ml/menhir-20240715:=
 	>=dev-ml/dune-2.9:=
 	>=dev-ml/yojson-2.0.0:=
+	dev-lang/ocaml:=[ocamlopt?]
 	dev-ml/csexp:=
-	dev-ml/menhir:=
 	emacs? (
 		>=app-editors/emacs-23.1:*
 		app-emacs/auto-complete