gentoo auto-resync : 20:08:2023 - 15:41:38

10 files changed, 125 insertions, 98 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index f85005c68b44..df4c159b1327 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 5fd10f31491c..e922f778dbfe 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -10,6 +10,7 @@ DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d57
 DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
 DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
 DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
+DIST llvm-project-fe42682e7818d44cbe19f98ef34caa4e414aa937.tar.gz 196564445 BLAKE2B 056e6622b38009e34392c1d1755086e008bc85e9b4c00126e7ca92ddaee2ede7f31bafbc6ca04c5008983ce843d19fb152d75ce01e6ece4c2d891cc38604532c SHA512 8245f8a50f77e9ac9c0309a0025fde8407bb82d82277e3edba0a995debff50940e9500d4ad65060a330e6c19e2e1332d700ea040ca382ef4b75282a4566cbf72
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.6.ebuild 2533 BLAKE2B 598e42d89fce0b0a85a01b41166de25343dd6da9a6b422ff9f35f0cf515b759f85a180c25108df9ffbd8b773daad310851f05a11489e0af423c13a09b16c4585 SHA512 10809b6cdc64d70d9976a694123102de10804f65a5a9ea1e051638929c31e343f64388340307b500acd760ebbc2187ac6340336c39d6ae1280c34c5de5ce386d
@@ -19,4 +20,5 @@ EBUILD llvm-ocaml-17.0.0_rc2.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532e
 EBUILD llvm-ocaml-18.0.0.9999.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-18.0.0_pre20230803.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-18.0.0_pre20230810.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
+EBUILD llvm-ocaml-18.0.0_pre20230820.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20230820.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20230820.ebuild
new file mode 100644
index 000000000000..7499a8afc1dd
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0_pre20230820.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index aaf32e67daa0..190ce501110d 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,9 +1,5 @@
-DIST menhir-20190924.tar.bz2 2358022 BLAKE2B 4e92cab387c1f0e42142607d366ca93cd2a347cfede84872eeb1a7d3f7d799f06aff9c7d26abc9411c50452f5727e6fe669ed8761df6524127543b5f5e801f37 SHA512 bd0ec3cbd122b59d65a3797ec252f1e9af4889808aa6988270c1560df9e8f66895dfa3373166c1fb81025535b56829a936638c3f99cece7757aa01cd2dbd7d60
-DIST menhir-20210419.tar.bz2 1020155 BLAKE2B ac8491bc0325ac371dcdec4beb9dde52f64c979071b866ff133105e09c16119b8a444dad76b6bda8c0fb9ef992a43eeb7a6053c341335394ac9e8b7d41cf1eb1 SHA512 0671a93fcad115aae775a3b5e20f6d17604085d25013bd28bc96d3d46e0c9785c50459ab052c7fdc07c5d210f4d367a4d609a67da8f853ef6bddab1458919485
-DIST menhir-20211012.tar.bz2 1033414 BLAKE2B c124dac9b4aaeb578a694d3de989b685edceed43e2286a8fb9dc6e347405d766cfb934dc99ef82853fc255b6a057769ac42c1d5b7f8d3caebcbda70bbe0d5bfa SHA512 bb1c4a93dd69062409274f22d1cf57390dab71dccd93e65a19ee65183f56209bd330014f3a1ced3c903f9e914c9fd1bddd68ae0e5c338bb47d82d81444af3e9a
 DIST menhir-20220210.tar.bz2 1160357 BLAKE2B a9401b50db4dfdfe56c5c10919d4d385cbb7bf27d1518932e55d6757c08989407cda17c65f72d20e21738618e4f97f20b10098c9185f3882b3391aab7f9f8bc9 SHA512 8a852e995cab57b16adc1b7708d3acdf5f8b65d13dbf907a4155ff45d71dccc65868fe369590b48a3f06d8319f74777ce2e9be05caa9dbe060c0ae3a2b37943f
