gentoo auto-resync : 30:12:2023 - 01:36:49

37 files changed, 152 insertions, 455 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 685b082287b8..50f99daaac91 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 080407a55b22..a19a3a306c4e 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -1,17 +1,9 @@
 DIST base-0.14.0.tar.gz 385265 BLAKE2B f3a49b22bb63919bcdc522fbce14a24fd6eaddf39b921ba956cb82eb664ccc6919c9a9feb799dea318f1d8bdf1bd1983180b7ce38d9a43e118794057a9fec6a3 SHA512 c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16
-DIST base-0.14.1.tar.gz 385381 BLAKE2B 619c5c437237bb3ea9f428b450085eff2cb4639bf11803bcb2ae9f147b3ae39af72cfcfa10aaa5e74446bff4ba5f553815ff790190845f12e5e5b5080b197237 SHA512 5675a8b6b1ee5b7bd992ac9fbb036239f11b8a8c7cac9059ca38581d91f42e35d7bfa5839a90ed227344dd4c7b1bbacf0e7871d958c81f6ccf7e072b64ceff2e
 DIST base-0.14.3.tar.gz 385390 BLAKE2B e951fcf90f1181720346be0dc048bdb3d3f0b6417c954106aa035d807bff4a8bb85e97b11efbb296be92b24c257e8c83284c5419842b2d2f587a7ceee214e31f SHA512 56499ffd630bc8d09a18f49851d950ad54c376d4441b50ce60141f58aadece16f175a5b57492e8ddd997a6289d8671368dc0a58b01b6bbd2374acf45e7882e66
-DIST base-0.15.0.tar.gz 414117 BLAKE2B 7df1e74fc74f7d58d8e3b524a95a8ea8750dfa39bd31271b84d47ab4a4c5c74f17b9ae9fbc5a352431b0b222ff9437d11f22eb6b846c74d9baac96cc770dc53b SHA512 1e9a507f66a44b53eb80c866a544263ae5811992866043cb626826de8a4b4c6086601554fbe93ec874773edd229fab052be9cdfa5b75ef3bc7eaff468b53bca6
 DIST base-0.15.1.tar.gz 414911 BLAKE2B 4f0955374213bed241214451cb930c939bfed7208668b2b6676786a37c60f14b671b50e9a8893555693068dc2272e21f63e4def938dbe064b4ecb143925a8aab SHA512 4ac43829229765c19d8af98d45783c098abffd026328b03f5dc4390911b26cf6b65879d4084d30dd4b0b4f5a1d23079270e9bb10b1aeccf575ee70c7e16021ec
-DIST base-0.16.1.tar.gz 442796 BLAKE2B 8ad6426bd32700e0d8bfdf0315d2113cbfcf69459b6b3a5997adc6e320885e2706f72cdecaeeafde2a77c089752f446c9d865c152cc3cc2ecb4f98b1ee19548e SHA512 347ccc68be09ef207f0ac793f1c472688855ba53c317a35c95f7124be4105985b54f866b604a66a9d2e54bc320f7b29ffa3eb224622b1cce6ca504e1ee4888ff
-DIST base-0.16.2.tar.gz 442593 BLAKE2B bf0de878e412719a370b17c741b3191bacb34416c7dce022a56944803db30699b40bd750d8290e40a817dbd4e0dc8d3298e816c8ce31ea2197fbaf1eefb368a3 SHA512 d5f00c411dbdffe6cabc7ec309550c4f947e79c9ff6c95cbb2d148fd0bbff060db8019c9544c1db56172a6d143f810e700d7092d404ba6cbcd756cbaa896813f
 DIST base-0.16.3.tar.gz 442632 BLAKE2B 533a04b197bb1065a8b8772aa227bbe3be2c47d536722dfa7d1df366ad05e40fdd47f3a842654ee9bde1e3527ff34adaf155057af68596d4c02c8108505c9108 SHA512 69380ed392faf4495459f97f70a10a6959fce71d2e6ba093472fc272141646307fd7872407de855dfa48ef0435f6587eae5aa50f4a67eac40a9e1946d0c3c070
-EBUILD base-0.14.0-r1.ebuild 529 BLAKE2B 926397a17c47bca7fd76f073e2804928e2853c66c38678d7e65282ebc0d60f64f1af3bb8607bb73653992f0c68998e2a107bc48b195b4f12175f11f953622984 SHA512 ce5d3dd77c8e095841c9e0896a2a366c0bcb65eb540df0b24b6ed391758457191000f3477f8e87e66f1b529894957abde7f6233106fee35e90b3ce285230192a
-EBUILD base-0.14.1-r1.ebuild 512 BLAKE2B 31ad5cfcfdc7a58b7fd3343e17e18f579ffb41697979e2f0e9706cc3f5ca143b6d9b283348d5cd87dbf5087cf4d8e7ec8643391a8731adb7634b2d2e255944dd SHA512 9fde5670cdefdc4c36523fc63ad3d54528640f01deb97f0beedbf7f40f35df75ed31a596cb5925654f1dc3c6546b137d83aca7d34fdc4ff07676f8ac316c6cb0
-EBUILD base-0.14.3-r1.ebuild 519 BLAKE2B 47ec0987bb679f60f1ffeb09c83d71b21add88ddb7ebc73b2ffdf35478ac2cf7c8755c9af9f0a1206c57957c78c748e7e20c2e85c7cf0e02f9fe40403c27a996 SHA512 d6b621adac7f178d39cccf1e8653eed6b2177d2eaa2959fb2d33a0584da7b4dd7782c647b8f72fcd1c69cabe8bb87f65e3f7ecc3575a6676292dbda95c7c95de
-EBUILD base-0.15.0-r3.ebuild 525 BLAKE2B 3650bab4197be9ca9f88e085da93892d7a8237bce9134cee21d9c288f9c7e3eb31aee94cce4c5896eba81429c5d43c17a0d05dfe1ea4b63b07a8ccffa0b636bd SHA512 e59f607e7a0151786875d2ee107ecf2d1f424faf77bc704e12c324662a05eac9688c2afef76549f2dc776fd2e774dbc1965249056a75b8832b7df16a0dfae831
-EBUILD base-0.15.1-r1.ebuild 520 BLAKE2B f204c05f6eb0751e044eff605cd90fd72e21cb7b4e222514b2a14a4ada7a89a542e534b91953c003485835f711fbc329701e8c0b1de82d7fdecae68b2823cd83 SHA512 46eb0eb4f9efa20fa56432c927f5c1e26da242041ab8501782400aa28c1a9e2004e0b881e42e5c63d3b4cbbfcfab6ae3586b5ef1b7c814a963490d90606e12d7
-EBUILD base-0.16.1-r1.ebuild 525 BLAKE2B 26da91a762e713971a1b8f92e7164145cce2a755fd16b4b0547687953b2ff055428248be3e7b389afe2652891d9cbb9a37aae08debf99cb9b75db2814eb9dddd SHA512 bc642d7a019934f771db5335ebd1c5e278c2956b3cc8035974ddd9613b130e4f2c990b7318c80f414a594d6e8599a7d963cc1c242b319af4a7b2ad1217bb069f
-EBUILD base-0.16.2.ebuild 525 BLAKE2B 26da91a762e713971a1b8f92e7164145cce2a755fd16b4b0547687953b2ff055428248be3e7b389afe2652891d9cbb9a37aae08debf99cb9b75db2814eb9dddd SHA512 bc642d7a019934f771db5335ebd1c5e278c2956b3cc8035974ddd9613b130e4f2c990b7318c80f414a594d6e8599a7d963cc1c242b319af4a7b2ad1217bb069f
-EBUILD base-0.16.3.ebuild 525 BLAKE2B 26da91a762e713971a1b8f92e7164145cce2a755fd16b4b0547687953b2ff055428248be3e7b389afe2652891d9cbb9a37aae08debf99cb9b75db2814eb9dddd SHA512 bc642d7a019934f771db5335ebd1c5e278c2956b3cc8035974ddd9613b130e4f2c990b7318c80f414a594d6e8599a7d963cc1c242b319af4a7b2ad1217bb069f
+EBUILD base-0.14.0-r2.ebuild 551 BLAKE2B 61f5b53cc82227154b8e3403ec0731167593e8be9fa34c048c49f16e9396ddc55782768285f745faa0c923bde96d48b75752707f5e6843ad9084662d7e7f21a6 SHA512 d87c518813bed90e8d5fefd5c3f6d90ea61ba15b77131ef6320a6a8ed4341e44739041be32c1cc743029ef90a3764bf9b7580028627af2f9c891b81fe490dedb
+EBUILD base-0.14.3-r2.ebuild 541 BLAKE2B ddc0b055a9dcee7c21ed0274cb38b99b725374bff580bfd2c4541dd9e96ff83757c95db2d109279741e0f875539cd461ec509810dfb655e3d20be292652b5b5c SHA512 b65032fb17bd24d039f3a37c9199f99ca73591a9a2c9a648fd19d84c27127882fe4ff3acb23b85c49af3de9853a890ba8338d59e111af5ef227285e643f47274
+EBUILD base-0.15.1-r2.ebuild 542 BLAKE2B cc17a8d51a39dc5a58a53d6ce6a7b1965d16b69845b001b62ff291181726188e7a90f13d26ab0af062858e1c80db070db87ad0881142742fda739c49e18af2a5 SHA512 c597e15dfea4a9586dec285e511a7dc91cb6676f1493072e99d289dd4a6dfa085aafb55bd531ebd61e6c96e0fa5d27e82210a1bcd5a126f37ad385b05bd5633d
+EBUILD base-0.16.3-r1.ebuild 547 BLAKE2B eb9d506801f445a09bc8e238f23bc504cd521d99920c831c1d850fdb4fdd88733fe4f5d46ae75b0c612160ddd2af20ba26fa9b3ad19fec19b2c0a79177d5ac95 SHA512 fc44187b4a802fb0f217b85f32ba1e3b743ba129c9372410d32cd8ef95f5f65e1e1c9fd3cb23c1d4b228d67dcd4b5c3a7344ca877a832beaed21c1f4c4963643
 MISC metadata.xml 418 BLAKE2B 897b294ee364c5eedb4f7417bff0258fb271ea431dad1bd77482df74529ee883f5ef39e6c50554b670a344ab3d0ee8f5e19e83ccf2670346defde1a64af413b1 SHA512 6fc42ca5665bf4689ba65be528532fdbaee51371e98b58be70f56479ad0c1822e6f78ddd7a11ab0451f49b885151ab80c651c884a136e24603c9564b43443d81
