gentoo auto-resync : 18:11:2024 - 03:03:03

18 files changed, 300 insertions, 103 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index e4f6e3190718..0992efee5f5c 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index e05034a3ad07..f0ac80f1e07e 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,10 +1,13 @@
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
+AUX findlib-1.9.7-gentoo.patch 377 BLAKE2B 652155779d6ffeb4f99370668a416f5866fea8585819a361cee7bb66ddc773dda0957c599d8df3b1e3c4fde373f73866eab2f8863846934a92859835ef2193b4 SHA512 8fb3ed312ea2edcbd5d3e04a0a6be9dcefda4181c9e5847a0aad75fe6e7ffc5bd0988fcb332b5a1dcece6ba7a279a4bc254cf68f3c0e1d8b6bffbd697487f09a
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
 DIST findlib-1.9.3.tar.gz 264132 BLAKE2B 3779cb437c607d04ae6c7d8124270f36c9bd9baccce669f3785a9cd4a1a582302844019b69be14598ca807edecb26645d9d7b241e1d704c3f023ed039cad21f0 SHA512 27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea
 DIST findlib-1.9.5.tar.gz 271240 BLAKE2B 6f43281298a9e443f9b92bcb8996bc2a55c2be86df492540fe8b5fb3fbb199daf1daef68e14c981d153c885c443ebc4af9ffb957235dd14904b9d75ca387cfa2 SHA512 03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715
 DIST findlib-1.9.6.tar.gz 271246 BLAKE2B c9c98b9e92c0cf690e2c8794a1ed606c0288d49a016dfa08592c9f617be1020385f52bf37345a7cbcbc7f0fcb19750a6617036cbf90afef231eccdbc7132baf8 SHA512 cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027
+DIST findlib-1.9.7.tar.gz 274563 BLAKE2B c8cead9b51beb0798229c270705284d168b3c667f7eeade1a0187bf9024f41648764b520409c61dcb01f687fc037745dc9eb7361b097e8b4939cf877e12c7a94 SHA512 3aa1f06d5a230d7467b6f42257ba4b6a2481c8bd6cb5e51df87f86d652d47a08bd3efffe48edaeb9fcbb4b38a7aed65767f265901c5d6570acc131f7afce66bb
 EBUILD findlib-1.8.1-r2.ebuild 1796 BLAKE2B 9ca2db077a6bf386d582477c28b1fb58659c75729995ef8ac49be50f44fa42aaf7f67df896b7ad9900525a25da9327baf5aaba0469b37c895121ce4d889c27c2 SHA512 7be270785b547643503ff2566d386b9bcd179003a348ab76624a2867bd0a66148af9400619e2e20853951e743eb1af14769132710e5fd96e75494bed6881fd6d
 EBUILD findlib-1.9.3.ebuild 1730 BLAKE2B 971bc2112e70e3e4575c093e357243751b61190a3644ac0d743f5410bb2a3eafb7229700377d4955efc1bfd2691990a8b2758563bba4a40b5f1b81fdc853a00a SHA512 040f16bb2012157edcee960259c5504c765a872128529f4a791dcac10116cb3755a9f1f6ec0ec1cb947bba16b5f329c4947ae6c3e39ad85bf4aa8aebd52273cc
 EBUILD findlib-1.9.5.ebuild 1757 BLAKE2B fc85cac1cd57fcfa77fb7aeac28862f52fcc06068c3187349c78476630644e19a738c0c77a56fc9e89758e5d5915ec251925fd62c8b2aa660675eb6c477502de SHA512 5703da0e4ebb9939832336355d1e6de662396401ca7a90af202bd9070c37a9e6ff50d80993950cd37abf24b51b225d8022c3e8cd651ffb26204fa44e22df3da9
 EBUILD findlib-1.9.6-r1.ebuild 1891 BLAKE2B 8123db7040ec61d7db6a85ae45c5d1e62cd40892841853661eea6ef58d2fae3de7fd57ba0d06449497f87180fc511465fea60f17b27db55ea23240ee439f5609 SHA512 f93cb7e10d2f23f978b0992d6d9820f6c4b1973ea286dc93c2fe873c20fb6ccc60d2b05d2d5228b4e0fea7d4ba8b727fdafdbb26c50dfc9895dbfd044afadf94
