gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /dev-ml
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
65 files changed, 80 insertions, 1124 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 40847b139e0e..38ce002ed14a 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/biniou/Manifest b/dev-ml/biniou/Manifest
index abe417b122de..1f8f2efc89f8 100644
--- a/dev-ml/biniou/Manifest
+++ b/dev-ml/biniou/Manifest
@@ -1,9 +1,3 @@
-DIST biniou-1.0.12.tar.gz 24262 BLAKE2B c7dd3ff0d7cf47f7c464cf379fa1ac84e11c284399730c55d803d0da1e5c10ed0b974b51705d22e0a29513bf7a4774139720aacd7094a52685b6d7bc17067ad8 SHA512 df729e4064f6726efa409ceb5e6ff1987923d9cd28339d6e1c4c185a07c0738b027cafba33a139483eeb8f88e58f66fbb6a57d8e748e7355073a7622fb4d7a07
-DIST biniou-1.0.13.tar.gz 24327 BLAKE2B 19a69665805b917c9bc02ad459c8a98b8cb64f707f3664e863d5315fd1444e0cb5545549220494dab136287cf4f8ffab8d5246a2068bb154c2ea10553b63737d SHA512 2fe109e83260f546181dd26ea175d2c4f63d0f6604c6d26fa44ee31925ba1fdaac0139a436cd0271a31294de9cd8ea65f8dde0981403c652d31de721ef696788
-DIST biniou-1.1.0.tar.gz 23432 BLAKE2B 601e160c828c32f520c7cd18d5b3ca1abfe629dcb53250d83e9dc658dacafcb7f54296b5c9604dc38b8a95acbaf64d79d283d82fe345391e593023d7dfbc2933 SHA512 755e3dcfe2a967c08b86db5a7dc917f75713611f5deb64b4fe3499aecf8e698813a1d0620eb78aa1e77c404719936c5ef5088c0c394c02fc2d7fe2629e985669
 DIST biniou-1.2.0.tar.gz 23611 BLAKE2B 01f5afada666d23b74f31cf12b5f578f3622c85311d7a1b6eb319843beac4c3ebe8e8e314a47ec14ee0ef6f5c1a5b6dd849dcf24b0c3cc8a38ca6a54d89e4c4d SHA512 04c04c2dd5e3e1237106db257567ba6900bd94759b07b02ba2e0d9209d1bbdc9ed629864e06d44a8b61f72d46fbcc7a0ffc86f82feb223d9d99ca41afc625fab
-EBUILD biniou-1.0.12.ebuild 677 BLAKE2B f801ddbd349f5e051babbd7dcdafcc61495829fa36815c62139537616b0a6ba2520d32a11ae33b29e17676968cec4c68eac0ab727ba63b21d294e891692f85c3 SHA512 e91e497852f5137da68d66231278788935070dbce74391d5f88458c72e2f7d78e3d77db5a79678eddd3edfedda11f6e1629061c0f810d87decc101421a0654a5
-EBUILD biniou-1.0.13.ebuild 677 BLAKE2B a4a411760d10d59f4fd13ea058ac5c13d0b5207d080634a93d4c891f04602ddb0c6e5235426b4edf71a868c9a85f2ff4f3ffaefc5a1ec6b43f9755830ad29c88 SHA512 7da0d42ff932c302a3d6e37626fcee4d352604769d7cff94734084318c208aebb753b4911cb142f421c12ae8c6417368bd15e729c1dafa288043b00b3f2fbce8
-EBUILD biniou-1.1.0.ebuild 732 BLAKE2B f64f5a8ad8cf933c1866426cb035f52e0f61a43177dd00cb73b5ba427374cf08ed458421c2300b536892dfd04090227133d53abd3e7b345bf1c20ef56298ec5d SHA512 911cd2d6d7b53d34b9907b83b32b0824f3708d4dfa5a53fb3ec666efc91c089ac5b0fb8956e735e8f05e5be3991217c03c35f9e9fef45fb680dca54d3d4a7f84
 EBUILD biniou-1.2.0.ebuild 732 BLAKE2B f64f5a8ad8cf933c1866426cb035f52e0f61a43177dd00cb73b5ba427374cf08ed458421c2300b536892dfd04090227133d53abd3e7b345bf1c20ef56298ec5d SHA512 911cd2d6d7b53d34b9907b83b32b0824f3708d4dfa5a53fb3ec666efc91c089ac5b0fb8956e735e8f05e5be3991217c03c35f9e9fef45fb680dca54d3d4a7f84
 MISC metadata.xml 246 BLAKE2B 293edb7a04720164c7fe980b83a53e65fa0537bf20ee28f065f980b1a474ff468f2b7c4adb14c80b691080a801bbbc9095cb24fa4102ce10d57b0ac47d67ffa7 SHA512 d922d11e07aa5d95318b09b38f66979151ae05272a7f202e87a03ebc7df9fd985468cfdac2188e04b27e31a69c03d63b59f2682374430ad3d0dbdc7c909a2e1c
diff --git a/dev-ml/biniou/biniou-1.0.12.ebuild b/dev-ml/biniou/biniou-1.0.12.ebuild
deleted file mode 100644
index 81346198c7f1..000000000000
--- a/dev-ml/biniou/biniou-1.0.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
-HOMEPAGE="https://github.com/mjambon/biniou"
-SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
-	dev-ml/easy-format:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake all
-	use ocamlopt && emake opt
-}
-
-src_install() {
-	use ocamlopt && dodir /usr/bin
-	findlib_src_install BINDIR="${ED}"/usr/bin
-	dodoc README.md Changes
-}
diff --git a/dev-ml/biniou/biniou-1.0.13.ebuild b/dev-ml/biniou/biniou-1.0.13.ebuild
deleted file mode 100644
index 221435a17637..000000000000
--- a/dev-ml/biniou/biniou-1.0.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
-HOMEPAGE="https://github.com/mjambon/biniou"
-SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
-	dev-ml/easy-format:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake all
-	use ocamlopt && emake opt
-}
-
-src_install() {
-	use ocamlopt && dodir /usr/bin
-	findlib_src_install BINDIR="${ED}"/usr/bin
-	dodoc README.md Changes
-}
diff --git a/dev-ml/biniou/biniou-1.1.0.ebuild b/dev-ml/biniou/biniou-1.1.0.ebuild
deleted file mode 100644
index 6a9705355a2a..000000000000
--- a/dev-ml/biniou/biniou-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
-HOMEPAGE="https://github.com/mjambon/biniou"
-SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
-	dev-ml/easy-format:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/opam
-"
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		${PN}.install || die
-}
diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
index 252bd9f18b36..70fc63a89309 100644
--- a/dev-ml/cairo-ocaml/Manifest
+++ b/dev-ml/cairo-ocaml/Manifest
@@ -4,6 +4,6 @@ AUX 0003-Fix-FTBFS-on-bytecode-architectures.patch 1135 BLAKE2B 90847d27617c1c63
 AUX 0004-no-automagic.patch 1041 BLAKE2B 8cc95aabf25e768cbb03ea608b74a45aa36f7e86f72da7875bb19973512165a1e6ece9f80093ec887e49ffdbd86df23ae585317d2f65b791c186335b86fc2b50 SHA512 53bfa4cbc40b3725fa40454fb6e8521f21aaf61135dd6da1ec9fd3f1df256ceec1901022aa70dabd568c0291e37008b7c122d1d654856a13fe632f3bf2c271b8
 AUX ocaml406.patch 830 BLAKE2B 662bc72ae0f51e6b6b11a475930847fb18a34c1a812c758b0d00fe156a0b1872dd0eb3d590a3be744ef7c4231aa637571631f0d3d61e9401a1b2164a8434e6ac SHA512 d2fc42aaaac76311cc78ee5c53df6e4c029534f424430465f18acb57988169ea240af2c1d08d84fefd5c8e64e5342e8e721e72eab2e1cf240507fcf0324aff72
 DIST cairo-ocaml-1.2.0.tar.bz2 44483 BLAKE2B 49a8c811100e3167a8c32ca87a0a6c256862d276c3703082b944aa55f8def7b56d478c0ed44b9d7f5de9194603b688daa5e42949db00417b71daa7376e17410b SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4
-EBUILD cairo-ocaml-1.2.0-r1.ebuild 1952 BLAKE2B bfcd8312395d9f90f096d9caae515a772bcc9919ae0b8445ec4200d6dd3fe61cf435a5d28170f5f72135d0b6c2dad8bf66203f0a50c68425e733e5a0b3c8d8a3 SHA512 b0d0c3a46db06aee8b1ddfe94643fa22888bee2a1a5c85cef24c4536c81880d38f82fdcd7194ca482e9f4aafe9f2a351573f976264b08a46de75c3e84b2dae82
+EBUILD cairo-ocaml-1.2.0-r1.ebuild 1951 BLAKE2B f2f5d85f5ca53294fefcaad7ea08c45a3b6926ed3484a6cdfd9da01ec6d8f9cb57e8de938004b44ac9306959cf2e15649773ba93d5241150f957c72b0d24396f SHA512 05a793768810c7a114f73672e1e7a58f384c1a0a834e588700878eb41d989d50276ed822775d72dd3904a001be3ca192fbc8b86bfd6e305e5a8b604e5e225780
 EBUILD cairo-ocaml-1.2.0.ebuild 1896 BLAKE2B 50549894df7f733d386d7611fa9adde2325e20acb0731adc5b1eb760c385f6292acb0ffefabcd2a0bece62c7de481997fb1dd937f68fdc216d90b92319f5dfe3 SHA512 b1ce1ed398e94271e9a608b1abd3d3be2543065111c1d6826e19db71022f3b898de1c97d524884a460de9ba841b4c7074f68561d353c5142cb2bb7b83d569707
 MISC metadata.xml 572 BLAKE2B 55d9ae52f939a260daa0e05c073fb0e574a44383414e04274d58ded73bc68ae6713039ed1f51998a307c166313d93755066a9d06f7fea3525a154de856854ad0 SHA512 7ca7f4c88e7343d1ac5acbacef33cde7a437c5e70df3bede08ee893c7bea317b444585f4d4e9e010509b2ebae9586bbe5d94a5229f656b6ce996cabb895a60d2
diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
index 1a9969c60bee..19eead630c6c 100644
--- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
+++ b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cgit.freedesktop.org/cairo-ocaml/snapshot/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gtk pango"
 
 RDEPEND="dev-lang/ocaml:=
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index 79663b93b1fe..8cfaa03d56e5 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -3,5 +3,5 @@ DIST cppo-1.5.0.tar.gz 26963 BLAKE2B 4118637bd8bcfc2edae4c7bf0d839b82ba3402c2f4d
 DIST cppo-1.6.6.tar.gz 28667 BLAKE2B 57510ff824265065d4c4ba7d3da4b9aea389e005de4f2e73c1b43b230082872be0118e0b40d6c2951d4017210522a06eb089ab5cbb18fb48d29b87736fa59055 SHA512 80b0d7a5f0f5b7d9d62ddfb204ebf5e3216c2926ba7f667b9ef10981de6a51cd6d670b7062769bf6fbdd163c1c8fb5426a74c31234ddc03ec94a75645bf469da
 EBUILD cppo-1.4.1.ebuild 695 BLAKE2B c7dc10a7114ce9b7ada88cca2e5364c7cee6e045001ce27c7c1dc0c0b9bb7ed1bbff96e17125d20d12da189b819f01bb0e6e35f996cb404d2ec51e294c9ea5ff SHA512 2848f76920077d4ebd0ea45fcb12328357d01ff1e4cfd96a2f748a996b940e4b31b910b4f76aed984db211592e19b5ef642fb9f1246d7041197e6b7eeec23bd5
 EBUILD cppo-1.5.0.ebuild 999 BLAKE2B 00c8f29088141900ed6606151fd1bfad75ad0ba17511fce651bcb24f8b7db5922554b40ecc7c9c96642e07532680511628aab81949de3ddd480b7942ec0521b6 SHA512 58870cc7de903b2951df2ca9535775c7b3c021880997f57f50dbc0104c1086de872f4cf86e008c104379b672d7893ee626c8891efffccaa43ab75ad61042b504