diff --git a/dev-ml/base/base-0.14.0-r1.ebuild b/dev-ml/base/base-0.14.0-r2.ebuild
index 22177725208b..b297736ade18 100644
--- a/dev-ml/base/base-0.14.0-r1.ebuild
+++ b/dev-ml/base/base-0.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
 	<dev-lang/ocaml-4.12
-	>=dev-ml/sexplib0-0.14.0:= <dev-ml/sexplib0-0.15.0:=
-	dev-ml/dune-configurator:=
+	>=dev-ml/sexplib0-0.14.0:=[ocamlopt?] <dev-ml/sexplib0-0.15.0:=
+	dev-ml/dune-configurator:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/base-0.14.1-r1.ebuild b/dev-ml/base/base-0.14.1-r1.ebuild
deleted file mode 100644
index ec1b96faf89e..000000000000
--- a/dev-ml/base/base-0.14.1-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=8
-
-inherit dune
-
-DESCRIPTION="Standard library for OCaml"
-HOMEPAGE="https://github.com/janestreet/base"
-SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	>=dev-ml/sexplib0-0.14.0:= <dev-ml/sexplib0-0.15.0:=
-	dev-ml/dune-configurator:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/base-0.14.3-r1.ebuild b/dev-ml/base/base-0.14.3-r1.ebuild
deleted file mode 100644
index 1aead12b4736..000000000000
--- a/dev-ml/base/base-0.14.3-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=8
-
-inherit dune
-
-DESCRIPTION="Standard library for OCaml"
-HOMEPAGE="https://github.com/janestreet/base"
-SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	>=dev-ml/sexplib0-0.14.0:= <dev-ml/sexplib0-0.15.0:=
-	dev-ml/dune-configurator:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/base-0.16.2.ebuild b/dev-ml/base/base-0.14.3-r2.ebuild
index 500f481d48ff..7977bf74941e 100644
--- a/dev-ml/base/base-0.16.2.ebuild
+++ b/dev-ml/base/base-0.14.3-r2.ebuild
@@ -10,13 +10,12 @@ HOMEPAGE="https://github.com/janestreet/base"
 SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	>=dev-lang/ocaml-4.14.0
-	=dev-ml/sexplib0-0.16*:=
-	dev-ml/dune-configurator:=
+	>=dev-ml/sexplib0-0.14.0:=[ocamlopt?] <dev-ml/sexplib0-0.15.0:=
+	dev-ml/dune-configurator:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/base-0.15.0-r3.ebuild b/dev-ml/base/base-0.15.0-r3.ebuild
deleted file mode 100644
index ef8935da48a2..000000000000
--- a/dev-ml/base/base-0.15.0-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Standard library for OCaml"
-HOMEPAGE="https://github.com/janestreet/base"
-SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.10.0
-	=dev-ml/sexplib0-0.15*:=
-	dev-ml/dune-configurator:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/base-0.15.1-r1.ebuild b/dev-ml/base/base-0.15.1-r2.ebuild
index 372006684a85..536909da83bd 100644
--- a/dev-ml/base/base-0.15.1-r1.ebuild
+++ b/dev-ml/base/base-0.15.1-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.10.0
-	=dev-ml/sexplib0-0.15*:=
-	dev-ml/dune-configurator:=
+	=dev-ml/sexplib0-0.15*:=[ocamlopt?]
+	dev-ml/dune-configurator:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/base-0.16.1-r1.ebuild b/dev-ml/base/base-0.16.1-r1.ebuild
deleted file mode 100644
index 500f481d48ff..000000000000
--- a/dev-ml/base/base-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Standard library for OCaml"
-HOMEPAGE="https://github.com/janestreet/base"
-SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.14.0
-	=dev-ml/sexplib0-0.16*:=
-	dev-ml/dune-configurator:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/base-0.16.3.ebuild b/dev-ml/base/base-0.16.3-r1.ebuild
index 500f481d48ff..0842c57f20db 100644
--- a/dev-ml/base/base-0.16.3.ebuild
+++ b/dev-ml/base/base-0.16.3-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.14.0
-	=dev-ml/sexplib0-0.16*:=
-	dev-ml/dune-configurator:=
+	=dev-ml/sexplib0-0.16*:=[ocamlopt?]
+	dev-ml/dune-configurator:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index f0b6b2b57e9b..643f726f57a5 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1,5 +1,3 @@
 DIST ppx_deriving-5.2.1.tar.gz 46148 BLAKE2B 75c5f95841e4e54d5a58221c27d4a904347fb2b20ff0189bbe99bcc200eefd4abb94a476a120b6c6c7d0eba3b2233054875868a71064d032815cc8907919371d SHA512 01d2eb920f3375960a9228138ccb5f2af49bfba1111894795c24b3c37d5a021d6bc95e9de1d867c35d03645334300ccc89f1fca0cb75007ec62e5620f328e078