+EBUILD findlib-1.9.7.ebuild 2066 BLAKE2B b786c0bde7d388b525b04c909afd79efaf4a8af785775bee937414c72f9b46ce7ffee3f35c9694671b5ac1d157af795b31c230335a69d3aff8d943153e0aff48 SHA512 69afbc3054bac31586a5960c8f7d4d8cd226a9469d3b3eefe2cc0d0d66337ad8db98842661c0eca92e0c45ddfe7afb3ed3a617548e50b15e643025d9cba7e1be
 MISC metadata.xml 313 BLAKE2B 5acfde6d665d53029692b476afe23035a6e2a4414d301dde6feba39d3738fe8382676bdb102758ad4d3fe01928576f35c82421317cd045ce37a9f86a5581342a SHA512 30d52375434c72938a3ffd81a9c2655cdbf5e9e2e0473beda90afb4deaf5b756eadece47a533a7ca2e4a263b83df29317f322d99a37b7022eefd01a485836b6b
diff --git a/dev-ml/findlib/files/findlib-1.9.7-gentoo.patch b/dev-ml/findlib/files/findlib-1.9.7-gentoo.patch
new file mode 100644
index 000000000000..2267e4289b42
--- /dev/null
+++ b/dev-ml/findlib/files/findlib-1.9.7-gentoo.patch
@@ -0,0 +1,13 @@
+--- a/configure	2024-11-17 15:38:27.712271339 +0100
++++ b/configure	2024-11-17 15:40:42.865323210 +0100
+@@ -562,6 +562,10 @@
+     exit 1
+ fi
+ 
++dynlink_subdir="+dynlink"
++dynlink_dir="dynlink"
++unix_dir="unix"
++str_dir="str"
+ check_library dynlink '' dynlink/dynlink.cmi dynlink.cmi
+ check_library bigarray 'possible since 4.08'
+ check_library compiler-libs '' 'compiler-libs'
diff --git a/dev-ml/findlib/findlib-1.9.7.ebuild b/dev-ml/findlib/findlib-1.9.7.ebuild
new file mode 100644
index 000000000000..aad9b4c55641
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.9.7.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt tk"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+	tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+	export stublibs="${ocamlfind_destdir}/stublibs"
+	sed -i \
+		-e "/dbm/d" \
+		-e "/graphics/d" \
+		-e "/ocamlbuild/d" \
+		-e "/check_library num/d" \
+		configure \
+		|| die
+	sed -i \
+		-e "s|capitalize |capitalize_ascii |" \
+		-e "s|Pervasives.||" \
+		src/findlib-toolbox/make_wizard.ml \
+		|| die
+}
+
+src_configure() {
+	local myconf
+	use tk && myconf="-with-toolbox"
+	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
+		-sitelib ${ocamlfind_destdir} \
+		-config ${ocamlfind_destdir}/findlib/findlib.conf \
+		-no-custom \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt # optimized code
+	fi
+}
+
+src_install() {
+	emake prefix="${D}" install
+
+	dodir "${stublibs#${EPREFIX}}"
+
+	if use doc; then
+		cd "${S}/doc" || die
+		dodoc QUICKSTART README DOCINFO
+		docinto html
+		dodoc -r ref-html guide-html
+	fi
+
+	# See bug #803275 and bug #833604
+	for x in camlp4 labltk; do
+		rm -rf "${ED}"/usr/$(get_libdir)/ocaml/${x} || die
+	done
+}
+
+check_stublibs() {
+	local ocaml_stdlib=$(ocamlc -where)
+	local ldconf="${ocaml_stdlib}/ld.conf"
+
+	if [[ ! -e ${ldconf} ]] ; then
+		echo "${ocaml_stdlib}" > ${ldconf} || die
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die
+	fi
+
+	if ! grep -qe ${stublibs} ${ldconf} ; then
+		echo ${stublibs} >> ${ldconf} || die
+	fi
+}
+
+pkg_postinst() {
+	check_stublibs
+}
diff --git a/dev-ml/luv/Manifest b/dev-ml/luv/Manifest
index 6bbaccf4f5ee..bd134d2c05f3 100644
--- a/dev-ml/luv/Manifest
+++ b/dev-ml/luv/Manifest
@@ -5,5 +5,5 @@ DIST luv-0.5.14.tar.gz 849832 BLAKE2B 5fe04991fdf793d8981b5f978e41a7c170666e917e
 EBUILD luv-0.5.10-r3.ebuild 769 BLAKE2B a708d2d80c8c0e8bd6e1c2103096b77cbf72b1dfb69c0c920217adf7ff63bd6d43b7d7977cb1ad0978b1b8f775dd8833f8d81cb3e868922848465e2cadacaa0a SHA512 d00aff7e5a8bb84080ca886f004867470afe3d0c25523a3105932088551bd94f004d0f0328533c5dd2bcdd80bda03c0d57fb3b438915fed99b8d41fb16881db7
 EBUILD luv-0.5.11-r2.ebuild 846 BLAKE2B 975f0f69441c839b5aa73783436c0dcbdcebcd419e4b3190a07c4d6a4ce931d336e7016c68481c25d6b22e7d3292aaa88a57efbf2036b753d67f41b9b56e841a SHA512 9447033d5320012576e3e74067684c25b9200e11daee40f18a150358d374d4a0da732426ef5f9c83d1b580a38569ec5a1f3af949ba3bbba2c9fa1344090d8a93
 EBUILD luv-0.5.12.ebuild 965 BLAKE2B 0f2c2267585c3b7c0c0eefd6edbc2a45893f558d2b2c8f13ec920fb1569c45bddcad3f65830f18cdd9b802d09882bc0d17641ac74f8df28be92fef2610e154bb SHA512 da54efcff0b458b944306b5264492e9bfe621880fa1c66c208bbd865e342cc949e447bd70d67734869813df88c1ed9fbfeb4ae75561939ee054d491cb64c7e05