-EBUILD menhir-20190924.ebuild 917 BLAKE2B 6bedbbd0944abf95b6dabd579319642f469104727ab6cedad5f9a3d41bee1f929a99e3554a344bdf5f063bf90f69220705adbe1d719c5e5dead5cdd23cf56c1f SHA512 788f58cf9373ba01b52481565ab8c11abf62760a17b6d7947fa47a0630f41bf13074c4d939f799fcfb015dcff0671cb52834b21239f7c9216a8e694b66fca9f0
-EBUILD menhir-20210419-r1.ebuild 539 BLAKE2B 213464589293893390f0c8a76d25dfb406cc9f0cfcb88b5215d63d3016a8031ddd3f8b5229efacced84d35fdd00f2b61676c105db954dfff7004cee52c46c6d5 SHA512 8a5189ea63412108d7c69d19a9ab530992695244513e0e7cc7421bec5379e78c43f79d697f3c820b99cb66c154bec5d75f44635039bf6033dffd457ba98e7939
-EBUILD menhir-20211012.ebuild 551 BLAKE2B d2e3379100b948a5db33cfd6039091d0a702a532f32a555829ffb7cd209a588690c160629fd547d3167bae6e76f4529b208f978c8cbe160e42c0d3a8284e1db3 SHA512 6c62b083f40a5c90d18aa148ac9e976ffc8d24c2fd11d9d70748ec16106892bed42f07e1ce96b40955d47fa9a83967aa5dc70cfa67a2b88da3c55bcecf358078
+DIST menhir-20230608.tar.bz2 1195032 BLAKE2B 6d39fb89a7e5dd862cbb868170d5d7156ccab6a3524fee711535497775bc65074256f2e228da532d3365473be7577e174b7ea075fd3b5b716a402ca575c401ae SHA512 6af16eeb1e43c89a2c60ed38da100cb591726e029e58d5313c05f81a317d63511c5e15c5aa334d1e96db182b51235bfa0a9905804d8232d868e1684a630af007
 EBUILD menhir-20220210.ebuild 546 BLAKE2B ce6e3b06f0b8c330c792740ff6cb2d2a0ba582bbb6701c3fe53ae3459196f723b125ebe0208996655fd6a505d615b0b1196a6cc2f847d1529494b897b2ad7be7 SHA512 64c23c944f144611da02be78f773d44156786b3c44422d31628658eef3cca1581819dc67c5340f3141092fcff8fc7f7f36d25cf8a9fc94962a8274cf912280f9
+EBUILD menhir-20230608.ebuild 551 BLAKE2B 188c4f0b0bbdf165a7fed4d3e439643a78aa6007500321b65c3457cd32fab0599a170fb3bf71557c098fc8adae9111fedd8a85fb0be14408d5874d412af70f4f SHA512 f01ceb18bdf0cb6ff805481ee960c71bf08c3c366c62292de5b977a3146d1c6bb42f0e6ee5fd771d1f2d084e7bb9de264cf3e0184cfccacd41652f1358341bb9
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/menhir/menhir-20190924.ebuild b/dev-ml/menhir/menhir-20190924.ebuild
deleted file mode 100644
index 495e751288a2..000000000000
--- a/dev-ml/menhir/menhir-20190924.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-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 x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-
-	emake \
-		PREFIX="${ED}"/usr \
-		docdir="${ED}"/usr/share/doc/${PF} \
-		$(use examples || echo "DOCS=manual.pdf") \
-		install
-
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/menhir/menhir-20210419-r1.ebuild b/dev-ml/menhir/menhir-20210419-r1.ebuild
deleted file mode 100644
index 091a343e2f22..000000000000
--- a/dev-ml/menhir/menhir-20210419-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 x86"
-IUSE="+ocamlopt"
-
-src_install() {
-	dune_src_install menhir
-	dune_src_install menhirLib
-	dune_src_install menhirSdk
-}
diff --git a/dev-ml/menhir/menhir-20211012.ebuild b/dev-ml/menhir/menhir-20230608.ebuild
index bcb3ce206cf2..0432f636319f 100644
--- a/dev-ml/menhir/menhir-20211012.ebuild
+++ b/dev-ml/menhir/menhir-20230608.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit dune
 
diff --git a/dev-ml/zed/Manifest b/dev-ml/zed/Manifest
index 67c8357bc424..7bb6b502325f 100644
--- a/dev-ml/zed/Manifest
+++ b/dev-ml/zed/Manifest
@@ -1,7 +1,5 @@
-DIST zed-3.1.0.tar.gz 45535 BLAKE2B 8c8898f01add91807fa282baae1c5ee34e77c5234e87e4c79c17a9f55756d3b4c2af5f0b01deb9414a657f63ea6cf6db44af7249adb0f2b147e923b4112a7dd7 SHA512 d4457af15f970adb7b1ed543017e590fa0ecc47171d6dd520a1397f21ce0219caa30a9db7bedb76c0602d4f6d0f0684012cc33feafe18b848d3261a460dea10a
-DIST zed-3.2.1.tar.gz 43683 BLAKE2B 311fc78674116df9e1f9119102dbd6a882b305c22db0e6b59332d1a71f5a85f7169ba860f7064a72c0825e745e1f0a14f6bb247403a90ebc66a6bcec6c0d25fe SHA512 a1de65684d04d5d44ca4396365c98bfa070cf7c78318b53c3ad3ecca2b411450158ef7644b235490d879b37fe983f1707fef527b69af0c2958e45fd1e7a30f11
 DIST zed-3.2.2.tar.gz 44565 BLAKE2B 28a9193e119f3462545e014ee7d02af16515abc3a09bbf05ce8f9588e5d01abd892731eed5d42d7967f91ccb4bd161084773661efa0dc0fea6872e36484b1732 SHA512 cb377ff972c8ef0501a8034c53f10d26a60c7735742945d930b26a8535de2fa36ecc9538518a26f2bed8d5e61a642408c1f0886c75945b50ad6a524ed8e1193b