-DIST ppx_deriving-5.2.tar.gz 45766 BLAKE2B 67d041b69ad675873500844f8ef638797e271c3a3a82467407914a073e6eb9ff84f911d128ccf507be051fb89c7c85991987793067046b0dd1ecdc534b658b05 SHA512 0daf7d0050b8e2b18b441da994e8cf1f05e37f7d88d1f4512204979f19ac4d116a6c72f683c615b091e0340a4d380684f9b2ed1b70d84fae6ca928843ed3f479
-EBUILD ppx_deriving-5.2-r1.ebuild 638 BLAKE2B d4af358d1d233909d59247c5c25e47a401ede109e213c90ced0437bc2b16b1448440ed47f5cb59150e0e5c6e905dfbe888ce06277ad378cc807124ce8f693841 SHA512 19ac5d0702b7d54e81775ec82b6266c71f9e4ba507c1dc36747e6f9c383b831a99379a09484e5cb5086d75dcdf5eaa70e464e164062d57153cdb1dc6e7bdfdec
-EBUILD ppx_deriving-5.2.1-r1.ebuild 673 BLAKE2B 92cd9ad3f4c1144948538c9fc4d94d796a569d479369e66e0c5670c2da452dea4c32d45bc25b2eaeec2468a8850fdf9198c285ac5d17425de76aa48799f22be2 SHA512 7b78db5f178f79abe4b853e7c81c6af09aa061b1f01ca4f907933890caec418a301a3d6268d32d8f3574d8eceb6815dbb5e127fe50fbbc38d02f86d26a52b12c
+EBUILD ppx_deriving-5.2.1-r2.ebuild 761 BLAKE2B f44f71f7f7796a30b400e403411a63bb77920dedc5474a0430d71385dd10bb08796d01a5b4ca98830840632d8b9736863d42231066a569c61b2c634a7a0d123c SHA512 a83fc633be34f72517b03fdea7b780e6ad95441990558b18701c2c27eab9e2050ac9fede104340424f372fb094573671e8d19d7f0b9a7038532705d11b0f045c
 MISC metadata.xml 425 BLAKE2B 7205cca257094cbfeea975ceac94d102dad9d7a165cf1cee31fe9828d1c2b356424e473dbbcad8e4b6fc554146ec188a19c29cb2a564227db9b363a775bda360 SHA512 1283b517100b3960c2dd796654db9960869760617dffb64b719e36e263c2cfb5571e3e8f039d8f64a94f2f776f06e317290452f9f6eed0becd99587c61024b5b
diff --git a/dev-ml/ppx_deriving/ppx_deriving-5.2-r1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-5.2-r1.ebuild
deleted file mode 100644
index 698ff16486b4..000000000000
--- a/dev-ml/ppx_deriving/ppx_deriving-5.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Type-driven code generation for OCaml"
-HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving"
-SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/ppx_tools:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_derivers:=
-	>=dev-ml/ppxlib-0.20.0:=
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo
-	test? ( dev-ml/ounit2 )"
diff --git a/dev-ml/ppx_deriving/ppx_deriving-5.2.1-r1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-5.2.1-r2.ebuild
index a62e03fa377d..a3d5b41935f3 100644
--- a/dev-ml/ppx_deriving/ppx_deriving-5.2.1-r1.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-5.2.1-r2.ebuild
@@ -16,14 +16,14 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-ml/ppx_tools:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_derivers:=
-	>=dev-ml/ppxlib-0.20.0:=
-	dev-ml/findlib:=
-	dev-ml/result:=
-	dev-ml/sexplib0:=
+	dev-ml/ppx_tools:=[ocamlopt?]
+	dev-ml/ocaml-migrate-parsetree:=[ocamlopt?]
+	dev-ml/ppx_derivers:=[ocamlopt?]
+	>=dev-ml/ppxlib-0.20.0:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
-	dev-ml/cppo
+	dev-ml/cppo[ocamlopt?]
 	test? ( dev-ml/ounit2 )"
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index 6f9835b1d389..17dbb0536f2f 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -2,13 +2,11 @@ AUX ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch 1548 BLAKE2B 2adef4e4a978e6a01b9f18
 DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584ec6be4793df706fd3be96670fe685aba82459f9a1e4c6117c594953a3f23c502cc609f1069d482d24278baf7ed87ed5 SHA512 5018abe07300f67cb2c8b8cd8242403a91ac6b7fda13fe43060b3b09635082a7ad45858c7c6442a5fcae2b6d7d398a03eec16cfcbc5fd59f7f3f5c5fd1ad56f9
 DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25
 DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
-DIST ppx_sexp_conv-0.15.0.tar.gz 67450 BLAKE2B 06ea07b90237a288922cfc5a9f6ab2730b7ebc208998c8472635af0fee50e5e2acd5972bcbffe20023fa423db4d788cfae3472d10569c47e444f18ce98599a21 SHA512 da526b5a783c5b2e6cb5d3fc39d69b2eb29807ba77d58ade82abb9267137e8536ec7b841f6ec51b9eb00008a26f71137e78f65df2023b1a47ea586f8d94ce66d
 DIST ppx_sexp_conv-0.15.1.tar.gz 67448 BLAKE2B 4994b609edd19bc70755c418ff7ed0972199ad6b3dde834ad32400c613113a3b3622dca160a4e49ed5abd6fcb9ced3f7580ffc1bcb055ca1d71a945ae56ea203 SHA512 f2b669e7c7bbbc8dd4978b47b73662dd0195ae85cdd71596485211cb5ab4daedcae9be4b33796674320e0d324b7ee9f90d3b219212be98ed792e3a89ccf8c41b
 DIST ppx_sexp_conv-0.16.0.tar.gz 66918 BLAKE2B 7f7f4bd9c3178d80b0b813204e8abbc2791a519951793ed99df62988b91fc90e3616565a2c1b629a80a05814b7cb06f491109e079b70aba9a1606552a2a8e19f SHA512 ceacd17683c8e739d2e5eaabb585c01615a11b18c1bef7df85b48820885d344cbae94c1351a6a2522e016a1bd41fc3997928d6b2b2169aeda72ea6626eb1f7a0
