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

12 files changed, 76 insertions, 201 deletions

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.29.0.ebuild b/dev-ml/ppxlib/ppxlib-0.29.0-r1.ebuild
index e5e3edc8b4a1..7e0d07cf07ad 100644
--- a/dev-ml/ppxlib/ppxlib-0.29.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.30.0.ebuild b/dev-ml/ppxlib/ppxlib-0.30.0-r1.ebuild
index e5e3edc8b4a1..7e0d07cf07ad 100644
--- a/dev-ml/ppxlib/ppxlib-0.30.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"