-EBUILD luv-0.5.14-r1.ebuild 955 BLAKE2B 416bef2d62e5dbe1741fab8194c1c577afa5254b71e4a5a2ae995622c050952215397e6bee66c244e550820f6391b5b259ef957710a10a59c731a7048dac8640 SHA512 a79dd202a506ab9bd7547721d98aac5dfc94b43a84da2c18de49291d4e27e60bfb8b2968a6af2682c7e5ce07bb8dd1c64819d9854e4a6b274eec0c79d6f14c21
+EBUILD luv-0.5.14-r1.ebuild 953 BLAKE2B 06713607a0a8bb7473030fd2fc582b6227146200a3cb7855ced54b5ddc739c0e3ff3ef2eb83d5bdede0e1e78c7cc45680624a4fe897bba618c28ac754649606d SHA512 e1189e1ea1767732f665e1bacfe82323180a86c56ebac976cb7ece83dce47cdf7a88f4fd7506ab63ad5eae381430cf803b6b37d6de439af1690a0ad775804f7b
 MISC metadata.xml 309 BLAKE2B 2571e139ee75123b88f05751d493805433dd5f22ac3f06e82adf97017f53fa54c1870ee947b4e98ed55d4f134b837e1850d86fb10e6db43f0c37f1d54a2a07db SHA512 a917d2ea07601ed6c8d9386ce92deb19dfa0a37e3cf42b7808cb9e6e47ad57b1a9495f4b5f43695bd13d1a09837e40ae265bcb1b6bac30e62fec39bee1728456
diff --git a/dev-ml/luv/luv-0.5.14-r1.ebuild b/dev-ml/luv/luv-0.5.14-r1.ebuild
index 5694e5cfce73..ab24b58c9fcc 100644
--- a/dev-ml/luv/luv-0.5.14-r1.ebuild
+++ b/dev-ml/luv/luv-0.5.14-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/aantron/${PN}.git"
 else
 	SRC_URI="https://github.com/aantron/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
index a7cfee2d1460..3810d344fea9 100644
--- a/dev-ml/merlin-extend/Manifest
+++ b/dev-ml/merlin-extend/Manifest
@@ -1,5 +1,7 @@
 DIST merlin-extend-0.6.1.tar.gz 8156 BLAKE2B d007bcfac004af48eafc8c806aabaff4f61d9bf7acd93273a991791144a7c9e8f7307cf61460551326ceb077bd838bb0b1d377aa134d45e2fd20109dc68f3213 SHA512 0d5041231b280dc1026d598cca8c75895a159e102f209be7c5a9a1ac9ab15da66c603d850a3f3f26880f9673e232765108e21984f2eb4dc92d9d1d7fb29b9382
+DIST merlin-extend-0.6.2.tar.gz 8296 BLAKE2B 658be5819951e1a0902a19d7d6e99343e89fcc9e583bf98176d61a560d1e7643f36d5562a54a094d29833c7de86d98c9f0ff6a835c8b7fd1cb9cb14e1041dd69 SHA512 c83fd23143941571ccb6282556d8d66521a14596ca57a26b43a3ee9721f0da75cad0e3f1ed0091498c69cd039616acbe35d3b621e796f18bb9febd671fee0205
 DIST merlin-extend-0.6.tar.gz 8098 BLAKE2B c8adb32c03a3fe423aa1bb9e10ed9d5041cfbbdc991ae656180debbcad6ee72404bdd7c03d8ee609b809aa27e8013f14785204c759221e33405182ef6c9d1616 SHA512 5cfe4bb1fe8804dcb52eb4cebea6176b5d50fdafbdcd4f5854726c74f196ad06fe3b1b46dde7622f2e5c99ce6bfea9efd070fb81e5fd5e2b5197f40cee109ea7
 EBUILD merlin-extend-0.6-r1.ebuild 428 BLAKE2B 5259b9ce048865f65cc97d3c93f30d45a013a7944f9c31c04a4f8bf5ed23c4f4c0d74fb80fe1c558ac88418d9723038e7290eed1e2574e806b671114ceddb480 SHA512 2fe6855da027d1dc5ce32ab61ec7068799ce193455a228fdd104797f0fbc10e9310c2991e375cd1e47015966118037731eca124cf7428bb326129a98b7989b5e
 EBUILD merlin-extend-0.6.1.ebuild 438 BLAKE2B f230c8596be9e312fe6a060c8395426c0857511b7734c3c286a48eb4d5b42e9247ec3261397489b67130694889912c307a52120e477f48be583fb551cf223235 SHA512 50aa2d7d900cf1c7730d86b6b9745e679e270431d823ccc1f446fb9f8b1f39c772782d3fb5e00d63683bf895a61023de2fec68b612674bef342200f0a85aeced