-EBUILD cppo-1.6.6.ebuild 497 BLAKE2B 579e2d339de1786e0defba300c0d30dece96d21d44fe813f9e121f480c2186bf4aee4d845ad3fc0a17178b071cff217fb58023beae8418f6f0a0b62a6c84c545 SHA512 e6ad33b04604b17c1684568ef1d8676ab1ac813b0b5db8bf4bfc620d6c2d18b6b6bf653c80a7363b560b6b3cbeedf93d42dc35e84dd5d1f1ecf60f6a888f1573
+EBUILD cppo-1.6.6.ebuild 495 BLAKE2B bf485604d6a8875dfd6248274645cf1b9d7da5b798567fa84dcde24998db237d4508f910d73c673577dd9bf035e9571899790745e6d261537c9ea3dca1e076c9 SHA512 26c4a9391eeeec71df98f28bb5d0f6cf75c71216878cf35675ab07d537128c4d1c56a9d0dda21f1d881f8a4ad58cd1fb79437cda8a3096a9ba25aeb0b89256db
 MISC metadata.xml 329 BLAKE2B db38b8af799a1c79d09897a4b45d36bd7924ceb8d9d1875e2ebc91b293d9cb03bef31992be9eef9cdef96d543b78fd3410da4cea94e32767888120a8da4e6bcf SHA512 5ac7d5d1a4e3c856de0b3ffe653fab70e88fbacdf3925ce1a357d77e84d30d627632b5266093dc79b548cc4aa507b58ef22311c36403fa6f4a11bb83b8a3935a
diff --git a/dev-ml/cppo/cppo-1.6.6.ebuild b/dev-ml/cppo/cppo-1.6.6.ebuild
index 9abdedf45cf1..320c0464d7fa 100644
--- a/dev-ml/cppo/cppo-1.6.6.ebuild
+++ b/dev-ml/cppo/cppo-1.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.t
 
 SLOT="0/${PV}"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 
 IUSE="+ocamlopt"
 
diff --git a/dev-ml/csv/Manifest b/dev-ml/csv/Manifest
index cdcd38297b0f..83a4a4f5bb59 100644
--- a/dev-ml/csv/Manifest
+++ b/dev-ml/csv/Manifest
@@ -1,7 +1,3 @@
-DIST csv-1.5.tar.gz 83642 BLAKE2B e07303a4be8c4e75964b4ecc38da59de288e12b433ecb4a5d5450b21411b2343b38853cdf2737516185867d2f3963cc374c9ec34df96332b5844bbd850fb7c89 SHA512 1c8af0ce8abd8a5710115c194eee34928399964447309ee974665cf427396def42bca4f983904bfec706f7944aea419a87bf54bc6c379cb8b7372be801be4126
-DIST csv-1.6.tar.gz 98194 BLAKE2B 1c7975ec92bcd63cdeee369e8a3507b6ef95cf646cba2f5498983a18098f8147a26d7ae57a37904a3f1cc21085e7f2f2ffc9ec7bca836d6edc31a45d2de4c0a3 SHA512 689dae2dd57ec914ca1dd5e3d34ebd352aabb7d5da8933aa6c6fc9c6ec84dc538d1df8a1c46f3e172ab09e5917e9158be76afb2423ec8a92eef489ac5dfd5175
 DIST csv-1.7.tar.gz 45160 BLAKE2B 2f51f927d9099382a227e20471e60075f8796d7753152e266c121f705e4dab7036659937630302f152cd8f28d6db1aee3d5c72c339a45477292ee03c4bc461ab SHA512 cbe3d316e6f99318b3958bbfba3308225e709afb481a333d314adb66c20683171c23ac0565fc8d8e936b9dad13b9330b5208340b9fc671b4ccddf3a7d8b82b3e
-EBUILD csv-1.5.ebuild 517 BLAKE2B d03abc8fea95c38094dca18547eb57c188378a45250529cd0073e9dba05e39ce04617e8bb3e264b6cfce7d2d76386173ba83e61ad3754231e056337e3b1227a7 SHA512 cfcd84f23bd246fc5e225dbf02d81b1ef091f1af8e193689ec07bf69fed40585a81a4f4b97a72f91ee2246c37ea823a5be4ddeb002ef4564a5e6b51631677de9
-EBUILD csv-1.6.ebuild 629 BLAKE2B b0262894ce7b05662b24293efcb2cfb420d8afd820467669cb8d8677680f01a023645ffa680e4283af463cc599c838ba15d206c5044cc6ae658a0d1b50e3e012 SHA512 03093fca7d3c1e1d0391c4365cae27c2f68e4f12b86a625d426ec8112f5e44485adba2b3c332f6afc57c7b92c3c717e83aa4e261b3c659dcc9e3c22e7c8e1580
 EBUILD csv-1.7.ebuild 737 BLAKE2B 5a7e4901f97dff8c2f4c5d25b8ecc6b872bde2c5e57302a726820a7cb7bd8bc86975ee4a541dc6a4ec550e4d7ff89a27e490b59523468797d61f3630abe871bd SHA512 20e561d88b7598be72c68870d38fc16b73d41f8c56563bd906917e4f5683d3880976ac35bd873c8082664c75b0959ad485676b8030aca822c528be3ed75d9598
 MISC metadata.xml 349 BLAKE2B 1e8e0b12edc39e2e71831655c46dc0a197cca25030b60a61600a021f0c1228a0bc7afb4829afc48c9ac874ac5730d2d59b4c1a29cbb4c95a4551e0ed828bd266 SHA512 143b12e66cad9bf4c9586e9c7a95743522291d8d99c1880b9ef580b4dfbdbe9b6ca81ec15694de5c764348a42a6f193ca9b499c8e6a43ccf3a4c4ca05dcd3011
diff --git a/dev-ml/csv/csv-1.5.ebuild b/dev-ml/csv/csv-1.5.ebuild
deleted file mode 100644
index 29be7c1a8b6c..000000000000
--- a/dev-ml/csv/csv-1.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="A pure OCaml library to read and write CSV files"
-HOMEPAGE="https://github.com/Chris00/ocaml-csv"
-SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-DOCS=( "README.txt" "AUTHORS.txt" )
diff --git a/dev-ml/csv/csv-1.6.ebuild b/dev-ml/csv/csv-1.6.ebuild
deleted file mode 100644
index 1d0efd903991..000000000000
--- a/dev-ml/csv/csv-1.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="A pure OCaml library to read and write CSV files"
-HOMEPAGE="https://github.com/Chris00/ocaml-csv"
-SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+lwt"
-
-DEPEND="lwt? ( dev-ml/lwt:= )"
-RDEPEND="${DEPEND}"
-
-DOCS=( "README.txt" "AUTHORS.txt" )
-
-src_configure() {
-	oasis_configure_opts="$(use_enable lwt)" \
-		oasis_src_configure
-}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 0d6468e54bb2..2fc56835df3d 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,5 +1,5 @@
 DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 EBUILD dune-2.1.0.ebuild 684 BLAKE2B 4b50322912687fb84f6636dddde7a61b89c4147a9a92c8bb03619adab13a23098473380076e84c2e1e5ed5c8f7c8250ee21c4ffc749433847216c272270a5756 SHA512 e9543ae6e8e26cea642dd709242076b6860ac584df7fdd005bc73fa441b551f566f64611008bad1d9875b2c09c5e941c71eb08df158d8e0a0359d8e7cb889b4c
-EBUILD dune-2.7.1.ebuild 757 BLAKE2B 8ed26b2b82bbca95ec0410ffe888e83edcb8efe7e12d04939ee231293c11703cd7178e6016c1a5593b2036d842765752e1df8574474132facc7129531b80a414 SHA512 5c1ca1ef3971b5efbb5c58dc96427ec8cb6e08ab953342b36c31d15f1d599d0400b42fc3cc1b670758da6a9b10dd1dc6687b1068cd005e3b711c6f00357c05ec
+EBUILD dune-2.7.1.ebuild 755 BLAKE2B 70fa67419edd45e0409bce5eb0d19d61ab7bc063d291d39db6c1e52b602a9f08736bfa8ae3ba1ad9c2ce28d3601257b47f1426378f0089c4f52faf43bf5642ce SHA512 a49efae0cebe240a57210f3c2a62cd6425f86da71cfe9b81676a18f93dfd245bdca6ffcd98aba37fb5663aeeaa46e33b6598063622da23dd16090b5e610a5ddf
 MISC metadata.xml 319 BLAKE2B 65741bb0181ac6f6fb28019dc60386a5d47a2071131d8496adb14af1eff40000b59b2410acdf8ffa14fd4ad1d0bd6efacc1c67f68c162ed10e847a00db457aaf SHA512 8178e2c48fdd360ab7860dde1666bd2d0d0223f51275c58005aaab2d14946d4bb1e1e6be55a74d98afd6ef0acac515e2ebd0f7f44adbc9d2d7efbfcde641bd65
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
index c66681198140..36da8ec6f77d 100644
--- a/dev-ml/dune/dune-2.7.1.ebuild
+++ b/dev-ml/dune/dune-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 
 DEPEND="dev-lang/ocaml"
diff --git a/dev-ml/easy-format/Manifest b/dev-ml/easy-format/Manifest
index 99e97e9a7f2d..0b34515988b9 100644
--- a/dev-ml/easy-format/Manifest
+++ b/dev-ml/easy-format/Manifest
@@ -1,5 +1,3 @@
-DIST easy-format-1.0.2.tar.gz 13679 BLAKE2B 5f738e521ef8eb59edbcba92f599328ab6f5e497075d8144335191835906832ecb4e4a8c6233c65f6f7aa7c4105aadd1dc1e269ad59a2c3237c54af8b3856e41 SHA512 bb12c13b33a725f4a15616672f7a268398b50e6f054575203f1d26c49aa04978564233fa9fb88eec8b701d7fecbbaeda264422e8c31a60a52d0d8e64bfc5898f
 DIST easy-format-1.2.0.tar.gz 15632 BLAKE2B 0bf20b87050330e90f3ef5cbe47470049ddc470d22357240f6b0ddd75138d3297935306c071e4355f02ed2fdd01a3155461e90a91df1346fa33180833db77b57 SHA512 375849b1ecd2e37f4b32d1ee12197a95856b17a47e3eb06a7e7320a82234c241156c3c8bfb18ce17bbe73b93d31d755675478860505470aa7ab866277a99603f
-EBUILD easy-format-1.0.2.ebuild 634 BLAKE2B d97bb030ba1a078ad8b8398de74cb20a20c566eeef1c38435487df3dfb4a64bae60db26877215d989d8192c6bc8ce14cd375e13f714aa54f54f9028e33188609 SHA512 7b317147f087ed422fd6c138ed281da1317eaf8d00be1b2e17208e451907736629f43ca72c7908112f24611878dadacc934138420355dc4d62568f7a24507e66
 EBUILD easy-format-1.2.0.ebuild 667 BLAKE2B 29a46d20176330c80d0d9bf7132bec4eec2ce7c0bf54f0eb41759336aa0737b00b7fd0ea737154f20058eb5dfb443aedfd15c38e5b1b198bbf3ce51870625f80 SHA512 f21275174e49404dcccef768d41925edf46040147a246760e12fe851444d1ec75117d83d62b499100306a96eb0ddffe37c6d3f6f9f9c8cd171790bd388540559
 MISC metadata.xml 251 BLAKE2B 74ebf46bc822086f29fdbc1ed4b4ba867ef18b43a8d0cddd7d12d8af90eae16f1ebcd58d6aec1c6787fde89b239805fce3453a655a967f71ba7bdf076f94b57e SHA512 d66a84be5f4853c868e485056636f04c4f6db8aaf57c0d4050239f2b6b10c88ecd8f0076043ca4603dc72c834d6cb656eeb3a963e62bed03b63ed2ead2d7a972