-EBUILD ppx_sexp_conv-0.14.1.ebuild 721 BLAKE2B b92b9a26cb8493b30f3a36f6f6924b2a774817cfa0d46059e783dba749240600c94f42c91a8fe77d721251362dedbb4bcd8ec0c3342d21d66290779e92343964 SHA512 97a91e245f35910228b2046cc1acd6d0546a421e1408f9e6aaaf54722e2009eb01f07be0f9e4637b9d783bdd63abeb0956ebd0d087242c5bc227463541b1390d
-EBUILD ppx_sexp_conv-0.14.2-r1.ebuild 704 BLAKE2B b683ed789bed2b027ef66cd4c6c59ef54b47f32812c8494d3ff7680e99cb518704d73ece5f8e84ed8012ef6be277f90dc27cd8172e283cf8347ff58853c928b9 SHA512 4efae412931fd671039ff0f17ddc8d094339549eb99de4de6db644d5fee0583d08dbc606c9a0bc3d39890594963d21492a802edbe40dfe30d7caf157d634d9cd
-EBUILD ppx_sexp_conv-0.14.3.ebuild 711 BLAKE2B d8998d95289a986d62093854a12c7c432815110e9d4899e743cf3458fe5651e72985426fff46f6669d106853dd65734ced2cb81c5193ca1f2b05d6504b65733f SHA512 bb6407a7fc6b500ca4c81eb557c33602e6bfd47cb67ecc330e273079aa9b5f869bc105426d9bb7dc9cd115fa04b131577761e79162be6f458e6a05213223eb5f
-EBUILD ppx_sexp_conv-0.15.0-r2.ebuild 640 BLAKE2B bca4579cd46c603588a20a97834b77b3eaf2fe84f3005360162cbcf5e0c8d41622ad4bd919aaa35b9427f85ef4916021660c10526527fb15532d389675329607 SHA512 197b13bb83f39a6b8ff632575c7c0c98f21b817ec216ec4d4fb0bffff5dd665225023187349b94a65758af741851a22c4b96abca633d336694604c1e04e98425
-EBUILD ppx_sexp_conv-0.15.1.ebuild 614 BLAKE2B 4f0ead57c41898417558d5a7e3fca909235d503126999685911e80e1a1a89f33f92550e83f33ef00d203fda74a9b4d404eb52a8d497cdf5fd3a7a4d62f093b22 SHA512 15e1456f63f13340b834c66e1132f126d4a513644057e2a2945bb5e6856eb3f0dc568b3a4c1aee79168b0faa76524f5991cf7cbeb5f3ada1f4db30243b7c71bf
-EBUILD ppx_sexp_conv-0.16.0.ebuild 642 BLAKE2B 7dbc21c4b128529b41934296ba6be55df46cdd3afe66dec82159b650186213d85bd77868723d33a386121ce4df4442c35a591565d1d042f542cdb653e47574b9 SHA512 978d026d771632af4b4392c086cb9f2598c76eb3f585a3ab228fd15d27948ef7614298ead0cc0a3d0e5a7ba167d9d3ea06bf8418b67872cd500e09d24d980bef
+EBUILD ppx_sexp_conv-0.14.1-r1.ebuild 763 BLAKE2B 6df87a39f1fe77acbf47370679c980dd7d5fdca998d8a5baab390a7445e104de2aea1416a8504c02e9acc50240faa9f7d178ce3b66cc00dc141da68e4b1ad6a3 SHA512 e20653283155d86a49e14d3425b7bcdb50b25bf9cf83a83379f32b31be46fcdeef85fe0699e922694931a58e64851ef0c20cb14adba9933b70cc38f92f2b31ea
+EBUILD ppx_sexp_conv-0.14.2-r2.ebuild 746 BLAKE2B ee1b2a803a90133ebdd5028af48b7e44e4c8051e27a01af6ed5d12755748f48fcd3aa16a019cddcc22420b9a5a9160e2159bac53cc8e527f296b2facf6454fb8 SHA512 4e5c6abee58c8b8068c7d202d1b8570d6b7c37ee148cc5df6980a5d27584b115d9ee0c0f601e05935786c83e5362547b94122274c006696120b88b1c5376f9eb
+EBUILD ppx_sexp_conv-0.14.3-r1.ebuild 790 BLAKE2B 776fb87d5e6f1130e17766973461da7d62d0c70ca948f2b74e721bc2b06f56249efdf7b08e4f83a4b0630fd433f65d32b7577cc8f2e548824b28661dad5b28aa SHA512 b6b935d4a6432bae1dd44c1bee9507786d3dd7affbd33e6d0cbb91f1480e7c184bd303aec6faabd258b16dbfdc09f9bcf7979f82ef2638396b09db85f141e53c
+EBUILD ppx_sexp_conv-0.15.1-r1.ebuild 649 BLAKE2B f1300fb96a7d462fde3cb0ea4ba29277defdc5bc041504d6a9aef1e9f7cd789e27c4fefa1f95a84afa8d8bbafdd25fef3342ca833c8e13714f9040910d38623d SHA512 b20eba3f7f5fd2138f5bb4f48f88d32fe57655e76ea9f1bca83f101bb49b1f381555bd4265857eb73832b1998d866869d63fdae0a9d10fac635b4172a92dcef6
+EBUILD ppx_sexp_conv-0.16.0-r1.ebuild 677 BLAKE2B 82a61f7e06b7af3d081214a47d4f09cf75ef7086f8ce1b1ccdda0add66e70394d1d4881fe5ab39b814d014a96a5633779d3caa78fe108be0e8a70ba101fc9f0e SHA512 28925cbc66a5eb85eff45d05f39f16f8ebf7aa10ab2bb4ef1f7846da0469d67444670d6644bd9d78a6f65db217fe5ef4c27b4ae796e02b096e4fa37e89431a97
 MISC metadata.xml 427 BLAKE2B 40cf563b5bf060e3d241038655ac6f7fa0d96e0d3aafd8bbe27cf77e5a997129dcecfb9cc907734a5fdadd720f848807aa60ae4bdf6a924cbce3b7277d605882 SHA512 e29de52e463fa9c21b92a52a6454f2cadc9bd6677d549c86ee43383a88af9ee43134ecca2379088a40f0e89aa7d98b552480e8dc2cd8042f9a8e5453e8ab1d6d
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1-r1.ebuild
index 41666a867b9c..c00cadc46031 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,14 +15,13 @@ KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
-	=dev-ml/base-0.14*:=
-	dev-ml/findlib:=
-	>=dev-ml/ppxlib-0.18.0:=
-	<dev-ml/ppxlib-0.22:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/cinaps:=
-	dev-ml/sexplib0:=
+	=dev-ml/base-0.14*:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	<dev-ml/ppxlib-0.22:=[ocamlopt?]
+	dev-ml/ocaml-compiler-libs:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=[ocamlopt?]
+	dev-ml/cinaps:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r2.ebuild
index 2fe40bf31b75..017dfbd5279f 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,13 +16,12 @@ IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
 DEPEND="
-	=dev-ml/base-0.14*:=
-	dev-ml/findlib:=
-	>=dev-ml/ppxlib-0.18.0:=
-	<dev-ml/ppxlib-0.21.0:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/cinaps:=
-	dev-ml/sexplib0:=
+	=dev-ml/base-0.14*:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	<dev-ml/ppxlib-0.21.0:=[ocamlopt?]
+	dev-ml/ocaml-compiler-libs:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=[ocamlopt?]
+	dev-ml/cinaps:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3-r1.ebuild
index 3075a2aed976..3db1a61dc337 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3-r1.ebuild
@@ -16,13 +16,13 @@ IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
 DEPEND="