-EBUILD zed-3.1.0.ebuild 481 BLAKE2B 601461c875758a110f37dbae328bbd1d60bd83aa3716c367bb5cfb293b41f643f684c1ad2d6575a550986befca0c77aa7e1de33b4ff7cf843bb2507ced796588 SHA512 50b8d34ecfab53c921fc4c03afade28de347d77adc074c6cf6de757894cb7f9aeb21b7123b20904dcfda4fc744bdf190bdbfcecdc11b8ed7a494125f7101f1fa
-EBUILD zed-3.2.1-r2.ebuild 534 BLAKE2B 80956cd106eb1140378fbe2e2f7c82a1572c4b2da7782cbcf33a7291af8b17535f1d98afc4fe647127d5bca50da65999bf4e14a365154387b2228a06ba9a3160 SHA512 134e118d35f86a6b540d17799e16e2b73f1f9ab43f61affd4f1a69a15cf4e7fe65d52e4ba11d274401dcf42c15111a72e58cb6ef9271374776a80e3f051cb914
+DIST zed-3.2.3.tar.gz 44745 BLAKE2B d013d1d3341f04ec7aa141abaa175d3db9e57e3966c5a8adef7efb416e7ec3ae0800f554b0d943fa55cd8bbb6bfe069e6b5d7d23d2a38bf7f1e55f7cafe52943 SHA512 637f75129550f6459417549d44bed16bdc62721d2e9e0c6bb5bfab30c5bc6478de15faece8c091b56f238375cb79a7bc176375400e543120bb31d7ea626b7c5b
 EBUILD zed-3.2.2-r1.ebuild 603 BLAKE2B 2cdebd97b78c305fa40be70b7f21a3dec12cf520f8f32dd96407dbfc3914b55ed12eddb9168eff96874ccd49c2cfc41e81563230a8d68fcca2f0456034d8bcd2 SHA512 108adbebf8243ec9559cff8bb940988dd00d23821e9cbb051372f0fdc0573d96b1ab5bfdc3c8236df345fd1ac36a60e914ac4b3897f51d119e7a3681725a404e
+EBUILD zed-3.2.3.ebuild 603 BLAKE2B 2cdebd97b78c305fa40be70b7f21a3dec12cf520f8f32dd96407dbfc3914b55ed12eddb9168eff96874ccd49c2cfc41e81563230a8d68fcca2f0456034d8bcd2 SHA512 108adbebf8243ec9559cff8bb940988dd00d23821e9cbb051372f0fdc0573d96b1ab5bfdc3c8236df345fd1ac36a60e914ac4b3897f51d119e7a3681725a404e
 MISC metadata.xml 954 BLAKE2B d34a05ffaf2d7469b3ae6b65399a316279748536b93b9868f83484d0d719db9af3f1ec7fd834c7fd06902292231c3a964df8d94ad7c7b1044c614bbfae41bf53 SHA512 a44ecc312b950eeb782987e69bff55687be570ef304ae8689c8f1d5afd29d3990a54245a0229c1cff1964cd42e343350350fae30037b8f6856dd254893af8690
diff --git a/dev-ml/zed/zed-3.1.0.ebuild b/dev-ml/zed/zed-3.1.0.ebuild
deleted file mode 100644
index 64634262c7c0..000000000000
--- a/dev-ml/zed/zed-3.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Abstract engine for text edition in OCaml"
-HOMEPAGE="https://github.com/ocaml-community/zed"
-SRC_URI="https://github.com/ocaml-community/zed/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/camomile:=
-	dev-ml/charinfo_width:=
-	dev-ml/react:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/zed/zed-3.2.1-r2.ebuild b/dev-ml/zed/zed-3.2.3.ebuild
index 066ffd88b927..8e32cbb4d079 100644
--- a/dev-ml/zed/zed-3.2.1-r2.ebuild
+++ b/dev-ml/zed/zed-3.2.3.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/ocaml-community/zed/archive/${PV}.tar.gz
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-ml/dune-3
@@ -25,3 +26,6 @@ RDEPEND="
 	dev-ml/uutf:=
 "
 DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-ml/alcotest
+)"