+EBUILD merlin-extend-0.6.2.ebuild 438 BLAKE2B 09dae8c6222833b44bc4c37acbbf60a683a5fa3277600fceb8a59851d2032db9ba03399bf4344791e2325741c6a693e73b0aba9f72aaa7ccc7522bbd3797ce42 SHA512 2f86219d97c1033febf7a046fc37fb8e3d647c98d294de7d6187f1ecbff3be91bbc1bb53e3f4ed8eb2d044c8b7af7d0897eaabc4c3ff19adcf7ac521ca190a6a
 MISC metadata.xml 319 BLAKE2B 1a5504443802ca145e62b7a0a93d0db800a0723d8ccb18945d407d43f45b1631b9887d83a66062fba544fe3822b6193c0709615380baff74d2be0d60e764409d SHA512 cd5db8c1f6db80a9179cfb785c9405825285846a1bf307dea9a8bc4b1a3e21d7008ad7be8acf827abf7458690b20a41731fb3ec0a10a31350dbdb8dbd3427118
diff --git a/dev-ml/merlin-extend/merlin-extend-0.6.2.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6.2.ebuild
new file mode 100644
index 000000000000..0b81f8aac873
--- /dev/null
+++ b/dev-ml/merlin-extend/merlin-extend-0.6.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="SDK to extend Merlin"
+HOMEPAGE="https://github.com/let-def/merlin-extend/"
+SRC_URI="https://github.com/let-def/merlin-extend/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-lang/ocaml:="
+DEPEND="
+	${RDEPEND}
+	dev-ml/cppo
+"
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index b73a86b01ee8..76669d29fe7d 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,5 +1,8 @@
 AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d53df1c70b8fbd6e922b38c43b436ac73854970f1438eb837cbcbff4e07d12054fc0d0222b5222b95970 SHA512 00db283dffe923971fe451bcbea687bf35152e9c09783d307d9dec4ac0f273d27edfcc0e1ac74db3885bdeec98e7d60f1d46fa381d3b2c813e2f55fb5d4adbb5
 DIST merlin-4.13-414.tbz 1993752 BLAKE2B 8b5704252f771ddac843340bf2aa24f62a2b490f6bb03c46a1daa2560fae72226b92fb5a9720b18c82f476571e7e6ffc7c30e695c8a0e1a3de6bd65ee58461e1 SHA512 cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455
+DIST merlin-4.14-414.tar.gz 2463721 BLAKE2B 07d3fae8a4115b39bf035b8550d65447fee0758adb802ce1efa6e2a9ca2a64d433154e48c6d54af125e11ce8d65b7d4e30f1bf2f4414ac3e37cf05bd9b0ded03 SHA512 aad9a9937c53ede4bc45912ef03b9eb655f5a8a25c9893588baab6aec06a0ed7b4827a5228fe8f4495f7b66067b87adf917e6c868c9ff6a88d34982e7db84240
+DIST merlin-4.14-502.tar.gz 3872595 BLAKE2B 81c85101a696e85dd66f5ebc155c578715d30a8abf49e222c50ae09bfa2cc7086cfbcd1a89e611edd2382a844063bfd8ffd7c07c381b94e56db5576a6029fbea SHA512 92120a6b2d7d833519afee223b59980516828ff25d3df24edf64af3ba2f2f38395bb61440d9171d746b287f2de538643e38f8ada5f21ff1a0a56b365a39f814d
 EBUILD merlin-4.13-r4.ebuild 2314 BLAKE2B 2804a0c9a0b1fa251a0a002a785fb77f1c5390f9fa3f0a6cec361b0a54740df78268c277359804a3d39f901780bbe171efb8d4cc6fc8f936a1d2eead05535e51 SHA512 92ecce4f176d01bec7f72d3cb310ccb0fa045392b9b186ecfa0311852c87144ce929e5673d719e1fc1003ea317b4343223b284dd7fa40cb66dd9f2059019df27
 EBUILD merlin-4.13-r5.ebuild 2466 BLAKE2B d450c9860b0f7726fd659e6d3e2fed02759806b1fcae4b412871589109d7aef0130d371668d8cb80c3fa1c7d06b9b007c272884668be5b41149de276e9af01ab SHA512 88d8396651018b0b3138f46ff1e2cc922e2b2727c0f80d80b5c73468d69bd5fe5865a1b7c0865bc0657ef8f1c719ed66e58e73486d3c7b82485b51d75089fe3d