-	=dev-ml/base-0.14*:=
-	dev-ml/findlib:=
-	>=dev-ml/ppxlib-0.22.0:=
-	<dev-ml/ppxlib-0.26.0:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/cinaps:=
-	dev-ml/sexplib0:=
+	=dev-ml/base-0.14*:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	>=dev-ml/ppxlib-0.22.0:=[ocamlopt?]
+	<dev-ml/ppxlib-0.26.0:=[ocamlopt?]
+	dev-ml/ocaml-compiler-libs:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=[ocamlopt?]
+	dev-ml/cinaps:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.0-r2.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.0-r2.ebuild
deleted file mode 100644
index a31de8e54ea4..000000000000
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.0-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Support Library for type-driven code generators"
-HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
-SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-# Upper bound on ppxlib for bug #769536
-DEPEND="
-	dev-ml/base:${SLOT}
-	dev-ml/findlib:=
-	>=dev-ml/ppxlib-0.23:=
-	<dev-ml/ppxlib-0.26
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1-r1.ebuild
index 9888ebb019fc..731b14fca1bd 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.15.1-r1.ebuild
@@ -16,9 +16,9 @@ IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
 DEPEND="
-	dev-ml/base:${SLOT}
-	dev-ml/findlib:=
-	>=dev-ml/ppxlib-0.26:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	dev-ml/base:${SLOT}[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	>=dev-ml/ppxlib-0.26:=[ocamlopt?]
+	dev-ml/ocaml-compiler-libs:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0-r1.ebuild
index 6d2d413beb92..0ebc5e9d824a 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.16.0-r1.ebuild
@@ -17,9 +17,9 @@ IUSE="+ocamlopt"
 # Upper bound on ppxlib for bug #769536
 DEPEND="
 	>=dev-lang/ocaml-4.14
-	dev-ml/base:${SLOT}
-	dev-ml/findlib:=
-	>=dev-ml/ppxlib-0.28:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	dev-ml/base:${SLOT}[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	>=dev-ml/ppxlib-0.28:=[ocamlopt?]
+	dev-ml/ocaml-compiler-libs:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index 3b798c0b1844..a984ffbb8ebf 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -1,24 +1,18 @@
 AUX ppxlib-0.23.0-fix-ocaml-4.13.patch 844 BLAKE2B a978b50623d08439503744ee168ffc267f5ae9dca8b9a0671482cfa5512ae2dd38b4d70972f90791fb876e844e346935210ed64704abc8152f27c28f49649369 SHA512 49fb9de4006a9d19ab6da2945a57f11c1154fff07055ea8a1290db2f85c1e28454350a3b050cd2af2c68146c5de30068cdc38b2ca37d3898f4a425002809e17a
-DIST ppxlib-0.18.0.tar.gz 192929 BLAKE2B db14821aa77eac02038632ee8a9756ffd7a7b561c5852c4a5bb6882da531a6d2833737d4d1d372ff73251c168e2da57c7df0c724b1d9a6c4829632881aa4d2b3 SHA512 73b785eec34ca68451936c750ff68a4799b8c265cd973a587bd77b60cb933409eed4edfd4c9a4b0b1ada8d3a0bae5c5c719e4258d00cb0290a6842c67be1fd3d
 DIST ppxlib-0.20.0.tar.gz 193453 BLAKE2B baf5703737792f274654de489aee31c1d324011cbe7e4f5b73102ea352d10ca513ed1b04ec43324640a01c0e5d168945806f6fd4e3a60c9f70c28392a720ec61 SHA512 e19699cb09c441d0ecbda191df78e8227111f1880be4f2810228cbfbf93c9474ba6d04e0e3b4b14820ea7dbd1388fd4ac86f818a28819e7d8b0dd00200609a7d
 DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdda375371895072b857a44e8e7f437695f43990472dfad88261179ff07bd33f6e39881c2b28ff2650d7e2a53bdf SHA512 5760ecc8a5e0c0f49ad4f0d3ba2546185d36411f4292c4ebfbf0c9520438546a60d8fe0b265cec70793b03cc684e399401ff761cb1c369966add70118f1ecda5
 DIST ppxlib-0.22.0.tar.gz 202241 BLAKE2B 6b18ceb23e248eb2b4faed66ba0ea1cbee36df61cee9458fc0fd7057eff433340cb602a429c3f100ee054da06d9de20eca44e5ecc4ba98c888cfec2c83097151 SHA512 11442120c24bf60d9de90c9a325de9e5d87d87ba08d8e4cd216a3434f422c62427aa4214909b80646db638423ea35dff4280d5a70cf51bdfadc0a97745c32d41
 DIST ppxlib-0.22.2.tar.gz 202895 BLAKE2B 41d2c2e698846e5dfeb4158966b65dd29b253645b0286d0eab5a9dfb0e684b8b43f17a32b23023198d2c4e50e836705d2c965ea74ef337c5b0cf6aecd6fa4167 SHA512 3a83693551f11965b219a9caa4eaffbf358ea1311e05a38bfd531b8ad225d6571d86db7282e1d5bdc09775f2ba47791c03351402720cf5c2adefc52926d498e4
-DIST ppxlib-0.23.0.tar.gz 364308 BLAKE2B b1cc622eb5e01c455da437365053fd32a00d33007520cf28536e1f45c142aa0a9083da614110c1096fd3f8326453eb037a8c0054e00e17a813f99f3d8efde5d7 SHA512 9d6692ec4247031f26aed3bdc59808a5f929c34dbac3515a8b2a61c59ec118f0e90d12948d22aea40e9f01b1ed782e9dfa5b0263314b967217b2ac4006446c53
 DIST ppxlib-0.24.0.tar.gz 390297 BLAKE2B 7d8972b766cc8104a4d43aebc79e927e51cba114ad678837bfa1b8f009e2437df948c6cd3461db58ef247145e629d3bb11dff58dc5feadefce8152c77b056dfa SHA512 2f6a94c90fd17cea00f3294fde5742637d4758b9f43a021d667f2b09be326954efe22bb188ccf6a7205338ffc75fe096cbe2a075b125e3ced9f829a06ad2f496
-DIST ppxlib-0.28.0.tar.gz 422105 BLAKE2B a88f6c0cba93c880bd3f6e29fdc152e45240a5eb170454ed540c01dc5b88648f1ac71071316f0282bdd4c55cc6bc57e10ac5a7b08004354f50ed0cb2334646bf SHA512 31290cd34f4b306f289b6ef78fbc5907f007c722ffc2cb0682c1944af954f2c6732b236891d1872a22b856d0aee0f7e84d3262ee103aff15d0a4dcd1a20bbfe6
 DIST ppxlib-0.29.0.tar.gz 572842 BLAKE2B e772cfbbc5ff0390b1d256b7671e51aac0c86fe14e912e42fa6f428958d25af09920deae89ba080e37842f21361494237b697abe48dd563df9f69512a4a110ea SHA512 34babcea63b952ca610b5b9841a7d045e3973870014968d5abfff259de8d0f383e79f799fa3522830e0da5a7ff02fa52764b7cad64c8ac0da5a37f8897314c80
 DIST ppxlib-0.29.1.tar.gz 543819 BLAKE2B b0d3920b2aaef887b0120ae66dfa3a0f83d4a4edb237390bddd5206084f77bbd8483d99bc422ce6411a9a1aca7de4fcc5f1f85f9cf46532b7e06c476f2b76b72 SHA512 9bfd52709a63399ff35697b442de6818e2a61b9a2ccf33638f2da6295e3e034e2ae6108a2b8567402e80d928636cdee1572cc14d228a47fbda50625219e411f9
 DIST ppxlib-0.30.0.tar.gz 573753 BLAKE2B f16ba3b01288a535ebf7842d8b9379061cc86cb1bad7841540855508d7d9c10c27e63456d68a16a2408a6eee5cffe82c3c0202ad7894b9fabad8194136762e30 SHA512 a7310c5c0fe76c72984bc6a27648bf12ac83222c029b91a7abf8be13f1950f84de4b24e28f2bb50a6a65c16c9a6bb8c4d3d0596c4b5f7f5bedba87f8ca55a810
-EBUILD ppxlib-0.18.0.ebuild 926 BLAKE2B f8affb8c0961a039d9e560db8ef47c435c0aec44b2a2a349bc40404486245b8ee0b303946646f8116b49d0e568cb8e63a699dc5c4e8c110a87b12e7c781ce742 SHA512 8d901792835259e0a32a3972d7cb9aee21a733131eec117fe9522f56cb8d6fee9674f4f08a5cbd9e0114ea82d7165b81122337b3973aa1c2fc021dd76c5243ea
-EBUILD ppxlib-0.20.0-r1.ebuild 903 BLAKE2B 3b05209a5757214cbbab15bd467eb10296c5de946cba62d760ce70ed9a7800405bb21edf77445f5bdf3184838060076181f86f462659cead6b919f63f6de662d SHA512 52ee5102a39b218b4de7f3466010ee781ee58ac33d636a28e27855bf184b560e34611f4b351b0fdcc92b30ac50a07e263f995f2947fedcc1cdbd8fb56981970f
-EBUILD ppxlib-0.21.0-r3.ebuild 1113 BLAKE2B 864aab6473c4a64d8728216359aaeef62a992bcb018554b67c0d4b3533d7944b25747b9c5b9fc0acaa01b94e9eda886fe086284026068f5762ba60b7afff8704 SHA512 af7c307191efe5f632439867159caabfa3639450cdb7e7861d1bead2d3c6d14278b28118e47e8332a4d56cb78a0839969aa8f68c05d976e1ac164797e29fa017
-EBUILD ppxlib-0.22.0-r3.ebuild 1144 BLAKE2B 8bb514b1d67bf4e2275c398829643eb39b7acfef826920250b0b315fe3b2faef582a8b200e97bffedd5250791d013db002b3400ee25a12f14308e271b1c8fa42 SHA512 ffba32287c1b504d3b556a4c88be356e3371f7bed11b2ba5eca7667f3d8cad22229e2226d791de0422db974411520f7e75cfc4682b831359b91b1b402e63026b
-EBUILD ppxlib-0.22.2-r2.ebuild 1139 BLAKE2B 1d7ddf698f286050c117df27983f431178415b4df6b82a219f1072c14248c93b508a0d7a5b694849f7f7928b64d64dad11401c1bcbcd20fb9b08b8ca824beac0 SHA512 9e7272bd7818913b8f1daa93753effa1b7e32074baa5bc233fa9d3c5202d960eedbb0022f4788efa70db64481b0ff62a1607e8b2fb47a8fa28a1940e15676a2e
-EBUILD ppxlib-0.23.0-r1.ebuild 1011 BLAKE2B 3bfcb9e6ce7f21b2e6dc784dcbcfc297f372232c40c8513460d29306d6976243eebd797a710452ef6c33be71d707b23891126e4275430d26787a8f726a8b1884 SHA512 cc2e0ac82fd5c545f550c1b515ca4a040bf964637d98ee64fae22b405683080e60d9890f193ee8799fea0a9a5098c0ed0671aeb7a31df4c77b65abac84770dd2
-EBUILD ppxlib-0.24.0.ebuild 963 BLAKE2B 71671c594cfe7138204dd9850abc309e66f8d0151dec06b86adad136be09b164c4c4aa767f1115560e9c0b89dd0f8f75a982389fa5ae67cb15d960bfa17b7959 SHA512 c171700b628b46b295cf20f6282870c5f822c0df3e5de30c3835814e01ff184f9807776578fe5f2a2f728e24c39320d0f3e0a80cfbfc318a157452c6a3ed6cca
-EBUILD ppxlib-0.28.0.ebuild 964 BLAKE2B d7e38eb33b23eeafe86d7a7153220a85c021e0739ff51d2a4b3901b5ec0190c24f474140c7f79c19c1301e303a0b81c62e3e651bd7b919e95fe072263bd243ee SHA512 69e3d5bc346878542fdd1dc2e2155cf720e46561106c97441b00c7b23b7e3f6fdccea8556df69c51b263087d83128455940c6b4f3d2c0db2cb15e7350dc51ae4
-EBUILD ppxlib-0.29.0.ebuild 959 BLAKE2B 0ad670b0aab7a3efd0905e135ba76dd0e28b3176a91f26d844151bf30b2df5f6a05630e4a2ce489837437363df3cc93dba618df38767a09be468f1467ead2426 SHA512 c8eedb0a53abc62dd55dcfd90d826bb6387412f2719cd15c9889575f6c0175decfaede78fb9bf9c2ae8c0690451f7492995692fa1eb73bc5e74647e829282cd8
-EBUILD ppxlib-0.29.1.ebuild 963 BLAKE2B 9319ab0a2855aa59bd642591df1e27e511841cf959a886309dca9f6f72c5daa8087617c1e5b6b9ba45704efa2285019c6685cc9c456f8db65ebacb64d3aa83e9 SHA512 73205852d87fa5af2fd488bfd34e207c4fe4c6c32600c21fec8159e496faa9d9167a5ec9eb2bf7793e03aa543ea60c8363ed33f412786e8ebc05fe1c4431c10b
-EBUILD ppxlib-0.30.0.ebuild 959 BLAKE2B 0ad670b0aab7a3efd0905e135ba76dd0e28b3176a91f26d844151bf30b2df5f6a05630e4a2ce489837437363df3cc93dba618df38767a09be468f1467ead2426 SHA512 c8eedb0a53abc62dd55dcfd90d826bb6387412f2719cd15c9889575f6c0175decfaede78fb9bf9c2ae8c0690451f7492995692fa1eb73bc5e74647e829282cd8
+EBUILD ppxlib-0.20.0-r2.ebuild 991 BLAKE2B db21007136ac55ac346a6755d71e007803318efcc15d694f73e3a2e408cf53e6f2be401a3286b29eb088d68d612e0ea4eb4d39d9efe279e304bea3892f8b1d03 SHA512 742a4a23b6ca59d94cccfc516e2e08d8c361deac03edc9c7abf243a46cc2f09bb729bfe1cd9612c128293c89882d355551b02c67bbbaa27c2852c3404a9931f4
+EBUILD ppxlib-0.21.0-r4.ebuild 1201 BLAKE2B 60b95721de47927cc97a3a3e67e6881fe1971e251067d3aff441e7e4e79f91d96e76ee9eaab1fb412ebd1d01d781602ff0fae1449148463d77f9cf58e32368d4 SHA512 a7e1a27bb897c74535401763e6ace249a48716784eea3100d4d71c41b7c5863615cf2494cabc8e21f99de7145dde9fdb21f8bcfcff3a73f2cb84946686659652
+EBUILD ppxlib-0.22.0-r4.ebuild 1232 BLAKE2B b4e1eeafafe967264ab87ea85662080b8f35ca174ce7bff68e774c55e13417f84fa00763292ae0a188460ff2daa161196f40b0a169af2e4b75655d58b7484a28 SHA512 fc34c27c1bbd6018ffb095085f20964716c1259364d243fd37b17514535a4f79d831808ccb91618eec4de23d6ddd4340a2d4bc4a4a02065cca173a3a8eaa5f8d
+EBUILD ppxlib-0.22.2-r3.ebuild 1227 BLAKE2B 0c23c2f667809fcb3f3feb44cf72d3b09044e98305e390813ce4a18e0df279df1d5fbb1b09957b7407743008449be9c583e19f68cc1ed75895ed4106a13d42f0 SHA512 e634a4bc186ba9883753ce2db410d00ede8bd11228182bacad372a62ba82a5ac63be4fe29f0b30e41bfafb9925f70e7d01a989bb4a97ad477ad8aa613990d69e
+EBUILD ppxlib-0.24.0-r1.ebuild 1051 BLAKE2B f9e9cb7fdfb7f86b5c0f7f2af2eb3696878d675bac45af16d22630312fcb304205d85873d1ea36902b5320bbb60a3669a7e0259d125e9885f6777f69f6499251 SHA512 6ae13c82c2a3808b15bc297e4bf217ab3bad283455fe8c1106a69bfca3a7b4fe7f39fe009f81d90ac461a30b5dece0cf75558e1a83cc0d7063ac4486b19aede3
+EBUILD ppxlib-0.29.0-r1.ebuild 1047 BLAKE2B b7ce25b66a98efe1d0740355ea4f831b6bfef2307d961d56f04cf8af0c9e7aeef188c5050a4f7cc43157b289d9fc012a612b664c0385320e5f547d8ebe2eeb1e SHA512 c66e84a4b76485f74cb88b9a83459bdc82ab765fdcf56b782894fc666d2fe22a6c1f90e2b12780e8094c7283e55b14e3093f8fb5a49eee9aa8a8c327752ae5fa
+EBUILD ppxlib-0.29.1-r1.ebuild 1051 BLAKE2B de2741f1b66c82be2517ec3ba0469ef0f6b91849fab1e0fe17e6f5bdbfc14a577da5f6c286d6921b96e950438987cdcb2875ecad8dd345519fb691bc2a3fdf1b SHA512 90aea9cf84d7580c3ef431a39f6bffd3c9408577b35190fe13dfa7a38a01d4712322cd0061d8d3556aa67906b7307008dc5ab7f3f24685a312dd08f9215942fd
+EBUILD ppxlib-0.30.0-r1.ebuild 1047 BLAKE2B b7ce25b66a98efe1d0740355ea4f831b6bfef2307d961d56f04cf8af0c9e7aeef188c5050a4f7cc43157b289d9fc012a612b664c0385320e5f547d8ebe2eeb1e SHA512 c66e84a4b76485f74cb88b9a83459bdc82ab765fdcf56b782894fc666d2fe22a6c1f90e2b12780e8094c7283e55b14e3093f8fb5a49eee9aa8a8c327752ae5fa
 MISC metadata.xml 419 BLAKE2B 97371846a88fb0008519bfb72fff654aa18401b2066073c09099b1987efbb9ad49012c0ab7624218894130a2cda3d5fba6056522eacd30712d08b7784801d9cf SHA512 8dc94b1dd499f7caa3696de963e69063193892dc939609c581fec3b2d93eca4f266e9360cb5144978ba36864d9143b6fb0a1eb0e0ac5061e04b84a68e787a8f7
diff --git a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
deleted file mode 100644
index 2358fdf46446..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/base-0.11.0:=
-	dev-ml/findlib:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/cinaps:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-	>=dev-ml/stdio-0.11.0:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/cinaps
-	)"
diff --git a/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0-r2.ebuild
index 08b8d1a33c8f..15a01ecf7ce7 100644
--- a/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.20.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,14 +21,14 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/base-0.11.0:=
-	dev-ml/findlib:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-	>=dev-ml/stdio-0.11.0:=
+	>=dev-ml/base-0.11.0:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
+	>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ml/cinaps:= )"
diff --git a/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0-r4.ebuild
index d6be89711e15..8957b814656c 100644
--- a/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.21.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,14 +21,14 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/base-0.11.0:=
-	dev-ml/findlib:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-	>=dev-ml/stdio-0.11.0:=
+	>=dev-ml/base-0.11.0:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
+	>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild b/dev-ml/ppxlib/ppxlib-0.22.0-r4.ebuild
index bb3fbecbb17a..ac19e6280bab 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.22.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.22.2-r3.ebuild
index 8457000dbf88..80bdccbf966e 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.22.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
deleted file mode 100644
index 5cb0b9a5899a..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
-		dev-ml/cinaps:=
-		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
-	)
-"
-BDEPEND=">=dev-ml/dune-2.8"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-ocaml-4.13.patch
-)
diff --git a/dev-ml/ppxlib/ppxlib-0.24.0.ebuild b/dev-ml/ppxlib/ppxlib-0.24.0-r1.ebuild
index dbf7db057beb..f15f96e90ae0 100644
--- a/dev-ml/ppxlib/ppxlib-0.24.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.24.0-r1.ebuild
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.28.0.ebuild b/dev-ml/ppxlib/ppxlib-0.28.0.ebuild
deleted file mode 100644
index 5dcf6f546bc2..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.28.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
-		dev-ml/cinaps:=
-		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
-	)
-"
-BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.30.0.ebuild b/dev-ml/ppxlib/ppxlib-0.29.0-r1.ebuild
index e5e3edc8b4a1..7e0d07cf07ad 100644
--- a/dev-ml/ppxlib/ppxlib-0.30.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.29.0-r1.ebuild
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.29.1.ebuild b/dev-ml/ppxlib/ppxlib-0.29.1-r1.ebuild
index 9dee33ce54c6..ba772d5ce6a8 100644
--- a/dev-ml/ppxlib/ppxlib-0.29.1.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.29.1-r1.ebuild
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.29.0.ebuild b/dev-ml/ppxlib/ppxlib-0.30.0-r1.ebuild
index e5e3edc8b4a1..7e0d07cf07ad 100644
--- a/dev-ml/ppxlib/ppxlib-0.29.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.30.0-r1.ebuild
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index 39a0bdebb6a4..56de7e580f8d 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1,9 +1,7 @@
 DIST sexplib-0.14.0.tar.gz 54055 BLAKE2B d0ee1470fb9d28eb6d6ed3aaf0f6bd63d7c4860183ac287054f08bc54d57d0c52ebf9fe516aa991d8c66967ecc6ad95b6a6d19eb40a9f610a6f91f832d9d2e20 SHA512 e77a9ae8991e6b73de57ab6b7068d6482471dd34ff0af23b93b5ba57bd69493d15db3279d3b328280f716e531c08c2a6c39bfaa886f1934240dcc13724673684
