gentoo resync : 31.05.2021

16 files changed, 138 insertions, 24 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 0f305909b026..a7d100eab543 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest
index 0bbcfced7736..a00cc9f8804e 100644
--- a/dev-ml/integers/Manifest
+++ b/dev-ml/integers/Manifest
@@ -1,3 +1,3 @@
 DIST integers-0.4.0.tar.gz 9980 BLAKE2B ee67c39024d77f4ce20e9ba7e1564b3418397f1e98b9a5f30e238f5c161d7572701e3d824871b46d15b90887d5f3983a9ab440f46e22c4de8cbc68912daea5eb SHA512 73af64654579b27db18c612229044dba094064dc7d36a73f42ffd4ba7040ed326f859f588e7a764bce3b2fd6e9365f9e9f99330ef29bafbe77ca6dcb53d5ed79
-EBUILD integers-0.4.0.ebuild 475 BLAKE2B f1288c7b71549228345994d826a2f6973d88e46b5a99a6c115314b06a6b85de04c5c426c03f1e7c76f98b75f8223a71cec1276e3c74762419db212649e312b35 SHA512 583e6daef600004bc0a516ceb736dba1c96e2af8d17d92323980fd0151a5a2c574ab01cd8080be3cc18d2e3a45334be41784b7f0d03174b167a884010c356eeb
+EBUILD integers-0.4.0.ebuild 443 BLAKE2B 2825cc12c8d0ece3c63802e946ff57445bb02b2dd7b702a808bac7331e341bf5b729175f90266db6cfa99341f08925665d904e03324d5e9b44e5a165bab6be13 SHA512 c25a789f367e1080897a3ea998eac8304932968c6ca130580ec3232d2fad98a2b0b479b7bdbffbd46290611baa82e6c6688349c10bfa8d5ef14e564b7155ae4f
 MISC metadata.xml 333 BLAKE2B 47fde1e3ad5ef5a0645e960c712e37f7bc4c5083b26932697e02c29cd1797c2fa986b98a51571a98e4f66d8559a252e5f03f43a2ecc95caf02df24d1fc74e80f SHA512 47a5112e4bbd899580c7e40fc0af2fa20fdf836f211452d15c2c5a70b3fb126689d0e1c51093ca3a472621c38e32cb15c02da9bbdc25aae48c78317a0ccf11f5
diff --git a/dev-ml/integers/integers-0.4.0.ebuild b/dev-ml/integers/integers-0.4.0.ebuild
index fb25c4b284b8..11bdf517c4df 100644
--- a/dev-ml/integers/integers-0.4.0.ebuild
+++ b/dev-ml/integers/integers-0.4.0.ebuild
@@ -8,12 +8,9 @@ inherit dune
 DESCRIPTION="Various signed and unsigned integer types for OCaml"
 HOMEPAGE="https://github.com/ocamllabs/ocaml-integers"
 SRC_URI="https://github.com/ocamllabs/ocaml-integers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ocaml-${P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="+ocamlopt"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/ocaml-${P}"
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 8566557b5c70..9b7b0c1f1552 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -3,4 +3,4 @@ DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837ee
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
 EBUILD labltk-8.06.7.ebuild 992 BLAKE2B 67153839b68d13cfdbe8eab47a10c65d03beefbcc08b27edeb9d75c144ef563787978037e6a7a52f6c50707d0ecc52e77c29fe3de509bd19d8c670e4cc82344a SHA512 181baa5df2eada2fb0768691bdf37a2b18e91633e99b529205477310d8eed23a9fd35250aa19ae2e849a09b3ba660483911cc3a3aa60f862f3105ab7e0a1c417
 EBUILD labltk-8.06.9.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/labltk/metadata.xml b/dev-ml/labltk/metadata.xml