diff --git a/dev-ml/easy-format/easy-format-1.0.2.ebuild b/dev-ml/easy-format/easy-format-1.0.2.ebuild
deleted file mode 100644
index db163f33fd49..000000000000
--- a/dev-ml/easy-format/easy-format-1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Pretty-printing library for OCaml"
-HOMEPAGE="http://mjambon.com/easy-format.html"
-SRC_URI="http://mjambon.com/releases/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-
-IUSE="examples +ocamlopt"
-
-RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake all
-	use ocamlopt && emake opt
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.md Changes
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 7591a676d56d..e3cdc4516522 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,11 +1,9 @@
 AUX extlib-1.7.7-no-git.patch 283 BLAKE2B 2cfc23016472905c9dfb28615bce04d607a70b99da69f1ed198c8cfdd677c1dd3d8b8a6756328bf35dbd59f81c7be143a5f5864110adca56cbc2dce8384d597d SHA512 b0b04d0fb6af94d7f54751fd00ab48101fb45d47e2230358edc956fd4d6fe04ce59b8aa6857fc1b07bb544fdade01eca6213de064c7d54b59f02e8265aebfb05
 AUX ocaml405.patch 1539 BLAKE2B d61c8398986a66664810684870351856ca94318a82d07194908c570aefc9b2b3196b95f651717b058e95b853e1862c3a27218afa71a809f766b908cde3e9cece SHA512 664c9b840b77d08095e03dbd398f6af3118237fbffe73499bc2b0ee0dc8e40311337e65f3e0e95b2f87dddb9e75b18d27d2b712b314f725d97fd537f2ca23e52
 DIST extlib-1.7.1.tar.gz 85397 BLAKE2B f2e924f651cc43ca29914c95400a26bfd062ecb4e7379d169533d394497215906b56e8f57ba29358965f0b8c125c33dcb9a0a95c09488404fd348261d075457f SHA512 42ea1be22a57ab31e5857df0c4c0f98a07e1b5958b34181cd5ab7c83ded112c208315d22cd3dd178d53e75ca109a70cb47ae479e95be8c47ea2087b1a158dc4d
-DIST extlib-1.7.2.tar.gz 85934 BLAKE2B fab7f5f99be414a83f46144bc8f2f54aeb545ef9041b62f227f9dafd267a3f8608b94388ffc39903b069ec7d481b4da8a6a2e9aa289c68263613cf64aa6a45e0 SHA512 d9f34f5bbd5e94a8dccc5bdbc1ec0e5015608675469c4f513461fa587a5eb7e1398542388fd885d7656591ca85ce30c0e2a9ee26b9722a9dd65189aac35d64ed
 DIST extlib-1.7.6.tar.gz 88068 BLAKE2B 32376c09728ec7e7d762888ad706641b94bcc976f2e1f42f246ba79fe862b60df7ff924e1e22e89333d8f2e1d999deb71eee481c3c5919aa5d1e02731f64f323 SHA512 3065e2474fb0e480ed076aa1156584a4a6c839cd5d9e59f341e41113abb1736241354aa7ee7cb492967698bc392969522fd5bf30d1ad7f94754c4e10f376afa8
 DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5
 EBUILD extlib-1.7.1.ebuild 887 BLAKE2B b557faaae9bcde92b59e99bc5a38d864131c23ab11f76b4351d12efb6a4c6c982047205ed093dc4dc764279318acfe2c85af89dda7000c93b61bb34eef21f879 SHA512 fcdc98d7e67b566ccf1c37c87eb8f155bf07295ef2c446012919765b8838bc933e5aae030b7f8d820fb7422dddf1c61901ff1cb71655a4fc81d2c76761580e45
-EBUILD extlib-1.7.2.ebuild 836 BLAKE2B c28451604b7317f492deebaf48a52198eb80f1d2602fcbe3803371b419fa6e593710dafaf7a863ff642117941ea6c853d2a98a552eefbb0b9260ad0d91876753 SHA512 2886cdd93555e6bf52bc2bca917d420da8cf0e04dfbe52aacdd87080d3d1e72d16f0d822bcfeb36d89f7a2405fc5006962d1a67085b09d30b4a0012ddab4b4c3
 EBUILD extlib-1.7.6.ebuild 844 BLAKE2B 1aac975321754c837889f58a9899ad546ed04790bfe697aad4e65058a85d6c47ed997f5f72fc4e13064635bc4acf4e4a6ad07fce00e32080b4e6176b7080fe31 SHA512 57c1ac05e1456012a35518ad52709e806052e4cd06b22c150852cd8fb7113b1a1504c9fd18add5f1cd366966b040bf298d7ae75ffa74eb3ea2494342cb3f5887
-EBUILD extlib-1.7.7.ebuild 977 BLAKE2B 76b981e3a62136a75ba6766dd451eb9d0455f1c4d2b589d19ff390581ef631112f65b3b100b06e8cdc5197091a1f785ea4da75f79f7635c8b2dc709f336d4700 SHA512 49481d39ddb6392173c13a21e32a8b28b0c5ae8e38419cd661d51930e98f1bc4834ce3d6bae29bf33f4fbc3f13bf102d1e15f9d90cf37b92b2bac32ff7103776
+EBUILD extlib-1.7.7.ebuild 975 BLAKE2B 444b1f422390cc7b2d13a2023ca0b68fc029e73b7829542434d0add44711be0eee321fabaa7f064829ca13dfbbf5d264046e8cabe4e43b9094dfd1065bc53ddc SHA512 20d8f8b27d6e25d0f19d432e27f07f950c5689bc69ea745257eec47eea4527d144227435e1b659bbc7b80b26967aecec6194e38491ba6516a3f425981fa1aa94
 MISC metadata.xml 384 BLAKE2B 5cf5e456304e88b37a2a9635fecaa5536bb2bd58eda884676f93545969a3361eee4a0c94750352eef6fc7c63117391f58fb4a8bb9eec18ea8eb3dfb3c2f017de SHA512 88ad9b420b173c120be33305275c08becbce8c8490421cafffc1ba64131b27ebd88cfb8b1951d2e780c9eb93b45c38f9de83f2a134812edc38103e28f05f5f05