-DIST sexplib-0.15.0.tar.gz 55020 BLAKE2B 250d2d791abab87e18ad363dc2140d436cec90469156c2bd37d3de533dd219891bdc5e518d1a37eb8ee4e34f1ec5e924684f1408487d3080c5cfe4a0f32e2d69 SHA512 c31fed5e5bf48381a9b6a48085e7d8909471e38a8cc7586e3c520fe60c6df7a1eebcca1a0ca93cd4d1cc61c1c3c36211db05572273550f7218eb69dd97d27333
 DIST sexplib-0.15.1.tar.gz 55000 BLAKE2B 8f93590ad1cf5fc8286a3a99711d977d36e875e531ec2149fcfebda5d95aa42f29bd0efb16073a71effd854265f15b303291c9d17f848a9fdd3dcc174baed912 SHA512 05a1cbca244286020af6c5ba1d92b32f5d7940dc409c61a8fc5ff114bec60167c8381ae997b53998ea3c0d5167ee77bf160873958512199b06efec1a2a191a7b
 DIST sexplib-0.16.0.tar.gz 55015 BLAKE2B 3d4157cfc0e5906a351c0a04380582895544f95c9ad88e576764967c46614c0553b606064eab75a8561c59a9fcb353ae695f743e0eda1a61a4c66a57b24f51e3 SHA512 f924d92ddf11f12be51073a3dfca45486d90b05533f29804518ee86b93386b8ff8d7e692c71d77b11347b78e9f6f6dcf7d79b71540efe54b013fa09b3bab414a