index 6f49eba8f496..9f27ba42c7de 100644
--- a/dev-ml/labltk/metadata.xml
+++ b/dev-ml/labltk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index cdc4acec09e6..f3f69ecb8e74 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,9 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
+DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 EBUILD llvm-ocaml-10.0.1.ebuild 2991 BLAKE2B 8f6847347faf4ba2afd66e3b2f8052b27662a9db05ca3d03e5c1ba44ce77ef9731dca1632e21a5bda21ae963531d85db9633f92c33bb9713e0a4b9fdf19ea775 SHA512 2d43e10b0a15ea9b438f93a15bf32575e2d111eea1954c8c36f7ce949774055ee720d448cfd7e08a7627539ca8095d81c8f65e69de926475b8f40d5dbcc75db0
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
-EBUILD llvm-ocaml-12.0.0.9999.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
 EBUILD llvm-ocaml-12.0.0.ebuild 3059 BLAKE2B a3a9b1a45127499e7212d30ce699c7a23229895e0e4ac14fe5f9e02d1bd401350b6f419eada422cf66f9301dc180d16ad126e43267a4ef7db797eab184dc7eb5 SHA512 2208b0de0343ae1d33385226eef2e5bef2185a3799a30ea74094c5b004d7b9d7f97f73a97191f46ecc6d3be5b05d647300e0eab5ee5b4649051a98135b2bfa91
+EBUILD llvm-ocaml-12.0.1.9999.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
+EBUILD llvm-ocaml-12.0.1_rc1.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
 EBUILD llvm-ocaml-13.0.0.9999.ebuild 3048 BLAKE2B 7be8fdfb701b0d1ac20c3fe032d49602394008b102101846bfcf751161fb239c5ef17f37005449ad7cb86095cbf872ca98083800aa216eac98d0af488f4e334e SHA512 bb86ebc2b8d8dd2c3656bbe339f690eaa6b5c8faad7ccebe0fbae48924a96619bccdeaf56805f8d3a0927f38b9228506a60ddab4a2c2ddd50d78e3f78cbd2ed7
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.1.9999.ebuild
index 3fc4ee845be9..3fc4ee845be9 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.1.9999.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.1_rc1.ebuild
new file mode 100644
index 000000000000..3fc4ee845be9
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.1_rc1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit2 )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} 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}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# 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/mmap/Manifest b/dev-ml/mmap/Manifest
index 56792f0753f3..db79a639bc0c 100644
--- a/dev-ml/mmap/Manifest
+++ b/dev-ml/mmap/Manifest
@@ -1,3 +1,3 @@
 DIST mmap-v1.1.0.tbz 12312 BLAKE2B 3f688f5649ef51fc2a0cee76519da46dcfecd72a065de3cdc72412e27bfa39c26c6bb54d35ea6e3b139db0ccc75e9460f8285826c40ecc894a3782f279366686 SHA512 15e4ec2634998f321f495de5372dc75a3f4059ab7512115603ae8fd99a619c91299d34c8a12a697aa36df4ce14c90c66746b873eddf004b7bbbeaef8ec7858f5
-EBUILD mmap-1.1.0.ebuild 433 BLAKE2B da6ae263bd8e1e2d8ee85806e5c3f22a1a5930f21db68d33c5f1174de5894be85f8ddeb3d60fcd6e3b961e62c4b829a11d22ed65f9ebc95f173f12b413e10127 SHA512 43886545270a5ba6c49e02637de7ad8ca836c4ddf4d497599deece33a8c680ef0b24e3db2080f15b41a98c6a53df2a08ee9ecb56b663136624facd9de3c88821
+EBUILD mmap-1.1.0.ebuild 401 BLAKE2B cbbcbf2fee055f0441237bafe471be02cb01f342526888e1728ac901fa05f59b95fa2c7c5a0face7f41bae4bfa39983a96c2e42414904c4eaced91d4246d8ff9 SHA512 951b36665d454144e047e35fb2841f960bdf84dbe1b1864498cbaa13df7a36c9d9e017f8f9788b34ebd1e5453c4e7d8effe78e96d4bd96eb6beaae63c6dd688f
 MISC metadata.xml 320 BLAKE2B 670840e5fb0d98728ec1abc313a4a454d0a9ee0cef86380461ffd0c60721a98bc8ea831a2bd53345427483b61c056fda5e37ca33ff6ff6741a4276947e06216a SHA512 3e740c72a5216b56f5e8c960355ff9cc21a045a5bb1cee1cf35df835ca755ac507e88adc5d2d405e13e9487d8934de926ac595624d60a98440caa0e8167e82e0