diff --git a/dev-ml/extlib/extlib-1.7.2.ebuild b/dev-ml/extlib/extlib-1.7.2.ebuild
deleted file mode 100644
index 87f06dc98481..000000000000
--- a/dev-ml/extlib/extlib-1.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="Standard library extensions for O'Caml"
-HOMEPAGE="https://github.com/ygrek/ocaml-extlib"
-SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-DEPEND="
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	dev-ml/cppo:=
-"
-RDEPEND="${DEPEND}"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc +ocamlopt"
-S="${WORKDIR}/ocaml-${P}"
-
-src_compile() {
-	cd src
-	emake -j1 all
-	if use ocamlopt; then
-		emake opt cmxs
-	fi
-
-	if use doc; then
-		emake doc
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-
-	# install documentation
-	dodoc README.md
-
-	if use doc; then
-		dohtml src/doc/*
-	fi
-}
diff --git a/dev-ml/extlib/extlib-1.7.7.ebuild b/dev-ml/extlib/extlib-1.7.7.ebuild
index d7b78f03ebe2..008178d6306b 100644
--- a/dev-ml/extlib/extlib-1.7.7.ebuild
+++ b/dev-ml/extlib/extlib-1.7.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index d164822ea909..8e023fa8d803 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -3,6 +3,6 @@ AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813
 AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.8.1-r1.ebuild 1672 BLAKE2B 13c847cab7bbb9b4d3fb748e4d1150ed6c4e28337e4234a155b411fa10665c1ff741663089a6bb9369797e8b96bb554fbc82ceb55a57d5497eba5bf96c059351 SHA512 6a71a4b101c6787060cb9413e8a02f40fa62b0a0780fa91e64eb59badd03b3b3f1e043dd52482150e88409046a5d8da421f306d91f3d7fa64fa2e4087e994865
+EBUILD findlib-1.8.1-r1.ebuild 1668 BLAKE2B 84307716d465e5d10b0df3f37ddd5a7533dd07bce02827d7c5fa2fafd1be51d26be90f4cccb78c1add70d00865fd812380a7cacd9445973ee7695f2272ed212e SHA512 e94c9836cb19b1eb59b33f7570b9104d697d73ca6af00d3a0986f7823ca726cc6106bf6f124aa9955e283bc9810ad85f32186345357f03438936f6d54323ca59
 EBUILD findlib-1.8.1.ebuild 1681 BLAKE2B 3e4cca14ddb76b0dc5dcc5f2d94ca4bf4b7e8cdd26696a5b104434195a2b73fb43bcf27338ac7444a4d80ce58cf868d3d309bf1fca59b54d4b30aa398e27a9d4 SHA512 f2de64a87a1f859c2840a849246934052baad12cce4708eb592d63df20915569a6f69c87b9936c3951b2c856d42e50ab3ade8f2182197deb9631be14150e0862
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
index 1799cc090907..6880e1c5c7a4 100644
--- a/dev-ml/findlib/findlib-1.8.1-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest
index 50f9e2c4d217..b3b12a757d3d 100644
--- a/dev-ml/iTeML/Manifest
+++ b/dev-ml/iTeML/Manifest
@@ -1,7 +1,3 @@
-DIST iTeML-2.5.tar.gz 33750 BLAKE2B 362dcbd0a2e44842832ec5e2307eb2f291013344e80b791f1e2c3e5ffc43633f67c7e736ad3a6545197467700d043649080b5f8889b55e460748f769ca7f404b SHA512 b8a2f842f0076bdf3f30a71983f686b931ac3f7fde73ad83041dae1d33d8bca2c7695b71dcc53ef942fbdee7422e2e4d22994f69b70d54e2b4d62bc1c64395c9
-DIST iTeML-2.6.tar.gz 34822 BLAKE2B feb7a1d7973f1710b245cb5d859d443b4c30a6128137523659768864cdd23eb18606a2b6d418d9fb37784bf2fe53fc45a4558e1565186e2402574df560a4afc5 SHA512 6c42856d8a8d6b9e76002fe94e4be0db2a108c4a033fd3d19849772a6c1db9b792beb960b0ac02973d40dc9dda4c4cf5ba13ae9f05534798cc3ccc283f8d3567
 DIST iTeML-2.7.tar.gz 34866 BLAKE2B c3d2df6901ca1c5a804b8e5becf2960f6de10a0edc88fab86fadd39ec25d35143d5ccb3765a1bb5e4d55f28d1dc8942085b964b343dc1f8622ea4438b842e9a6 SHA512 477b55332ab4f733bb225fb15741e5129314fc857900715851027b132fd87f169f8d402987762bd9a07e0a644b1d2bbd49e2f21de7cc23edbe89ff8b3f2bda65
-EBUILD iTeML-2.5.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
-EBUILD iTeML-2.6.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
 EBUILD iTeML-2.7.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
 MISC metadata.xml 256 BLAKE2B 09b9dfc51aa2ff66b4244c86b7fdccb3a6eb2a84e5f4f57d304b977d4c192ecf2f7c088eba60fae1bd3b7cda7ebb7c233684eefa11a531cb4641b23799142f51 SHA512 50e99c06648a84ac4e070680dfbe717e801f0b4f89e26517bd202e36b0d62cb9ff1fa13caa5a049ae32ee765a57e72f9f896a63006b959dbbcbfb4e23ab32da7
diff --git a/dev-ml/iTeML/iTeML-2.5.ebuild b/dev-ml/iTeML/iTeML-2.5.ebuild
deleted file mode 100644
index 7047a3ea4d8d..000000000000
--- a/dev-ml/iTeML/iTeML-2.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Inline (Unit) Tests for OCaml"
-HOMEPAGE="https://github.com/vincent-hugot/iTeML"
-SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/ounit:=
-	dev-lang/ocaml:=[ocamlopt]
-	>=dev-ml/qcheck-0.5:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-"
-
-src_install() {
-	findlib_src_preinst
-	dodir /usr/bin
-	emake BIN="${ED}/usr/bin/" install
-	dodoc README.adoc HOWTO.adoc
-}
diff --git a/dev-ml/iTeML/iTeML-2.6.ebuild b/dev-ml/iTeML/iTeML-2.6.ebuild
deleted file mode 100644
index 7047a3ea4d8d..000000000000
--- a/dev-ml/iTeML/iTeML-2.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Inline (Unit) Tests for OCaml"
-HOMEPAGE="https://github.com/vincent-hugot/iTeML"
-SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/ounit:=
-	dev-lang/ocaml:=[ocamlopt]
-	>=dev-ml/qcheck-0.5:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-"
-
-src_install() {
-	findlib_src_preinst
-	dodir /usr/bin
-	emake BIN="${ED}/usr/bin/" install
-	dodoc README.adoc HOWTO.adoc
-}
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 268135d1d015..44305e3bed33 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,11 +1,11 @@
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
+DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
-EBUILD llvm-ocaml-10.0.1.ebuild 2960 BLAKE2B bf67406bf61b50af82f34276f7bfa6abe0bf809656e2addcc51efb7c1be5d4137462c9108239eea5f273a0e68f26c3300b3d2cc3cfe9df0c8555926e481fe231 SHA512 05e79634eb5e5ba38e0b0638a9627b7c8b38dfc7c685eaed8571283ed7791eb5d0ae2f6333cddf9b1f0f19b47e6d0e4c10444a4bc8bcdb69ce7061b25440a1b3
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 3006 BLAKE2B 49ae9a36e5a8720945e225659420e22500d8231fcf2f0316437c33198c9aed7645e985c2c938cddb642bad34514f14d9dda6b7fbf1bf1e64f385a0769f527b03 SHA512 466eeba3ebc984efe34cf45386c67a48808e8eb629e2a555feb6994e74a83af6e0f097e21d6370e37339f24f37102b16dcbf2467516aaa39483a9f22ec997a04
-EBUILD llvm-ocaml-11.0.0.ebuild 3022 BLAKE2B 679d74e8ed16e3cc87396d3e4da97bfbddf353629854abcd537f9da30aa132d5c434aecbee6014547bb55541e84abff5459da083620e637b90339fe031733844 SHA512 ee373b66833f1e77bb29d9ccaa841229e9b78617bd155c671d6c9b96dec3a3973260df58f8b1c0f71f1d3a726bb8fc41f1efa966bedab84644aef27284c65873
-EBUILD llvm-ocaml-12.0.0.9999.ebuild 3011 BLAKE2B 00b8106524fda983dcc03bd0642f506c618e76534f8547b2c92814db9f57502e08c48e329cfec204e1988bd80668b2f7483b2493f85e648f1b942a464853035b SHA512 090967b0e335031c2a91a27bdedec2ddd2cb5120934839b87f92586c72f831a780a05414f15076f71f7a317d907f50d2617677bb0b654fa15e2a58db2d2a310b
-EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
+EBUILD llvm-ocaml-10.0.1.ebuild 2990 BLAKE2B 3993630867acb739d621fa701f83e4c8ddbc44cb9b77e9c9ff1cbd173c18c894836a9eeb2aa2d9182fbed3e05af2d3cf180a535d27c74de4dd2f87afdadc8f99 SHA512 a6444d4877fc671390b0396f04a770363a5be803afa4f657c61bfb0449fa0aa8b68960f4be1ab6061d9c44f69d4130a64c6a4dff1d76e1896919ae2e59ec30d6
+EBUILD llvm-ocaml-11.0.0.ebuild 3052 BLAKE2B 9697dc5b6c2365415dd405b00c913606055d56366ef7710e559611c1bcd1b955777ae4d7836b75a49635bf5132feaf423af9ec7b033e34eb40864a6ecbed3c28 SHA512 855bcfbb8198e815c7d89dfed959fe95d78221eec20a6512c9190eb9e3d9c7b3ebada04a85ccf4653cf9e8e89e318b5339113b92afc1f99d8cd19ffd17c22dd5
+EBUILD llvm-ocaml-11.0.1.9999.ebuild 3037 BLAKE2B 4f8b569495b3248f95e3e363b7bcde257d28d7160be55500aca8dc5160937956ec52b3b3e0eb83bd98d50ebfd04117112c5eecf5afce6e5fb30873aa834f4b06 SHA512 3107f267f868c1420f2bad3a4b27e5f9863fbfa23f9548e568a82fd414ca64d5f1491d26e153dd2a2c11fc840051073f4892ef9056ab977c16ccc7afd436bbe2
+EBUILD llvm-ocaml-11.0.1_rc1.ebuild 3037 BLAKE2B 4f8b569495b3248f95e3e363b7bcde257d28d7160be55500aca8dc5160937956ec52b3b3e0eb83bd98d50ebfd04117112c5eecf5afce6e5fb30873aa834f4b06 SHA512 3107f267f868c1420f2bad3a4b27e5f9863fbfa23f9548e568a82fd414ca64d5f1491d26e153dd2a2c11fc840051073f4892ef9056ab977c16ccc7afd436bbe2
+EBUILD llvm-ocaml-12.0.0.9999.ebuild 3042 BLAKE2B bd3be02016d1136e2f87dd8da51ff1815f9edc633c1c109ddf108f53d1aaa68ad9af967261ffab5836eb96911071525f20741841e45fada95b6edeb1ce1adc54 SHA512 7610604754b5cd6be108c532b211532a30fb3320216ac7f9042673b50c2411058532d01166610f049f7ecbda6ea45fb495841ce0b4d1b58d14690473d347d206
+EBUILD llvm-ocaml-9.0.1.ebuild 2952 BLAKE2B d0a7879b89bddff51521378d5cf96626b2bad80f35bae6b0026a51806fdc47139049b23a6ded6f64ce9161b1951341ec71e496a9b094e4b3aa1ca8c44e626cbb SHA512 f1937a057dd79a8fcb5ff587520199941d22e5d4ef18be5f5cc7c854e9d42e32beac3101f37897dd1ea32ef6a38a232685a11bee4b2cc83dfedbec3b5e08c75d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild
index f945eb117105..c9f95c843aa6 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild
@@ -17,7 +17,6 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM 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_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
@@ -29,8 +28,14 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	~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
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
index 317ad24d0e20..425c6b247335 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.ebuild
@@ -17,7 +17,6 @@ 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_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
@@ -29,8 +28,14 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	~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
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.9999.ebuild
index a39cfca35bc6..40fb0676b744 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.9999.ebuild
@@ -8,8 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
@@ -17,7 +15,6 @@ 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_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
@@ -29,8 +26,14 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	~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
@@ -39,6 +42,9 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc1.ebuild
index 5e415032b502..40fb0676b744 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc1.ebuild
@@ -3,25 +3,22 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC 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_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS=""
 IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
@@ -29,30 +26,30 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	~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/ounit )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
 
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -79,6 +76,8 @@ src_configure() {
 
 		-DLLVM_HOST_TRIPLE="${CHOST}"
 
+		-DPython3_EXECUTABLE="${PYTHON}"
+
 		# disable go bindings
 		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
 
@@ -86,13 +85,13 @@ src_configure() {
 	)
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-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-utils_src_configure
+	cmake_src_configure
 
 	local llvm_libdir=$(llvm-config --libdir)
 	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
@@ -108,13 +107,13 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile ocaml_all
+	cmake_build ocaml_all
 }
 
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-llvm-bindings-ocaml
+	cmake_build check-llvm-bindings-ocaml
 }
 
 src_install() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
index 3ded7e4e44fb..7f6ae880e2cb 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
@@ -8,8 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
@@ -17,7 +15,6 @@ 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_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
@@ -29,8 +26,14 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	~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
@@ -39,6 +42,9 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
index 2d7234b60384..f6d102ad555c 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
@@ -15,7 +15,6 @@ llvm.org_set_globals
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
 	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
@@ -27,8 +26,14 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	~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
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index 740547c9f57a..ad08ab9e4ea0 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,8 +1,4 @@
 AUX lwt-5.3.0-ppxlib-0.18.0.patch 13548 BLAKE2B fa89411ea65421eb8f8b7f7f782817c27f21d88a12a95a6a8a9d858c6e6665d2a79432ec237daf77d594ba11e4ef1e71921779084055e8df695b696f81b6ce06 SHA512 cd5dc33e0b3366445ce491efda7ff55fcf7f628138fc8213dfa8a7d425d44fd7b312d9008ff1bad5216bb8179bc0e41e5844d1826237c3c26f657d7ec5410671
-DIST lwt-3.0.0.tar.gz 285864 BLAKE2B d14f8f8a9e71a61c57bd7c208575849667dab4a4770b56a0d94e93024b22be9b7d88d10c0fa24eb8060b67c75e72c2c8bbfa0362f3aa815c76c93575225ce056 SHA512 270a6dc2fc58950380eecf72767782c72a5d72226f4af0e9a4f9b0e70b788eeb1d2727348ab8da4411ee59374a19524a6a793b14a26fe7051d51f987ef0e42b8
-DIST lwt-3.1.0.tar.gz 285309 BLAKE2B ffc3a416491d4c7b7e7c0da67b48d9eeb5b7fa50e3637d4f0cfcd1689b75626b48c8dd6d91e87c93022047809a3774683c41ce620e07ee4d3e1409185e7f8d16 SHA512 0b2269e53f2e8a57e1ffd6f237c6b22de39a3b6b0d57276c7cb9371392aabc9fb6364b2617a6408ed0049ed64f71de0c540209cf83ce43899fd025295342eb0d
 DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6
-EBUILD lwt-3.0.0.ebuild 868 BLAKE2B baea13b202122c9d836d6e86eb814f46b3009b6d5f04b1648a958bf05cac881ca5e45316613b987f3e44e21f04f4366e74489e6bec6403e9a89c7d4cbacf5a4b SHA512 e803b0f9b9d97209a68cbed575b3b8b7bdd7031839e74f1ebd78c16c4729c10df202cc1e54d3291e977c093a11927a5049696897c84055e89dd267124b610971
-EBUILD lwt-3.1.0.ebuild 1194 BLAKE2B a1ab34b8cdb6dd4ce5d859363505c885df31da5e4999269d6d7f695ef2e5612acabd9c4d6203aac550ab7614773e82f579333385621b95f79fa71d69078649e7 SHA512 b974e3c33bc9b63b15929bde88a2ad34d50048a14d9a8437180752355d43ef6fb38f62fc006f0c46b3001ca9dd4a8bab79c2fbea883876b15dea36b40298224f
 EBUILD lwt-5.3.0-r1.ebuild 804 BLAKE2B 35260bf4191d222cd53fdf530ff198a9168ad901f6af4ed43e896e32ac8afcd499021fda7e87f0e83bf66d48d89ae7c12b2595e4b92dba6dd077d893cdaf9d9a SHA512 cb3171bd8b8b5e1e9fec7eea46d2b05385feaffdf8b32f65fc9a67940973ea88336ca304d900a8b8cad6b704d386ca52d7f1ecf4426dab7e4ee6c78d85d51394
-MISC metadata.xml 534 BLAKE2B 04d77728a82e759ba24f80a4d02c289da849979c93fc6af3d60824eba4a18fb53eae33a4e5c33a6c4c0cd2ce0bc1d325bf86bca38f6f5cc4ffc4c339db6f3de8 SHA512 eb3f2fe064427ae98a683d5508134fafe1364a172cfef215a886209c3b6967f4e575a14e00ea8c93efcb20e742f0312780397cdf99eb56ec151ae30c50f0a072
+MISC metadata.xml 320 BLAKE2B 30af4a959e49cc4dedde3ee8144ebcc7358c245d0f66d18ada370d682d4b4c971c7c3c4d15e0f796aae6ff13a923e18017058bfdd73db6974973b88447311b26 SHA512 02ebc0a053f10df606e161ccb91804c8e3bc9ea34cd7c24158820aa31689f12d8297df58f56b8bb24d23e7cd89b87a198ca726130a2021163b59198e8f3ff135
diff --git a/dev-ml/lwt/lwt-3.0.0.ebuild b/dev-ml/lwt/lwt-3.0.0.ebuild
deleted file mode 100644
index 5b3a44a3d1b7..000000000000
--- a/dev-ml/lwt/lwt-3.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Cooperative light-weight thread library for OCaml"
-SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://ocsigen.org/lwt"
-
-IUSE="+camlp4 +ppx"
-
-DEPEND="
-	dev-libs/libev
-	>=dev-lang/ocaml-4.02:=
-	dev-ml/result:=
-	ppx? ( dev-ml/ppx_tools:= )
-	camlp4? ( dev-ml/camlp4:= )"
-
-RDEPEND="${DEPEND}
-	!<www-servers/ocsigen-1.1"
-DEPEND="${DEPEND}
-	dev-ml/cppo"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-DOCS=( "CHANGES" "README.md" )
-
-src_configure() {
-	oasis_configure_opts="
-		--disable-glib
-		--disable-react
-		--disable-ssl
-		$(use_enable camlp4)
-		$(use_enable ppx)" \
-		oasis_src_configure
-}
diff --git a/dev-ml/lwt/lwt-3.1.0.ebuild b/dev-ml/lwt/lwt-3.1.0.ebuild
deleted file mode 100644
index 58c19493d7b8..000000000000
--- a/dev-ml/lwt/lwt-3.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Cooperative light-weight thread library for OCaml"
-SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://ocsigen.org/lwt"
-
-IUSE="+camlp4 +libev"
-
-DEPEND="
-	>=dev-lang/ocaml-4.02:=
-	dev-ml/result:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_tools_versioned:=
-	libev? ( dev-libs/libev )
-	camlp4? ( dev-ml/camlp4:= )"
-
-RDEPEND="${DEPEND}
-	!<www-servers/ocsigen-1.1"
-DEPEND="${DEPEND}
-	dev-ml/cppo
-	dev-ml/findlib
-	dev-ml/jbuilder
-	dev-ml/opam"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-src_configure() {
-	ocaml src/util/configure.ml \
-		-use-libev $(usex libev true false) \
-		-use-camlp4 $(usex camlp4 true false) \
-		|| die
-}
-
-src_compile() {
-	jbuilder  build -p lwt || die
-	ocaml src/util/install_filter.ml || die
-}
-
-src_test() {
-	jbuilder runtest -p lwt || die
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		${PN}.install || die
-}
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 876bdf620f96..5b7d7469f26d 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/metadata.xml
@@ -5,11 +5,6 @@
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
 	</maintainer>
-	<use>
-		<flag name="camlp4">Enable camlp4 syntax extension</flag>
-		<flag name="libev">Enable the <pkg>dev-libs/libev</pkg>-based backend.</flag>
-		<flag name="ppx">Enables the ppx syntax extension</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ocsigen/lwt</remote-id>
 	</upstream>
diff --git a/dev-ml/lwt_ssl/Manifest b/dev-ml/lwt_ssl/Manifest
index 46fad6450a08..07c01063e6ed 100644
--- a/dev-ml/lwt_ssl/Manifest
+++ b/dev-ml/lwt_ssl/Manifest
@@ -1,5 +1,3 @@
-DIST lwt_ssl-1.0.1.tar.gz 48964 BLAKE2B deb6b48ef0249f7ab5c9bbb4507ce7be048c547c8aeeb9421a96cd1215c4292b6a4330ee6c6aeaf6ff092e7eaba0ef7f689ff0de2e97ff68b576cd27084719bf SHA512 429e2ee6b45e53b8f3347a0ad02531fa3ee6b3842dbf6475cf079a214f3a59bbb25f3c1c882ff32f01263711db034cc8900be827e27e6a8b0562812e4bd8e52d
 DIST lwt_ssl-1.1.1.tar.gz 288603 BLAKE2B ba22a078597c71ed51142c91d215c339f5ab9aae3a4f94f8111985ad76fba7faf60878ed3e549d79983130d8203531326c408a2f18e0f902e6171b383f26abda SHA512 207ccf8ccde13d88eb58d4ff45279f7cbde90ed5c20a941e7efa9501d9c1b8a71d7655178960c826bb52c6403c348faa5053cefc0ac197ad690a96daa55d1a32
-EBUILD lwt_ssl-1.0.1.ebuild 504 BLAKE2B ef321f8a4271fcf3bf6b25eab17cc8557f27cbd78ed3f4bb921fb5091ca15ddd185ee830b82901762fad8ebfb0a534754f4d6c802cabded54e802ea41e6fff09 SHA512 6a026b3e8137a1f6684f6107bda5bfd82971bbdd621b72d69654ca5ec7c388a65ca5d8c3b36c10bdcb8ee7282f79917a6fab637b1c54ca145f0652994492e25c
 EBUILD lwt_ssl-1.1.1.ebuild 583 BLAKE2B 3170c488278b51305df94063b52d8b8f2f9ebb3bc05fedba7b0f3cd43e9a140f7ef16a87a36a198b733ef2e7fdecbc75441af1646c4c27e235a00b9ed13d3d5c SHA512 92868dbc53e3d812897745fcdca855c7f51e31870f9b647f47a8406df4a2230ab46f6e49447510558109b85abfacf8e5fd68d6a9ef2e01e45b0b71ff4e3f38a2
 MISC metadata.xml 243 BLAKE2B f4f8ba5087618a3e022e6c8a81bed9e79da719beb13e41c3f1c91961e7e18afac544c6039f176dfbbcc78149311d5631ef1469abbe1e832885c5e738effeac87 SHA512 a4e5b8654e590aae9cd003aa9ff9470deea7790d90b0d057c477c4b78a8d1fe5dd26bbcae47f1fba3fefe4a98181d2a5e0cbd35cf16b0ae07200df3184e92798
diff --git a/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild b/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild
deleted file mode 100644
index 72aa5de96791..000000000000
--- a/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-
-LWT_VER=3.0.0
-
-inherit oasis
-
-DESCRIPTION="GLib integration for Lwt"
-SRC_URI="https://github.com/ocsigen/lwt/releases/download/${LWT_VER}/${P}.tar.gz"
-HOMEPAGE="http://ocsigen.org/lwt"
-
-IUSE=""
-
-DEPEND="
-	>=dev-ml/lwt-${LWT_VER}:=
-	>=dev-ml/ocaml-ssl-0.4.0:=
-"
-
-RDEPEND="${DEPEND}"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm ~ppc"
diff --git a/dev-ml/oasis/Manifest b/dev-ml/oasis/Manifest
index 2c28427116b9..0b13d2c77f95 100644
--- a/dev-ml/oasis/Manifest
+++ b/dev-ml/oasis/Manifest
@@ -1,5 +1,3 @@
 DIST oasis-0.4.10.tar.gz 394732 BLAKE2B 6347e532d595e33a3a62f63669625d6de0081e8be90568a0e9f334b9745a40ec2593e7c79d21174f3119728c4831393efff0a3ab6d1aeadc594a0f96e5112a72 SHA512 c173a3a774d13a7cb21ddb44f89dadef210d331ab5f3a1e7ff1705e815572f70e22815736cc3f3788b6d8f784c21a309b45c5bf5e984e583b31931847bf107fd
-DIST oasis-0.4.8.tar.gz 389565 BLAKE2B 50103f261fd4c9d11fea1d7c26abc047fd0f30ab17b871672cb1ce0a89fd47d378fd4f31d48f1a6835361ddb74761a0ad9fe4bc5ca514e470a4cf3594f30c762 SHA512 e0baf0f048647c25eac5472db0d2a22d0fcaf85fe61ebd88ec5a101c20d4916ecfa9d10fae069ba4479abb22b90c44f18312b9252727a8c7c7de4aa2d8d72663
 EBUILD oasis-0.4.10.ebuild 929 BLAKE2B 209e79c20f72fa4d77d16902238f73ea21fde215ed6cfa5119db83f4f4e672487f7236fee789ed571eeec9ec2c1acc30659741c3a38d065d21edd3a6e5d588de SHA512 f365a3a72680932b46e8bd3a571ffadb3514695a4ee8cfd7eada809517ee5d0f90a9faee90a1fd229413bfe505b7e5d285213253a14ad12c62ba10caa4bfe585
-EBUILD oasis-0.4.8.ebuild 911 BLAKE2B 5f7975b80a4e218901304a2bda5e5d7e16cf47a8f3df90b58b12f6a856ff6490e348cf109307e2cdc8f5ea3e3b8e7563dabe2eb1cb4cf937391d123f5657ee80 SHA512 c9c84df7e4068a3ab9915c0bc4c3d1ccf6b6593a83916c12e4c513c4dff16a42fe57b0e6a6ce9541461930f07059dc33262a95baff62e274675862d8e23af7ab
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/oasis/oasis-0.4.8.ebuild b/dev-ml/oasis/oasis-0.4.8.ebuild
deleted file mode 100644
index f4b70d1c6f47..000000000000
--- a/dev-ml/oasis/oasis-0.4.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-MY_P=${P/_/\~}
-DESCRIPTION="Tool to integrate a configure, build and install system in OCaml project"
-HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1669/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:=
-	dev-ml/ocamlbuild:=[ocamlopt]"
-DEPEND="${RDEPEND}
-	>=dev-ml/findlib-1.3.1
-	dev-ml/ocamlify
-	dev-ml/ocamlmod
-	!<sci-chemistry/oasis-4.0-r3
-	test? (
-		>=dev-ml/ocaml-fileutils-0.4.2
-		>=dev-ml/ounit-2.0.0
-		>=dev-ml/ocaml-expect-0.0.4
-		dev-ml/pcre-ocaml
-		dev-ml/extlib
-	)"
-
-RESTRICT+=" strip"
-S="${WORKDIR}/${MY_P}"
-DOCS=( "README.md" "TODO.txt" "AUTHORS.md" "CHANGES.txt" )
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 596fdf23b0dd..501d15aa5605 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,11 +1,5 @@
 DIST ocaml-ctypes-0.11.2.tar.gz 203564 BLAKE2B 2a8c0ee8f8dcd78c3f93b506e92f2c3476c1505d8b58be9273405b4c198500d8e5ff4b0689f76599cc3e92ebb1f5db685c025e2f6a29f590ef21e36c4ac4c3ed SHA512 f3d75e9e596f68438733090fea8c675624c3b186a77c3adf1eca8f12cc2da336f0f5b1688c2ee788726e873bbb0c4dce1d237d53d1637d78e4ad6a8eae1f912a
-DIST ocaml-ctypes-0.11.3.tar.gz 204959 BLAKE2B f3863e29d355479f9306c39786d56839ab05a119dfd5a64de1a784d71e8d931d5fad0f306402aadb50bc5e8147ab7668ac026b5bfbbaff2b6530d7a33f9f38cc SHA512 e7698954a6b683869a1482af8fe1bbeb5ccf693c2bb8583e2c19c5da92ed2730466e373c6f53d9ff9f09c2bdedf102da3f76b75511d7f9b7d266ac0765999f94
-DIST ocaml-ctypes-0.12.1.tar.gz 199686 BLAKE2B d131bb8ebe8448c6d252d32b6a6de2e555f4c7802bec0da83f33ac402d1fd1c73db9abb97fe9f7065fbeaddc782c0976bb05ef6ee6aa80e20b46074a48c343c3 SHA512 801c66395d843c9e410736a06ab5e03bbe22851a364dc9b9444f49dc133e0f5e0b7a1c31e88de56d23a21817cb35595a1b6743c430c8c1a689b7ae12adc8856f
-DIST ocaml-ctypes-0.13.0.tar.gz 200959 BLAKE2B 9f7274099924bd5502fc8115a1e5ed32f9b56902ce284f5530710c948d6d735a2abfd30affa5f1f7803edb33e062c288963946846be29977af87f19f47dd0fbe SHA512 ba2e4cd77d42cf032d823e26f94a8cc37d81ac12bafd40c5d61685d66c97e18996a286dd8d486c94ad4a34e4214e55104e6283158962871e7f0722b2144f7a7d
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
 EBUILD ocaml-ctypes-0.11.2.ebuild 670 BLAKE2B 058d2278336a8fc5092606079078d2e7a19accff917bcb4679f700e5e5d07f71d4fa47079ee18a3d0b1b54bcc06f60f966aad047f44d1295edb9aae9df2b3c9d SHA512 d48415b9c30c6d63ba61c2bf98cbb2e459be1a412196c038caf9657914a8e579584f0c8eb22352c03c2f2f26c343ed3f13f2186be9f801f537a3b87f0f26e6b0
-EBUILD ocaml-ctypes-0.11.3.ebuild 673 BLAKE2B ab176999bacff4f722fccf3f38f007d2184a6e7d24ba23c242a12a79823f75ededec6d304de5d1ab8655f359a7864dc067e2ff362ac4a95481c5eb01c8e490ae SHA512 012872b8c32374e385a7d6725c4be3d1312c8a0f285264e03230f5164a49d61d78c56ef505ff8175e7e0f08e71a25ed4222f06dcc7f74df63dcd160ec95a9ac8
-EBUILD ocaml-ctypes-0.12.1.ebuild 710 BLAKE2B b5907498008fc21e9533983ba7b26ad5ced78ab269ef3bff391508bb1bda16ec6df97bef51842edef9aa7c57386c804b0af2ebda22a47253d86d1e61257e3704 SHA512 d56e928abe3e46637a14f837865a02a1083181ce8627d635ebb313db28ee65094e73e87451a18be45df72f182d4bdd37e10c40f386e31f4a8b201539bbf1cd29
-EBUILD ocaml-ctypes-0.13.0.ebuild 710 BLAKE2B b5907498008fc21e9533983ba7b26ad5ced78ab269ef3bff391508bb1bda16ec6df97bef51842edef9aa7c57386c804b0af2ebda22a47253d86d1e61257e3704 SHA512 d56e928abe3e46637a14f837865a02a1083181ce8627d635ebb313db28ee65094e73e87451a18be45df72f182d4bdd37e10c40f386e31f4a8b201539bbf1cd29
 EBUILD ocaml-ctypes-0.17.1.ebuild 805 BLAKE2B 636c3010c16883fe96817333884885db7ec0ddd885b0c7c9eef5bbb74fdee5606b6cefe2146d0b1c1edf9cd6524270e0c6b6bb730d8c09244db6e6a8fdb9abad SHA512 47174c36c496511138f40c935c615937c3ea73bf0cb0fd6e25742b072b6a97ddb4aa47162f2950ce616e80afa05e0051e163a7842e8289841b9b094233fb6365
 MISC metadata.xml 331 BLAKE2B 7deaed237d1fd18b923d5a0dee3595a7c59f35a0a4e900c417d52fad7d659d6db8b1f36d64a859df6a7770c401b9d8054f51a93dd6fdb738a34a82d8a7b08620 SHA512 35d5acf562fbf2745c71984f7bd26c5ade620c55b23a76a5b443a401a5484a3c58a74e1ab9ae0a0128b2a16c43f661f69e98cb886a3053cfc581ac618ff5c896
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
deleted file mode 100644
index c1ff54bb429e..000000000000
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Library for binding to C libraries using pure OCaml"
-HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
-SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
-	dev-libs/libffi
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
deleted file mode 100644
index 17a54dde7978..000000000000
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Library for binding to C libraries using pure OCaml"
-HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
-SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
-	dev-libs/libffi
-	dev-ml/integers:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit dev-ml/lwt )"
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
deleted file mode 100644
index 17a54dde7978..000000000000
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Library for binding to C libraries using pure OCaml"
-HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
-SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
-	dev-libs/libffi
-	dev-ml/integers:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit dev-ml/lwt )"
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-dispatch/Manifest b/dev-ml/ocaml-dispatch/Manifest
index 74c1d5b9c1d4..aa2ee4a1922d 100644
--- a/dev-ml/ocaml-dispatch/Manifest
+++ b/dev-ml/ocaml-dispatch/Manifest
@@ -1,5 +1,3 @@
-DIST ocaml-dispatch-0.3.0.tar.gz 51453 BLAKE2B bd7965396a82a9f767abd05079496a5e0c1f12c3fe02d8c1d79b41db10010eefd89edf3351d8d05f132f0df3c3ab79533902a98752e571bfd09d4f2798f1db57 SHA512 0f09eae45a2ecae27d07e247b6a47f307e074342e337e7be262f5183f77090f0aef81fb5c0bf499732bd0a711d4d51775cbcea5e463011f43a1777582d78806b
 DIST ocaml-dispatch-0.4.0.tar.gz 7554 BLAKE2B 9bbe102df8a27642cbf54ad876caa276ba966ca3b19af53ac8f957799d0ca98b030c0d5ec055cc2868b2c374d71371c6e91ef0b89f4b5a072fbe2c47133df919 SHA512 d5318bda4079c21820fce5b21d178ed88fd0535a5cdc559dd6ceeb4d06ffb08456ee5aec1e56efd40b6d4f456f7d5c7eda17dc728666e6514dc936898b605b36
-EBUILD ocaml-dispatch-0.3.0.ebuild 764 BLAKE2B 646d1d85f42a526e3d40a1fd8a9f421fd40353f56fb4ef57c7b4935b346113ed13408291adbadd3e02a6514781d424f71bc3737621256d71c82069e2a3523208 SHA512 27e4714792648b99cf1ca4c317f4b25c67dba6f0b64be21e2b51f4dfce49594d5a2625e5299840dac9b3022272beef6a5e50411c18fcebea11cb27a4b7499a01
 EBUILD ocaml-dispatch-0.4.0.ebuild 878 BLAKE2B df6b567c81a3e6900d2322ab682fa0228afe5df1506d723baf460dd5a818e78532e1aec1987807080acd7d75dc259ca33100559718dae418134e4269cc9dccc9 SHA512 9edfe64ab8ef95608e7ea433e60793271b3ff6bc69bf10b8898aa69086cefb36dc9908be0a6562ad9c36ddeeed11b788b29188504f3e52b5199f21626b224b71
 MISC metadata.xml 260 BLAKE2B 2c01e02fd97a8fccc0f705d85be842abe3f587a45f4bbcf3b41ffcbff9ee2c2848847009b15b004ddca8abe84d35fbea548fc6517d8efead224c614483c4976a SHA512 4dcbfb971d15698777a531e300a4d78afe937f01ef4db0cf253830b377794662fc4d1349cc17b50045342b63df4348e81f44de7636ce86ff76904b880fc98d41
diff --git a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild
deleted file mode 100644
index 0056e666f79f..000000000000
--- a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Path-based dispatching for client- and server-side applications"
-HOMEPAGE="https://github.com/inhabitedtype/ocaml-dispatch"
-SRC_URI="https://github.com/inhabitedtype/ocaml-dispatch/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="javascript"
-
-DEPEND="
-	javascript? ( dev-ml/js_of_ocaml:=[ppx,ocamlopt?] )
-	dev-ml/result:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? ( dev-ml/ounit[ocamlopt?] )
-"
-
-DOCS=( "README.md" )
-
-src_configure() {
-	oasis_configure_opts="$(use_enable javascript js-of-ocaml)" \
-		oasis_src_configure
-}
diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest
index a5f87e393f78..d8f05c8d1ce6 100644
--- a/dev-ml/ocaml-expat/Manifest
+++ b/dev-ml/ocaml-expat/Manifest
@@ -1,7 +1,4 @@
 AUX ounit2.patch 672 BLAKE2B a47afbc8d7c33483a8a732252f7a7a624f60364d2c055097a0af8f97b7022b09b297a4022a02317fd6e4843bd3f66a875feb8389750cd3f332560cbc38834e5b SHA512 5298115ef79f2d59cafd1c0d09e7dde8649dc16a7a84f77965078a62f76ee2d9348e10d0e2230efdd89c3ecf4cc59ba3fc7b3d5de4f2a428641e8a67a47dc220
-DIST ocaml-expat-1.0.0.tar.gz 58149 BLAKE2B 0bd99a8a5eb8f4fe1a04d1d53edc5dc662a51ae880c5297de9dbc93561896e5c3acf3db4b7edc5122a328be4c17fd924a66a2e0e08c9bd74aac704257f5dc569 SHA512 217d602ac8fabf7713dcd8fd274206b81ff467402a9bca5b15b13f3b1d68e8e5f2c2970adeafb2378c0993b39c7d98a420dee07f30ad9eb88fd40665a2f98897
 DIST ocaml-expat-1.1.0.tar.gz 58318 BLAKE2B 137bc65c5c867180ba547de17041bd0f588da395928e92eabef45cdbb76a1d139d7cd0d80d33337e1fbff92c9fa3cab2339c0f340f50f467b8fe7d64cba10b1e SHA512 9407f91f5007d6835643719294d4e4907bfc40464d054911591ce80c31d173ddcc7b06157a19c0d3ddd78775806242dc68aea7847e588ca9fd1909def1df4d23
-EBUILD ocaml-expat-1.0.0.ebuild 823 BLAKE2B e79e689a1a2629aca38ffedaeba67a24aa45981e797648a50e0a9ef10249637a7c857820b4a3979529dce3b8820c5d85b64c9d4ed8b92a412b59f7c6421c5a59 SHA512 94bdbf2e30b52b0782b3f89a58514058c2d46049cf6045d431382b1d4c79d7672f1c9b0febd73a7e8c7fd9a19eca2166c073749767c069529e171e3e05a50150
 EBUILD ocaml-expat-1.1.0-r1.ebuild 906 BLAKE2B 0dae8b0ebabef5a8c84d85e1151e80fb271254f530f0939e6ebf988db9ca05b6605786fade5e50fe8c136dad436879f28e370d8b5d4eea79ef706262d1de94f0 SHA512 8a8cad1130b20d3467aacf86c53011c37e5710bb52dcf18a4721989b6a98c382b5c9b53722b2e2a08126329f7385b3fa10645da3162c5a28f8bfeef834e32016
-EBUILD ocaml-expat-1.1.0.ebuild 823 BLAKE2B e79e689a1a2629aca38ffedaeba67a24aa45981e797648a50e0a9ef10249637a7c857820b4a3979529dce3b8820c5d85b64c9d4ed8b92a412b59f7c6421c5a59 SHA512 94bdbf2e30b52b0782b3f89a58514058c2d46049cf6045d431382b1d4c79d7672f1c9b0febd73a7e8c7fd9a19eca2166c073749767c069529e171e3e05a50150
 MISC metadata.xml 331 BLAKE2B bab5b5dec6ca651b9ca68b86fbc7512bfeeb15946248234814bad8acf17aabb785e6bd23a645e205adb1c97907da43ea4dc052233c0f5b699551cae30eb77fb4 SHA512 da512352ddbdf8c8a274706656b4611e918089d0c970dc68d6ebc95200ba0900c5bfe3f7d5454d87ef7ddd5ec0e45b2da2aad531c2c22998ac0d5798fbd62d64
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild
deleted file mode 100644
index 73386d528fc7..000000000000
--- a/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-IUSE="doc +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DESCRIPTION="OCaml bindings for expat"
-SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/whitequark/ocaml-expat"
-
-RDEPEND="dev-libs/expat
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-
-SLOT="0/${PV}"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-src_compile() {
-	emake depend
-	emake all
-	if use ocamlopt; then
-		emake allopt
-	fi
-}
-
-src_test() {
-	emake test
-	if use ocamlopt; then
-		emake testopt
-	fi
-}
-src_install() {
-	findlib_src_preinst
-	emake install
-
-	if use doc ; then
-		dohtml -r doc/html/*
-	fi
-	dodoc README
-}
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
deleted file mode 100644
index 73386d528fc7..000000000000
--- a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-IUSE="doc +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DESCRIPTION="OCaml bindings for expat"
-SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/whitequark/ocaml-expat"
-
-RDEPEND="dev-libs/expat
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-
-SLOT="0/${PV}"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-src_compile() {
-	emake depend
-	emake all
-	if use ocamlopt; then
-		emake allopt
-	fi
-}
-
-src_test() {
-	emake test
-	if use ocamlopt; then
-		emake testopt
-	fi
-}
-src_install() {
-	findlib_src_preinst
-	emake install
-
-	if use doc ; then
-		dohtml -r doc/html/*
-	fi
-	dodoc README
-}
diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
index c5c40c464143..57e8552aba16 100644
--- a/dev-ml/ocaml-fileutils/Manifest
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -1,7 +1,3 @@
-DIST ocaml-fileutils-0.5.1.tar.gz 129639 BLAKE2B 12f4b33eb70caf3a106e87a484411f31d6924aae68c964350080698b723b39c7bae236d5a732a0546cd6a52b4215c9ddf2b46da613c171a1ef384ef5eee3d5fe SHA512 e2f60d16d9c25f43ea6bf5fcdf5810ae1722ef30a37e9ffcb6302a87bf3aa89777f3e3d43860258fb7c284861df1eafb4e5e2b6bd3f8d78d347ef8d139e460e8
-DIST ocaml-fileutils-0.5.2.tar.gz 129676 BLAKE2B 2534c28d134b297cf9f7838c6f33f6fe4a7fde6875cf7ae15990b1d2c2fd53be425ce8b37b6836642b26722fa0042f741e91d1c32211a2618e5f80345b6c63cb SHA512 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d
 DIST ocaml-fileutils-0.6.2.tar.bz2 43060 BLAKE2B 20828875a25b1a9d2a41bf495cda00b0ac753efa20111b32a9d2ca439a56e9f07bf0953d16ee9148cf065e204fa1d8d624eaa89f6f4ae7e1613fdaa7cb44fc24 SHA512 104c7389832f22ec189ce6f1596144b28dcaeea7d23d5b19d369c44e54326e97fcb7b4f4c4a8d2965523e63b35b594a1351b7e630dde590871efe512fe38853c
-EBUILD ocaml-fileutils-0.5.1.ebuild 657 BLAKE2B 28f86d8927fa4834cdba0f3fca82e24d13d955dc6981010df27adaf20e92557217aa948f95a7c8b88b23602ea937d3f7122f9ad86ad04f781aa8484fdac86777 SHA512 31e36c96107f42ffe22818e45dd370fcbc18e966634aa120cd65698dd1a4e9b099f207477532a44d973142a7feb39078c1b43479561d3768c4971686faf433c4
-EBUILD ocaml-fileutils-0.5.2.ebuild 657 BLAKE2B f20ed4dce9dbd67e30f42c9e16941fbb6f540480f08402332074e95e5ecf9cc8f87f55d7effafe9fadc4856cd82bb4540a6e44e1998a226672aba712eafdb948 SHA512 9af55239baec33eaa231aea5d70cc4a9ac9bf5154c97ac40df43c80875550f18aa0b62600bdfdf4380e11c6afc85f9f985c2c24f20189430f76e34f257e9ca88
 EBUILD ocaml-fileutils-0.6.2.ebuild 649 BLAKE2B b3203abdd1edf69d46658ee97b4f52228d872d244c2c077b62f0875a3386e7c962ff444e5fafbcbc092d70ca05040eda5add67bc4417a2ed2678809894247a16 SHA512 a5d04dd27e325283a3513d73ca112989c81004209d06a3dd68b6f374ae7c136db315dbf17496660d94a2adcc4fd0373d2652f8b4b41330d277ee0bc9fd56db8a
 MISC metadata.xml 799 BLAKE2B 412e5e86cf787c2a3a63eff243337e4f8e54abee3d8cf0491e90c4e2e0cbdd2e5c4d452ec87b63cc0ad8d23286283eb1f17b295c422100cf412fa74ce99318d3 SHA512 c22647ffa2dba7aac8d3f401e6124e0acdc02526fb53ea35995ccd22984715a09d6b558097b9385c1c2fc31ca75a20864e22b0fd9ea9a6113620b31bdde7a691
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
deleted file mode 100644
index 6b5395fafe13..000000000000
--- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-fileutils"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1651/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-# Does not build on 4.09+.
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	${RDEPEND}
-	>=dev-ml/ounit-2.0.0"
-
-DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
deleted file mode 100644
index d0082d821707..000000000000
--- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-fileutils"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1695/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-# Does not build on 4.09+.
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	${RDEPEND}
-	>=dev-ml/ounit-2.0.0"
-
-DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-hashcons/Manifest b/dev-ml/ocaml-hashcons/Manifest
index ee390779d930..645ef1d15dc7 100644
--- a/dev-ml/ocaml-hashcons/Manifest
+++ b/dev-ml/ocaml-hashcons/Manifest
@@ -1,5 +1,3 @@
-DIST ocaml-hashcons-1.2.tar.gz 19775 BLAKE2B 7bef506cb7de3177168cc582245f8e2ece3ca7e9da78985ff604a32be675bcd36901ed920c7898aa0e3087251494f425c164cd1125485549de0bbfd867bdbfa6 SHA512 167ed8d74c5080ef14af0ac1232ea16faee3f0e09e0a65cd72447266939ce7ed5416f4cf6a3021e5ca8215726df129d3f05c9e0c12dcd36f845b060fd93072b2
 DIST ocaml-hashcons-1.3.tar.gz 19495 BLAKE2B 0d29a529fb1d6953e7294e3992e6f41c094e8b4ea607ed4f2f0d97c558b2c9a6e8703de0aca06727b845ad3f3989ef99c634e248f221c95fbffc2321cd73e961 SHA512 fd194d48a3231e72ca8bf3d324e5e1f6442d965da9149973a1763cf70aa82398805fa00648bdd12de3d3daada8e90bdc575c73886f949b5183e79bea75beadc8
-EBUILD ocaml-hashcons-1.2.ebuild 856 BLAKE2B b294fa9c408a097a29e15d9f9716261388e46fd804050f0919cc6d834fd86bdc3a25fd11bb0ddbc620ae1224060a6143c55a7dd0723ea6b7745ee4db183e92ab SHA512 7a0ff44d93330c4ecdd7cfc0f28ec595944d8b917ec427b9ebd09a6fc904fbc02aeecb7012b911f2200cc03abc790af421927b0f04ee3e3adc1e5061cc45c182
 EBUILD ocaml-hashcons-1.3.ebuild 856 BLAKE2B e8d2f6d399d40ca83b447c7c5a18ba8ed34c5d0b5b272852119ff8352dbe9111923e732a3ae5d01c33be478efff7e3c9174e6011f7216d149ae2f3807aefac38 SHA512 4b0f2ac976990f2086bbb37f8168b3756ec0fd845483db3eae2ca7f3c7ee7424ba6bdbb14b33b31dbf434654c34fe66cf9d14ec00aa4f833c8b2df8285523714
 MISC metadata.xml 259 BLAKE2B 72d093b371aa2735e9f81201fb32b5fe3e6ae2e3074c86be4e6f85c026d6a81cbeb3a82ca72ac6dbfe4ff3785e5661843b32d8f859ce50fad3823f218fed84c5 SHA512 ee8ee05e2b4f71e1e2b73d210db65707f53606f2943406f41a12759a4d024bd4cfbfc6f8c8e6ddf37e199adb10b7501aca1f2dc6e6704590221e50bec20bbeec
diff --git a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild
deleted file mode 100644
index e2f3672faae6..000000000000
--- a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools findlib
-
-DESCRIPTION="OCaml hash-consing library"
-HOMEPAGE="https://github.com/backtracking/ocaml-hashcons"
-SRC_URI="https://github.com/backtracking/ocaml-hashcons/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-	sed -i -e 's/$(OCAMLFIND) remove/#/' Makefile.in || die
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake opt byte
-	else
-		emake byte
-	fi
-}
-
-src_install() {
-	dodir "$(ocamlfind printconf destdir)/hashcons"
-	emake DESTDIR="-destdir ${D}/$(ocamlfind printconf destdir)/" $(usex ocamlopt install-opt install-byte)
-	dodoc README.md CHANGES
-}
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index dda8496f8c34..3d158298cded 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -1,9 +1,3 @@
-DIST sqlite3-4.2.0.tbz 22167 BLAKE2B b5f874f592fb7873060d3f33b82ea9282fe0a04aab8683f5355a96b0a7a78e19daefc6d3f72b9e796dcc718347f8b13bc210eb4a61622cf12460b263bf088c86 SHA512 3221ba03eae64c59c3ffa57271585a1fe76848504d56edf33e953fad270929ba300b5828788f6cbb3f145acf743ad51bc019d151ac68472f6dbf7ab43263ae86
 DIST sqlite3-4.3.0.tbz 22498 BLAKE2B c57d8edbc0897229cb415d48efb02ae41dff1d87fabc667a40b984807c5c5885201dca3d7f523872435b7e18b450c15707212eeeafc0a75f1ad28d7e7671b4c7 SHA512 f09d425830ac24ea835a403bc51d257c265b6e77b1dce01367c715545cbd98f3ad2694e6dfdbc7491d590aa809c0313329e81c9614228170f90197f2a94200c9
-DIST sqlite3-ocaml-4.1.2.tar.gz 76879 BLAKE2B be02c4df79f78b69e859fc465242e3e513d0b557364614e4fe73f78b6020e77fd971f274e45e4d2b79c99ea6e110358dc23ab2f79183915e242244b9ff6a6de8 SHA512 880f82fa9eba06114695bda56305245d2d9062f8136db85675463e97fbb8aee210df310d8d65d78e9eb1f882421581a97c4b7f20a790881f699b4d494be066f5
-DIST sqlite3-ocaml-4.1.3.tar.gz 76989 BLAKE2B d5f5e5c91faaf7308c47431d2f5292952e5c6ddf8854897aa2d54946b312bd3321f4ec6ecca7455778707b082e7af676ac50ab5b16686176623058c082973cc6 SHA512 59865b4c5d99d319ee6f5e1ecb8d71b4c07bd7f77876fafb73d3c882dbf434b67313f4caf7762f2194dc819f75af9582dd4df002f0f68cb8690996b857c08a1b
-EBUILD ocaml-sqlite3-4.1.2.ebuild 654 BLAKE2B 5c0b2db9006c9a9514bc133008040a8548e5aca09c61b4876922602b40cd60bed234ae8d45c1d5a52b1aa45a7f5314a3ed68e0941e47378696f638238f2acb7c SHA512 8ee84ebc3a3f4956a3a7c4afd38af5e21150fc1fdb4390a9a49d5d6853197a61ecc132cd5a5759fd3b394a0b70a5e50349dbce145d734023a81524ac6e2a8521
-EBUILD ocaml-sqlite3-4.1.3.ebuild 654 BLAKE2B 5c0b2db9006c9a9514bc133008040a8548e5aca09c61b4876922602b40cd60bed234ae8d45c1d5a52b1aa45a7f5314a3ed68e0941e47378696f638238f2acb7c SHA512 8ee84ebc3a3f4956a3a7c4afd38af5e21150fc1fdb4390a9a49d5d6853197a61ecc132cd5a5759fd3b394a0b70a5e50349dbce145d734023a81524ac6e2a8521
-EBUILD ocaml-sqlite3-4.2.0.ebuild 709 BLAKE2B 201c0c0eecef1094d0a1bf8b5b0648e65701feb78db814218ad8d4eac4e3acec1a93fe84b1131e5cabdc24d5eeaa7089c2a36db9c14ff2fd33c72ef354bebce9 SHA512 5bdf0c57b4f9e77a312d95226eb244b5865f2c17468a294b25fb9a126ff323809d8d89bbabec8492aaaa0df699b13ed1e84c5a1d5e258815b232d477f9e844d3
 EBUILD ocaml-sqlite3-4.3.0.ebuild 709 BLAKE2B 201c0c0eecef1094d0a1bf8b5b0648e65701feb78db814218ad8d4eac4e3acec1a93fe84b1131e5cabdc24d5eeaa7089c2a36db9c14ff2fd33c72ef354bebce9 SHA512 5bdf0c57b4f9e77a312d95226eb244b5865f2c17468a294b25fb9a126ff323809d8d89bbabec8492aaaa0df699b13ed1e84c5a1d5e258815b232d477f9e844d3
 MISC metadata.xml 322 BLAKE2B 943cead5c3010411a8507ac09a05d88a413db06c3fac3967ecb6bde0bdddaa4bb9a7ea081e31e6382c805e3c437f64d26b254b0a630a963021c0507ec51e8526 SHA512 c3844393c1910c1982d20a00e04727028be2cf63a33daa48fba4ea13068cfd6b1d3d175446185e82ba3753880c0559d4b4ed0542243e55908569f603e2524c10
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild
deleted file mode 100644
index b815ace156b1..000000000000
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-MY_PN="sqlite3-ocaml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A package for ocaml that provides access to SQLite databases"
-HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
-SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-db/sqlite-3.3.3
-	>=dev-ml/findlib-1.3.2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild
deleted file mode 100644
index b815ace156b1..000000000000
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-MY_PN="sqlite3-ocaml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A package for ocaml that provides access to SQLite databases"
-HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
-SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-db/sqlite-3.3.3
-	>=dev-ml/findlib-1.3.2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
deleted file mode 100644
index 8cc25ff20034..000000000000
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit opam
-
-MY_PN="sqlite3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A package for ocaml that provides access to SQLite databases"
-HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
-SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}.tbz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/sqlite-3.3.3"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/base
-	dev-ml/stdio
-	dev-ml/configurator
-	>=dev-ml/findlib-1.3.2"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	jbuilder build @install || die
-}
-
-src_install() {
-	opam_src_install "${MY_PN}"
-}
diff --git a/dev-ml/ocamlmod/Manifest b/dev-ml/ocamlmod/Manifest
index 9de99005b224..7d09d6a179fe 100644
--- a/dev-ml/ocamlmod/Manifest
+++ b/dev-ml/ocamlmod/Manifest
@@ -1,5 +1,3 @@
-DIST ocamlmod-0.0.8.tar.gz 48985 BLAKE2B a153b172b14216b8e69a51c47a25cd796e6bb2adb5d0c45dac49a5bab8e99f0b8511e5e1818abe2bf86ea5280b9b1c19aa21db23ed686387c3414c0df6f2667c SHA512 beb64c109c241965f33a60b4868f5215e6c112742a3be214d3b7a0503b9d29494c0453fa5f2551bbc1975cd4b123d0b917116aeeba968d2a7d2c6fb9651a64f4
 DIST ocamlmod-0.0.9.tar.gz 55025 BLAKE2B 26be662e814543b65a2fb293732257a803c0cfc544550d0339617ff3c59ce1cf44f2330582e6eeca313cf8e25984d7cbfc4fc1c1a3b830fc490a16551961974e SHA512 cf0d3671cf8fa83bdbd0e4b47888a50f9eab24691c71685c0612a9a8efaf36ba9fa66cee604c928a71f2d8da40b35453d2f2d3619f73141aba0f46de3bd97537
-EBUILD ocamlmod-0.0.8.ebuild 526 BLAKE2B b54898384d33a3b0b9e4a8d58aadfc0d56543ffd9dbd28ea8fb935d6bde8c1befc832f8c75866368cd54ea30c83197d1e6ed0f0419816a32310713574ce754e7 SHA512 6d1ce92fe21cccb2fbdc6bd1d3ccc95e6217111808cf813c447b866c51671ece77c12ee5523f3f76175286bd1bbd09ae76802b5484a5ce34998241bb6df7538c
 EBUILD ocamlmod-0.0.9.ebuild 522 BLAKE2B 7302c193286a7b8fbb9a0e60c19beed36d1861455fe6a2dd5ef3d7a51575c6c01d4ca520b257675a5039ed3bd8bc7ec5033a69cc9918977528a4ab21810bb2d6 SHA512 bf07f93cb0c37debc23040b2c7452e7400b39c09324a4fd619181174ecb2e7b8d6ca1ba4b852dc2fed734904427daa32ec1bf27ec1866d31180f93aa69263fa3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild b/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
deleted file mode 100644
index d8a4b5c50ad2..000000000000
--- a/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Generate OCaml modules from source files"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlmod/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1544/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-#	test? ( >=dev-ml/ounit-2.0.0 )"
-
-DOCS=( "AUTHORS.txt" "README.txt" )
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index b0c4347f64f0..f8c95350428d 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,10 +1,4 @@
 AUX ocaml404.patch 2031 BLAKE2B 02341fa3b292d713995f95d76f1b47970b9ff34d8b177212074c0a3c027aff1d0f27a0e3e7f03b8131904a28d285f9cc4b7b795e62327ad2da7c29f1b74240da SHA512 507bda106d25a92718aae1b0e95103d481cbe18624f80a59af6b3e884594c1d18b0c15b51f014b1af39b09a5264272f92ee8d18dcca37e7595964f85241c141a
-DIST ppx_tools-5.0.4.03.0.tar.gz 17209 BLAKE2B bd51e5b2482a9eab09bf9a02ac0231fa7bbc721d54a932e6cfdc1d719c106eca0fe90563b636601110e796fab439f6c6d7fccd5d2920f5bcb3c115f622d90381 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4
-DIST ppx_tools-5.0.4.05.0.tar.gz 17893 BLAKE2B 0902f53ef19338396cf2a2319a4c2d4b7bbbfb66bbfd0fb2290c29ecebcda02ff90d2f0d0221b08d027c41c863c2bc0a02c50363d83474864c08e619641b7ad6 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64
-DIST ppx_tools-5.3.4.08.0.tar.gz 18590 BLAKE2B fac872d113ab1bf9135357dea47d468924e16a1a038b64152d5ebb27daa69a8c2d906750146157954f4d95769535f4a93c1ecc9582ca0313d601a06606196c00 SHA512 817e2688d60f013fa42ffa263cfcc15cfae820240d2e54dfedf1f4a4191f9b9fc365a190cc7eeb9082ed72fbf3c94d6ba72c38c7db3e2bcac49a17ba590d71b5
 DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8
-EBUILD ppx_tools-5.0.4.03.0.ebuild 807 BLAKE2B b71640ed43baaf8afaa8d841d78461f3f66cdade8f22a93aaaac04093dda070d2b0512a8b6ebfc7eabd400b70c852155db5101bdd5c3ab6b46561f0a9db3ae99 SHA512 f231b7ad6f417b2635b7cd1dc765717398074aea040011e25caf81bc25a46e214f9e653dcb33759bcefaa8b359b08f1e37cf2b42d78c5575f3a2563e7810f287
-EBUILD ppx_tools-5.0.4.05.0.ebuild 708 BLAKE2B 58acde9589203a439a9148eb7373d32f8852efb9aa3cddc2d5b74f73e357614767893adc7ebae38b913e698181e295ca7cb8dc0b6b33f85a84422bb202ea1c01 SHA512 457523621d33361f16fe821025b90c7c29ef2b007f85c9ae7156a036d67d50b894e05c3284434e4d1495df2c0c1a4cd7f5c00434b3204644a758486ae5e3d1a4
-EBUILD ppx_tools-5.3.4.08.0.ebuild 651 BLAKE2B ea64e3cb4c471e62f145ee3e79a3554579d07eaf7b6159c37c36f9688de786076b0a056eb5c301265bf561e4e17023ee5730414b68ebd60e279b7bb687fd0e1e SHA512 1cf8e5cb010eaf775e88fc0a39648bdfffacfd3b4e21538a2d5800fb3724576b2dd31d94319f43e3302bb4c8bfdcf871418a609375732469f87bb3ae6905a278
 EBUILD ppx_tools-6.2.ebuild 502 BLAKE2B 6a1d63c8438455ab861e9442642d4f74aae65669791c74e9ac821e532fbcff27e0073a90a4bc787dec7e5ffaa19bec2aeded22c525fc68905567ece9007d8826 SHA512 28057bdec60fd7213fc656a77d780035049188fd7b98e9d45c7cfe0e35a045a9ad2199ec0701b6f317493fa6c35d33187015f8473fb6fa839de266e3b3f52367
 MISC metadata.xml 330 BLAKE2B 52495fb4974c24c4cc083ea661dc08c13f4bcee587270fd157cc92d14a2abdf0272fff8f521cb010a893e47b44ac311fa06275b7ecabeed8a212495206460cd0 SHA512 1a3847e8e4675cdbe31ca7d176ac94ddb9ee3584d2b5dfc09798071a7bc10ca92bbe0e759684025563831b5e8b2f11bc51728a8b5422780c50a756e00d3ea7c5
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
deleted file mode 100644
index d0acc2b9fac0..000000000000
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib versionator eutils
-
-MY_PV=$(replace_version_separator 2 '+')
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
-SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
-
-src_prepare() {
-	has_version '>=dev-lang/ocaml-4.04_beta' && epatch "${FILESDIR}/ocaml404.patch"
-}
-
-src_compile() {
-	emake -j1 $(usex ocamlopt "" "ARCH=none")
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.md
-}
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
deleted file mode 100644
index c2a93387105c..000000000000
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib versionator eutils
-
-MY_PV=$(replace_version_separator 2 '+')
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
-SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
-
-src_compile() {
-	emake -j1 $(usex ocamlopt "" "ARCH=none")
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.md
-}
diff --git a/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild
deleted file mode 100644
index 7e9d0206f344..000000000000
--- a/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib eutils
-
-MY_PV=$(ver_rs 2 '+')
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
-SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="dev-lang/ocaml:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
-
-src_compile() {
-	emake -j1 $(usex ocamlopt "" "ARCH=none")
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.md
-}
diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest
index b4286850b0d3..1ff60ba2d33f 100644
--- a/dev-ml/qcheck/Manifest
+++ b/dev-ml/qcheck/Manifest
@@ -1,5 +1,3 @@
-DIST qcheck-0.6.tar.gz 255625 BLAKE2B 9b0e2f6c134a6c4eca37763f1ca41dcacdd8755f5ffe1b7afba2a5384edac4c9881c6849d6f6da005afe2aaaa46f956e50a5a3d00f6fc57fa1866ca486121c12 SHA512 e4298f00c49febe36ae64f287e032081bb2d7713d9412db95441d6b84fb3030f45d07519369ba00be81615a737dc45a246d609772b318084a2b2a28e77e05e1c
 DIST qcheck-0.7.tar.gz 257935 BLAKE2B a885635e555a7442f0ad7687320e3d9f45897b9167ba4ac12baf632bc60e1eca207ae5ccf4b57ff36897e418f5ef4e781f9f2bf674ec16cdab140049debcb6c6 SHA512 3082029a09d5efe3af0cb8fcd0bd08f11dd1066d5bffc6beaac16c7244b07286b3ae93931e699f22c977ad4d6ba050dff69b133ce3492455d6932a9e0cc304f7
-EBUILD qcheck-0.6.ebuild 513 BLAKE2B bc38ae96008c9439a04883c1b18ebcef1e140ab8870733ec77d1217d674e823cab19176dbb047b3f6c9737eca71dfedcf2fa89ecf54199219aeb2c429df62781 SHA512 552045e6b2f6aa1bf80ae2d212aecb37bccb7424244451d8e1fa40c95c2f92e6de493be2bfab6999dd421c210f1d48ca1358928e89e607411b6911f0d008d87d
 EBUILD qcheck-0.7.ebuild 508 BLAKE2B d34f2f30a4322595035caf15db5a5a2e77f7816f833323e7207ac7f6eb9cea7587e2a4781c90d116161b4213c57b0c93ebafd67cedbbbce91d06188824db2b9b SHA512 0cffa1892c54378a9a2e1d74cde0ce167eeada2f0995bd409daef8bfc411e45723803b567c1e0a1036a15a338033cd46d7a178e1485ba6bb269ad90caccf4435
 MISC metadata.xml 250 BLAKE2B 56876e7e1d60959facf42b1a20761dbc738d7c794accadcbd0b56dbda43096d418f0fb5b76315bafe70fbe18c68e9c61229828a7a7122849c8d8c39b73a117bf SHA512 6ce7321f0917a67a97a262b1b96967c39e0131752ebca6813695e2916f27e8d534546e7cdc974a39fc10dd0b3e3b2178f016afdcbf63f51c6ea6f3e84e02d9fc
diff --git a/dev-ml/qcheck/qcheck-0.6.ebuild b/dev-ml/qcheck/qcheck-0.6.ebuild
deleted file mode 100644
index e74600712cf7..000000000000
--- a/dev-ml/qcheck/qcheck-0.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
-HOMEPAGE="https://github.com/c-cube/qcheck/"
-SRC_URI="https://github.com/c-cube/qcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/ounit:=
-	!<dev-ml/iTeML-2.5"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /dev-ml
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)