-EBUILD sexplib-0.14.0.ebuild 566 BLAKE2B 3a525f96c1003b7ce00f0dc9e3cd8b64bdab635f6ef906e36df3d2eaf3e6d3bacd152f5cb626302d4d5daf43dc0870456e0b4044a63410f9a0ae66783bcf32cb SHA512 91bc3f706b183a780d0885f3db9e6eb4119fa3fda7d5347eecd86d428e931f1f74590ef2fd103b3dc90c0f98931e026250cf10f9a75ad306d0a2f238cc55689e
-EBUILD sexplib-0.15.0-r3.ebuild 583 BLAKE2B 168b0b3027148d3d92a5aec9aa1c6fa3548fbdfa76474466f8837117bfd87bee76ed63167c14dcea5b6658c00c384f8b3c0c5758b594f5acce22c2660b412a02 SHA512 439987b6f8628ffaefa1fdafa96e89b26708deb9125d8af58aa67390f46bcd0245574c875d387e3d88b9ea011d72f224100d7063e247768b11fd972c6185d3e4
-EBUILD sexplib-0.15.1-r1.ebuild 578 BLAKE2B 3178e4c20e9ae657a47808a8e283dd1d72fef74b4f44e8a463e59ec4c5535348321f5853c3b8f6f2f9a6d7ade5200c67cc61da3da5393e8c3c66f0f1d28c29b8 SHA512 e9380be142c9d15bc47805713a7153b8ec1189ad46741e5ecdba2bf3aaa8bba93f93fc463730e29a335b8f98599ccd410ae0f1164af4b5c996678badf672dfb1
-EBUILD sexplib-0.16.0.ebuild 585 BLAKE2B b67bb6ef2f832ef13e13cc762939257e327cbe9556cf91fb2f1a87c011dabc0ad4a54c9d21f23935f22b3f4ac3931a60c7eac5c6319023e68fb75b464311dd6f SHA512 de99de2461067ad024eb4f2eba85dbb6c2c4884f1ddc8994faa70a1cb763124d153f87083e65eae4b2601cec48c913b907e73716677848ca7264b45fbafb0482
+EBUILD sexplib-0.14.0-r1.ebuild 610 BLAKE2B 7cf36d737be73681ee103eaca7d9f3ee7ca405ed99e6cba8a4b39053bb54fb01f733b1e2d0b6c3abdb569dd74b81cf431251e607cb10aa6c376b638182c565ed SHA512 7d5a603cea8737727374fe04ec4c4cef436c23ee6bce3bbb21b2df30235732881e0492e4e3188094058be12747d7e8d8cdb97b9a00142939ca1316dc4c3540e4
+EBUILD sexplib-0.15.1-r2.ebuild 622 BLAKE2B e01bd46b5be4d7648652a01af86b88346ed3e0cf8a62dec16d233e7eb6d9ec5c8d9756cf5f661d73853169862cfe14bdb1f7904a277f8c56e243206a2c93fbb4 SHA512 0408cdc6ee8db39cfec2de4c8903ee81b7255a1eee25a0f70a0a969575d3c4d92435774bad92d3a9ade646c47e801ffe013570e0c2ea267901f0a637860065cf
+EBUILD sexplib-0.16.0-r1.ebuild 629 BLAKE2B 7180479a03856cb7ca5a5850ff51d6966b70f907365e2438a9926b174a0ef3e3bdeed2ddea9f2a5f2069b3f9a99a090184e077ecac61645e8b36745e75cc5528 SHA512 5feef99854a045c02f22c484a3de20789e37a4dc8378402f213acd01d404d31fb1f29893dfd71146187239fce9185f1cee93f850e59c253e7b4651f4b7c87c47
 MISC metadata.xml 482 BLAKE2B cc8a4f1df9d0f76967f46c4e50af6a3355c99ab0138c3e804b60cc97f456e151431f80da3fbc8ee16d832da7fc529b8d06019f1b0613bf4c4ebaef7200f02d35 SHA512 32f96513ff47e289bb41c5864ff462d60f849c79bfbb796ec59ecb2aa4bfb82e14b32bc7caf1c05d333d963f723d99fd324c12aaeaedaf8f552e1800feac7254