diff --git a/dev-ml/mmap/mmap-1.1.0.ebuild b/dev-ml/mmap/mmap-1.1.0.ebuild
index 629ff88e7786..601b9f2d4357 100644
--- a/dev-ml/mmap/mmap-1.1.0.ebuild
+++ b/dev-ml/mmap/mmap-1.1.0.ebuild
@@ -14,7 +14,4 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
 S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index 84442d437114..ee0342273388 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89
-EBUILD ocaml-compiler-libs-0.12.3.ebuild 505 BLAKE2B 2990a1048ef8cdfcd44cefd46bf9630a0d5fb3d21ef459ca2cf360554f8956766f246c3f471de7fd3cebee5b8612849c665f7757f1aa1ea6be4f6b943877acb7 SHA512 1443215b8d99bf719b2f524bd56df14b32142b4f92bf995b502417b54177f72f00fb395900b9fa2b0e9de2c5e0748f6a0b15df122906862d86938584c021575b
+EBUILD ocaml-compiler-libs-0.12.3.ebuild 473 BLAKE2B ce4a65bac57a4ff76e7fe11e70f3262f649583a0f15bd6bef73fc4459e3f35d45e664ec0b7bd8b9511a93f5e24fb61c2f4bfa277f51b7369f40170e345ca655b SHA512 3889faea6798a6e3849747a6f2255acbc400dabb2bfb30a41cb77c9da49280ce67b1c7876102c1f7fbbb17c1959787c8184b3707f48ab1830906a74344de2616
 MISC metadata.xml 339 BLAKE2B a88542e3c94246704d78ae7795166cee13f24054bb39450b2c1b7f3c499514e67fcf38421100c96ca597115bf354a1e20290d22d57fa9313bfb6279020c2758e SHA512 5480f0fa988de348557ae888609a48a083798d9d4decb57e6b29c3789e83b4900a663ba15ef9cbf3c2574404046e4b1101026369355db6cdfdda8291a1eca0e5
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
index 3b6b4bb2a868..ce40ed8ba22c 100644
--- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
@@ -13,6 +13,3 @@ LICENSE="Apache-2.0"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/ppx_derivers/Manifest b/dev-ml/ppx_derivers/Manifest
index 30b0e14a7b12..3b5b0eb0df08 100644
--- a/dev-ml/ppx_derivers/Manifest
+++ b/dev-ml/ppx_derivers/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_derivers-1.2.1.tar.gz 2530 BLAKE2B d0a8a214e93908cfff1d418fe1b729a7ca502fb6dc983d3a837f6846aec891627457df72a610736d929c83622202bd5a00451c1c24510a642b4c133ce60416b8 SHA512 ef0796fe2592e653d34ba01d206d4b507429882a2aaadcb89c7f807c33a417f2871b0c94ade5c92aefd9487daa582e19d88ad5a5eaa631e8162ae12f4a0756c6
-EBUILD ppx_derivers-1.2.1.ebuild 428 BLAKE2B e3ec4723270dda6963d1dd01d7fefbaec0cd09aad905b89a37d3f884a19a4949eec059f30864aaf242dc72f1993b31982c2dd9f32bb7eee27ad48a5a9bd64f4f SHA512 d04ca2ee4daff170978c15c7431d6021015358723027f39112f5a33857fdb28a9a93bd4b2571841c2ce0c088eb4d7652ecf59b858e42ef9d964e075cf8731472
+EBUILD ppx_derivers-1.2.1.ebuild 396 BLAKE2B ef87f4a30faedb991a3478378d354baec5dc217fa7f895043b4d3fa75da8bae73d84151564782810075113990580bb612a82feb6405c9516aaf1afad3e00e891 SHA512 6102f188918aa0936cc996d2655a694a081390c6e3952dc605fad07de9495fb2d51e5d953c55b654722782a0736c75e47413a7fad855dcb73105246012eabec8
 MISC metadata.xml 326 BLAKE2B 47cfaf71bd6893debdbaf5f5e59316247e5b632f98b755711420d3159f171922d5b781778f9ea3a78d015d59eac44b8a1cfd956e6d30b7910e59c5d7fbb30312 SHA512 e9c22d0a8e279dd6345c197c5db53869f2a9cb33f2039812cfdc93e3c7c90f4b6cb4a83ab9d0b822bbd12f86d01474aa3b65e5d6b19e55a51e869d2d10e5fefe