+EBUILD merlin-4.14-r1.ebuild 2580 BLAKE2B af7e906192fce1023a29c32e1da19dffe6d976201a14d2699c57ce5822300ddda60d74afc9a58d1c7621234706c03f01c4ecfd4c7c984fbdc6aad006d284a483 SHA512 8b80c6af2d8abc9c49730ceb5a451a3b4dc2b11e991eeafde8a699e24363571e56ae520b705a0e804a032df27812cbd96fce51a90119b136bc6cd64c2e05d641
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.14-r1.ebuild b/dev-ml/merlin/merlin-4.14-r1.ebuild
new file mode 100644
index 000000000000..5a667612cdd4
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.14-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune edo
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin/"
+SRC_URI="
+	https://github.com/ocaml/merlin/archive/refs/tags/v${PV}-414.tar.gz
+	-> ${P}-414.tar.gz
+	https://github.com/ocaml/merlin/archive/refs/tags/${PV}-502_preview2.tar.gz
+	-> ${P}-502.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+
+# Tests fail unexpectedly on Tinderbox. See https://bugs.gentoo.org/933857
+# RESTRICT="!test? ( test )"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.14.1
+	>=dev-ml/dune-2.9:=
+	>=dev-ml/yojson-2.0.0:=
+	dev-ml/csexp:=
+	dev-ml/menhir:=
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
+# because it breaks merlin builds.
+# https://github.com/ocaml/merlin/issues/1500
+BDEPEND="
+	!!<dev-ml/seq-0.3
+	dev-ml/findlib
+	test? (
+		app-misc/jq
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	if has_version "=dev-lang/ocaml-4.14*" ; then
+		edo mv "${P}-414" "${S}"
+	elif has_version "=dev-lang/ocaml-5.2*" ; then
+		edo mv "${P}-502_preview2" "${S}"
+	else
+		die "Currently installed version of OCaml is not yet supported"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle ELisp installation via the Emacs Eclass.
+	rm emacs/dune || die
+
+	# This test runs only inside a git repo,
+	# it is not included in merlin release for ocaml 4.12.
+	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
+		rm tests/test-dirs/occurrences/issue1404.t || die
+	fi
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+
+	# Remove seq references from dune build files.
+	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
+
+	# Remove Menhir requirement.
+	# > MenhirLib.StaticVersion.require_20201216
+	sed -i src/ocaml/preprocess/parser_raw.ml \
+		-e "s|MenhirLib.StaticVersion.require_.*|()|g" \
+		|| die
+}
+
+src_compile() {
+	dune_src_compile
+
+	if use emacs ; then
+		# iedit isn't packaged yet
+		rm emacs/merlin-iedit.el || die
+
+		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 64a3f1736d3e..2c61ea3eee44 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -11,5 +11,5 @@ EBUILD ocaml-ctypes-0.20.0.ebuild 908 BLAKE2B 18279ce659d023b2c256ea7aef01220851
 EBUILD ocaml-ctypes-0.20.1.ebuild 947 BLAKE2B 20f4f138e0f69d5b2bf8ad5677f64202cf2b03ffb448129bbf112c36d86b02f1e14a078a489d612264d8f76f415518f72f5017b1afa7b2e9429beb9872cbfb4f SHA512 9a6ccfa155adc9f218587e8963c57c347ecab86a70df337aa22a38dd3cad108e22d19d24f79d7c119e924d5269a0da630e377a7c910e5ae1c6df06a3149a1e63
 EBUILD ocaml-ctypes-0.21.1-r2.ebuild 754 BLAKE2B 61cd4e94a777bf3935343eb3a69a51ae63e5c58d5753bf80ab82d5999ae96c380ef45c2f645ffbdd107f98781e63974e501ac9d8e79859f0f20c3d9ed51fcf89 SHA512 21a78ec51d10ded59a411cb8dd3be18cfa65bdcff19ffb41d47dc4c6c4aa471d7c96137ebdc502f4a82f22628c93ec9e0aa84061d8a004a7e9ba9ba4bd1f8f3f
 EBUILD ocaml-ctypes-0.22.0.ebuild 753 BLAKE2B b0b7f1f1161a3dc0fd33533880365ec0d720ddc50e81837fb3d695ff2393a65b912ee75dd37a421c9e0420b37093c528707d0e91e7da99c3fa91bc0c3563d3a9 SHA512 08c0446386229b8ae086eb13ee4b0856333c218dfbb7ae4dc56685121d8630dc17caa862936369af86b91c9096a373494a12a4f81753245847d395fcdc9f199b
-EBUILD ocaml-ctypes-0.23.0.ebuild 758 BLAKE2B ca0a75d97e8944b75234b4c307f1ef6fab56529e46c77a484a29b3c8d8158843a39ddb251e49a1ce32743d8ea841482b92252a3b495a1d062e2c853f3d5d4c32 SHA512 783aa8d087dda2155bc8e486fff24fadc9c3ee430ef6c21e0640b76ccb2506bfe1e3677cefe64098c14706c5fedbc9becd8fbfaf861709bb4e93ca29ffc6906c
+EBUILD ocaml-ctypes-0.23.0.ebuild 755 BLAKE2B bca6264db66e60f5f6ab482eedf34304b7de41d09b481115ff1cafdea4cc6a8f83c972c8de6df440e87010215d76e71d13396463609ba57b2d549d4ef286cf67 SHA512 cd44e28682785747bd319e61129fd60b2d36dce20be9e1b361cab5e53fae5c55ce99d7cd8b548d179061b07d58253cb567b27d028e5a4b3105b20741d046baee
 MISC metadata.xml 317 BLAKE2B f25c1f9fc2dea5d1afe9f1cc03667a70564a3134b5211b494adb1c9bb0be9d77ca4f7bbd9ceda2a81458476e06c9cfcaaeceacd338e40b898b4454d518fae025 SHA512 7262b7766342484afc74b5c30fe4a7a719219c759eec469b86c1926dcd6deb61f0ba0ab5c71e37e4a1f921ef268433f9f4166eee5955f515142fdfdde2c968c9
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.23.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.23.0.ebuild
index fbec82b5da87..1334f4ccd087 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.23.0.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.23.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yallop/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/odoc-parser/Manifest b/dev-ml/odoc-parser/Manifest
index c0119999d490..4ccee63b462b 100644
--- a/dev-ml/odoc-parser/Manifest
+++ b/dev-ml/odoc-parser/Manifest
@@ -1,5 +1,7 @@
 DIST odoc-2.4.2.tar.gz 1251791 BLAKE2B 13071bb4deca73fa16731e32e43238d1604f94d889d5fb8fdf2c29c8fb241abda61e2c108b83925fb6671598cced7b916803cbc015bd277646c0a3768b1c3fae SHA512 44086ad906e7e1a620d0f635e0e3e89d4bf5bb4f20e6c8de76c54493de8555916bdae314b473fa3b6041fe3e1c0d96dc47016c7e6d589517101c7282583efdae
+DIST odoc-2.4.3.tar.gz 1253821 BLAKE2B b2cbbcc3feef11d5dac758f58f2ba05aa1abf39a26dc89b641b86e2b4e67b145aa269bba58e15038cc59be3ef369af570ad5be908904e20faa72608140f86f89 SHA512 bdf63dc176f279fed28d3df43c19a7530fc874aa557511b60207ea2fe32307154a70f38fa8d6f93b27856addf064a07e9ef39c28fb1288fa2d42017ab102a11b
 DIST odoc-parser-2.0.0.tbz 34826 BLAKE2B 0d167fa7d768dfac3b45740707b0a84d300999ef4334ade70286675d906cd7d8c70fcd27e563fb0ab4450f6a0ff8097884af267b376b51e7a91ccfbecb8ac06c SHA512 d2bffa3e9f30471045682e390dcee7a2c1caf3831bca4bd57c16939e782c2e23434e6f1c9887580a1804800b3629ef4c4311a9d418fca5a939f324650d54006e
 EBUILD odoc-parser-2.0.0.ebuild 539 BLAKE2B 5988b2af483221657d38abc71bb409cbc9716ea636a871401d2392269f406d54d7ba65f8f8d7056543f6f8bdc913dde0437701b46bfbd1d1d83bd8c3be761e2c SHA512 ea55d6b39244166f72e2844abc3dd79e93a5ee4ed1d0619f0b9038d8dcc08fc63870732a09f12b96ba69d7011f094b1035e38471af92500c73715d131fcc4671
 EBUILD odoc-parser-2.4.2.ebuild 723 BLAKE2B cb838a7039673ec88528331a7d9870c3b06a3444767b1aa64a2296f02e4073f1d36793e418658256f0b1324f508d573f0efe9b01541201d480f0d85722730623 SHA512 97d6c69831435dafa3b090e00266d28f5a774e65c0770f728c617f4c6f1489636c16f5c9c56f80bebdcb838a1c2e961758e6e2a0b3751910c9430d55c004e112
+EBUILD odoc-parser-2.4.3.ebuild 723 BLAKE2B cb838a7039673ec88528331a7d9870c3b06a3444767b1aa64a2296f02e4073f1d36793e418658256f0b1324f508d573f0efe9b01541201d480f0d85722730623 SHA512 97d6c69831435dafa3b090e00266d28f5a774e65c0770f728c617f4c6f1489636c16f5c9c56f80bebdcb838a1c2e961758e6e2a0b3751910c9430d55c004e112
 MISC metadata.xml 601 BLAKE2B 18f8ae412797bedb9b3d12ebefa7da5c7fefb00181e0c9392cc2f62ab76c2ad4153392c903a6a2221e208b0916fc9d727d840b09dcce3278f1985c6b0b968022 SHA512 bfd7ea44b990f8e20829b4b6a7a64e49bde353c0d4158ff95273c672fd803429c3b81c2c926f9c1a12d433ea704a757f6d9eb520512e074d83cd52bf257ff817
diff --git a/dev-ml/odoc-parser/odoc-parser-2.4.3.ebuild b/dev-ml/odoc-parser/odoc-parser-2.4.3.ebuild
new file mode 100644
index 000000000000..8f5e20147d25
--- /dev/null
+++ b/dev-ml/odoc-parser/odoc-parser-2.4.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DUNE_PKG_NAME="odoc-parser"
+inherit dune
+
+MYP=odoc-${PV}
+
+DESCRIPTION="Parser for ocaml documentation comments"
+HOMEPAGE="https://github.com/ocaml-doc/odoc-parser"
+SRC_URI="https://github.com/ocaml/odoc/archive/refs/tags/${PV}.tar.gz
+	-> ${MYP}.tar.gz"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/astring:=
+	dev-ml/result:=[ocamlopt?]
+	dev-ml/camlp-streams:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-ml/dune-3.7
+	test? (
+		dev-ml/ppx_expect
+	)
+"
+
+src_compile() {
+	dune-compile ${PN}
+}
+
+src_test() {
+	dune-test ${PN}
+}
diff --git a/dev-ml/odoc/Manifest b/dev-ml/odoc/Manifest
index 3bacaa020e24..5ba7fa2eaa2e 100644
--- a/dev-ml/odoc/Manifest
+++ b/dev-ml/odoc/Manifest
@@ -1,9 +1,3 @@
-DIST odoc-2.2.0.tbz 1548871 BLAKE2B 251c823e5f93e8080d52486e9d048a0c31651b6ea9d4bfdc3202488d7bcd750f9c2899189b943500253bf1e6041cf0283ed5e57c34d1a7d538c7c3710fb9a260 SHA512 9f8fc2ee6b25629474e8aa69dd460becab9277261578af0f7b97f7f779cc5f1056d1b5f14ab583b9b94ea097e5df2d6e35040f2a4887021209705486f9d44a22
-DIST odoc-2.2.1.tbz 1548027 BLAKE2B 846890375debd70519879de261ab829b34dc4f7754ef9d32c2cf6fa07d86ed721a828987398549021ca7805a4e298fef516b5c6e0691e083f8849ccaa6d4184e SHA512 044e37eb3dcc77d9cc8124be558cce77a438723b90225273fb3401d3315c57c8c2f395a48ebd1b6aacc01b00cbfa4bd0be1923d2bd9bd3cc92d0604eadaabc4f
-DIST odoc-2.4.2.tbz 1761532 BLAKE2B d690b94eae406b66ec5bc6ea44d0bf006eea534861e8a457f0355cee50b3908173c249f69c59726b867ee38c21715c05217b409fb2d6a74d26c782e8357bc8ad SHA512 8d48c99e0c253791177dd65287ce5cee47e7c6805e33f3ae0cf6c8e7d349128f26eebbe36459c31429c11519ad5979dbe36fbcb9403a5fde199a69976a3fb3a6
 DIST odoc-2.4.3.tbz 1764166 BLAKE2B b9de37c767e9c17367a0105afda75803c75e2b40c6c40c4bd63f99b503d0686224e74523c4c2f3214220d019fc6890df56c7e599d2b402f0c3e212178eea486e SHA512 e78faa68c726db3034c12f0cbf76efb87e73f03430a734f82eeea4fb8813e5ebb8ad176012ed20cc1d56a874c601489ca3f02c929474f925eec6d51ce6bdb856
-EBUILD odoc-2.2.0-r2.ebuild 584 BLAKE2B 663ac5582b30ad58555bf5bd69a0b2c60fe7f1b0be4eaa844926fbbc0ce96d3ec992097949e19b73d6582e0bd1290fd6f37fe588732f815b7b5e71979c692999 SHA512 bcc972d027c14203daf7f2c05ca1633618642973d9b7bfc71e39fa616721577ead3c6b2f262fb371eaf3139bdaaa4a0d15d6f3f44fa4e6442afd1aa7c094580a
-EBUILD odoc-2.2.1.ebuild 584 BLAKE2B 663ac5582b30ad58555bf5bd69a0b2c60fe7f1b0be4eaa844926fbbc0ce96d3ec992097949e19b73d6582e0bd1290fd6f37fe588732f815b7b5e71979c692999 SHA512 bcc972d027c14203daf7f2c05ca1633618642973d9b7bfc71e39fa616721577ead3c6b2f262fb371eaf3139bdaaa4a0d15d6f3f44fa4e6442afd1aa7c094580a
-EBUILD odoc-2.4.2.ebuild 711 BLAKE2B 19428f75b5f91da04c054eb618f741680a9c84f1c43ee67591263283aa760cf03fd373d1fb89e964c56f1a5770c97f3ed6076389ac3a9c8262bdd14b6736755b SHA512 d64c3f351639c2b15fb8522a26c34ef0e3bfdb173c40f90bd1820d49534724ab7685fa6eb71d9bc71186de579ab62fef63b7e2aee5e43e8ad033cdc087748815
 EBUILD odoc-2.4.3.ebuild 739 BLAKE2B c230126b85255de3100b3e15557c664c434b84d845c23a150d0d9a8fb89590aa1ea9f2b4c000f9c7ded25f5ac7318afe2635ec1e19ce196ee20390bd54b7bc61 SHA512 1bdd781cf75288c9ac5c2f91608198ce5572631d94176ef1e40142a30d1707dbd2507136081695bc104f39ad086eabbc2274ac1efe2b4290951ca2e9beceb3cd
 MISC metadata.xml 522 BLAKE2B 04acd17984b96b5fdf41120b46c1f15ab1a2b9ccac7312ee27e41da5985cbed08786aa9349cec268f224bc660ea3fd902874bd029f37355685b2fcc8b7093b07 SHA512 d969745657f9335411b45ca5efe110da0d017dac7efe5d5357bdc6f99852c279d116aaa02101b443ef45229c1b9c809db65cfcd719ae48ddf198d5b2923b9f57
diff --git a/dev-ml/odoc/odoc-2.2.0-r2.ebuild b/dev-ml/odoc/odoc-2.2.0-r2.ebuild
deleted file mode 100644
index 24702587b03d..000000000000
--- a/dev-ml/odoc/odoc-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="OCaml documentation generator"
-HOMEPAGE="http://github.com/ocaml/odoc/"
-SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt test"
-RESTRICT="test" # ocaml-crunch not in the tree
-
-RDEPEND="
-	>=dev-ml/dune-3
-	dev-ml/astring:=
-	dev-ml/cmdliner:=
-	dev-ml/cppo:=
-	dev-ml/fmt:=
-	dev-ml/fpath:=
-	dev-ml/odoc-parser:=
-	dev-ml/result:=
-	dev-ml/tyxml:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/odoc/odoc-2.2.1.ebuild b/dev-ml/odoc/odoc-2.2.1.ebuild
deleted file mode 100644
index 24702587b03d..000000000000
--- a/dev-ml/odoc/odoc-2.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="OCaml documentation generator"
-HOMEPAGE="http://github.com/ocaml/odoc/"
-SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt test"
-RESTRICT="test" # ocaml-crunch not in the tree
-
-RDEPEND="
-	>=dev-ml/dune-3
-	dev-ml/astring:=
-	dev-ml/cmdliner:=
-	dev-ml/cppo:=
-	dev-ml/fmt:=
-	dev-ml/fpath:=
-	dev-ml/odoc-parser:=
-	dev-ml/result:=
-	dev-ml/tyxml:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/odoc/odoc-2.4.2.ebuild b/dev-ml/odoc/odoc-2.4.2.ebuild
deleted file mode 100644
index 084faf30fa68..000000000000
--- a/dev-ml/odoc/odoc-2.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="OCaml documentation generator"
-HOMEPAGE="http://github.com/ocaml/odoc/"
-SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/astring:=
-	dev-ml/cmdliner:=[ocamlopt?]
-	~dev-ml/odoc-parser-${PV}:=[ocamlopt?]
-	dev-ml/fmt:=[ocamlopt?]
-	dev-ml/fpath:=
-	dev-ml/ocaml-crunch:=[ocamlopt?]
-	dev-ml/result:=[ocamlopt?]
-	dev-ml/tyxml:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo:=[ocamlopt?]
-"
-BDEPEND=">=dev-ml/dune-3.7"
-
-src_compile() {
-	dune-compile ${PN}
-}