diff --git a/dev-ml/sexplib/sexplib-0.14.0.ebuild b/dev-ml/sexplib/sexplib-0.14.0-r1.ebuild
index 97e96b2bc2d8..4d2035d59c64 100644
--- a/dev-ml/sexplib/sexplib-0.14.0.ebuild
+++ b/dev-ml/sexplib/sexplib-0.14.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,9 +15,9 @@ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	=dev-ml/parsexp-0.14*:=
-	dev-ml/base:=
-	dev-ml/sexplib0:0/0.14.0
-	dev-ml/num:=
+	=dev-ml/parsexp-0.14*:=[ocamlopt?]
+	dev-ml/base:=[ocamlopt?]
+	dev-ml/sexplib0:0/0.14.0[ocamlopt?]
+	dev-ml/num:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/sexplib/sexplib-0.15.1-r1.ebuild b/dev-ml/sexplib/sexplib-0.15.1-r2.ebuild
index d417cdafe060..bd09e3007d8e 100644
--- a/dev-ml/sexplib/sexplib-0.15.1-r1.ebuild
+++ b/dev-ml/sexplib/sexplib-0.15.1-r2.ebuild
@@ -15,9 +15,9 @@ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/parsexp:0/0.15
-	dev-ml/base:0/0.15
-	=dev-ml/sexplib0-0.15*:=
-	dev-ml/num:=
+	dev-ml/parsexp:0/0.15[ocamlopt?]
+	dev-ml/base:0/0.15[ocamlopt?]
+	=dev-ml/sexplib0-0.15*:=[ocamlopt?]
+	dev-ml/num:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/sexplib/sexplib-0.15.0-r3.ebuild b/dev-ml/sexplib/sexplib-0.16.0-r1.ebuild
index 816994bc0032..c8f4857f46ed 100644
--- a/dev-ml/sexplib/sexplib-0.15.0-r3.ebuild
+++ b/dev-ml/sexplib/sexplib-0.16.0-r1.ebuild
@@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/parsexp:0/0.15
-	dev-ml/base:0/0.15
-	=dev-ml/sexplib0-0.15*:=
-	dev-ml/num:=
+	=dev-ml/sexplib0-0.16*:=[ocamlopt?]
+	dev-ml/base:${SLOT}[ocamlopt?]
+	dev-ml/num:=[ocamlopt?]
+	dev-ml/parsexp:${SLOT}[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/sexplib/sexplib-0.16.0.ebuild b/dev-ml/sexplib/sexplib-0.16.0.ebuild
deleted file mode 100644
index 28348bdf23ac..000000000000
--- a/dev-ml/sexplib/sexplib-0.16.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
-HOMEPAGE="https://github.com/janestreet/sexplib"
-SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	=dev-ml/sexplib0-0.16*:=
-	dev-ml/base:${SLOT}
-	dev-ml/num:=
-	dev-ml/parsexp:${SLOT}
-"
-DEPEND="${RDEPEND}"