diff --git a/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
index 523205c4a2da..f6afd3577412 100644
--- a/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
+++ b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
@@ -13,6 +13,3 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/sexplib0/Manifest b/dev-ml/sexplib0/Manifest
index 05ed312f98e2..236bbc9ebf9a 100644
--- a/dev-ml/sexplib0/Manifest
+++ b/dev-ml/sexplib0/Manifest
@@ -1,3 +1,3 @@
 DIST sexplib0-0.14.0.tar.gz 17677 BLAKE2B bf906491cd8c8021b6737fa6a9510ad7421a01c448bd1e136cd7244eaeb27674a4c3e739be601a66b1f23a2f6dd2f19771b66fde88a2f3e75e24111ae5ace3e5 SHA512 cfffb390809a1ed3b99d3326a7c5035e2fedf7af084d94f6c0cff98ba641056b5b2896d56d32b1b27bdde29b199bbd32d174cdee84c2e1541cb7f2e4bf00e4ed
-EBUILD sexplib0-0.14.0.ebuild 479 BLAKE2B cb66fe87f84a2b13e4a93cd1c393d09cb59c0431000e0b302c5cb8c0fda6be1c3eb77eeb214a292ecaa8944d4bbb7924da1be6e8bba112ecc0e2755c7e98ab88 SHA512 3c107e459850ad277eeb064c4302a543d5d75849e40a762b2247eaf47af0eb4e8bec54693eaf7640596b3c4bebd19624a776c720038d779c70de4d43fd2c28df
+EBUILD sexplib0-0.14.0.ebuild 447 BLAKE2B b3a6a9ccdad2040bea509028d932ecb08f2574d1803e4db95577022764b88ce38a880ab4520e010aefcdad7ac6fb4fe605ac27b92a17cfc31d852dd0338b744a SHA512 f79aeba57b401d6a60e82b838a7149c88409cfedd848e917ed8d2e7a1c673e2179cbd740bbd4aff7ec70090ab8124e9c82d0d92fe7cfc0f2dab5170a84857322
 MISC metadata.xml 328 BLAKE2B ae60ce4e068ae91b8aed0a8c363395843f666cbe8cc102cd612847db1023829d2cfe8ee0651a5082790ee86c900f5f2e67b3288d4be3057e498c1a1f88fcd528 SHA512 e042bc403d3684f026b5d8413dd73b176c661bf636c88319167336f3b0d6303cdc690459fb326d40c6ef6abe8e4a769e7a2cdf33ae85b197241668f0cac05854
diff --git a/dev-ml/sexplib0/sexplib0-0.14.0.ebuild b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
index 9b306a168349..94dff0f07211 100644
--- a/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
+++ b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
@@ -13,6 +13,3 @@ LICENSE="Apache-2.0"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"