gentoo resync : 28.11.2020

21 files changed, 0 insertions, 697 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 00e253ee4d40..40847b139e0e 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest
index 4565b00d7c2c..2ba1725137d9 100644
--- a/dev-ml/camlbz2/Manifest
+++ b/dev-ml/camlbz2/Manifest
@@ -1,4 +1,3 @@
 DIST camlbz2-0.6.0.tar.gz 57771 BLAKE2B 5b4337ca547c37f6982c29c9b70f00ca3100983541a80bf16e8d549c2eabf64ef917ea3ba445c8bb5bbcdb1a652cc5cd586c95299d194a7abe8e68ea9f1a0599 SHA512 1052536bb08c9d9f9bdf4a063a5a01389445b55117ce423dd1732de00cd79db5e4befb4ce5c81c5db8a6d40b28a2ac4b897bb00598fdccf76ea92a2966592680
 EBUILD camlbz2-0.6.0-r1.ebuild 672 BLAKE2B f6e9ada40d80104798f1fb8cfa32341924472adaf3d5d0c4f122c43241f217fda1ff2e7bf295dca476454c204f8b4c01af8b0909132b8d29ab65c549d6f1f00b SHA512 d6616b2fb9af683e1942d028c636ecac5bc26ab96f4553527c8a6fec0442b2b562e3a6c2ed9b386a34f315fc3643d3fe6b2c6009e79cd106f9a1c0e9a017ddba
-EBUILD camlbz2-0.6.0.ebuild 645 BLAKE2B f40fb6ee805b2e07807a199db36d9f7148738e14942734039aec433fa347aeb79e1842b66343998b3c8665d7783d2b6d80d425d9fd24f506393791ed67b38aa1 SHA512 ad7b303c71c3c94f91b71849dc74c3ceb3294052d017dd87fc485ad69531774df34565ef37dadf43e57f7eacdc70fd977e2b27e5a98f91223d54dd52c617d2ed
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/camlbz2/camlbz2-0.6.0.ebuild b/dev-ml/camlbz2/camlbz2-0.6.0.ebuild
deleted file mode 100644
index 15884ba324e3..000000000000
--- a/dev-ml/camlbz2/camlbz2-0.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="OCaml bindings for libbz (AKA, bzip2)"
-HOMEPAGE="http://camlbz2.forge.ocamlcore.org/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/72/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND="app-arch/bzip2
-	>=dev-lang/ocaml-3.12:=[ocamlopt]"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake DESTDIR="${OCAMLFIND_DESTDIR}" install
-	dodoc ChangeLog README ROADMAP BUGS
-	use doc && dohtml doc/*
-}
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 8226b584a816..9bce8a0c6a5f 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -1,12 +1,8 @@
 AUX oc409.patch 615 BLAKE2B 6bda1fa9e8424dd31552756f67569fbe37b4b83fa75566cb9675823ee34cc37cd41be1fd6ba53969a736f08f15e8c9073c9c60997342bbb3c65adb71ffa7313a SHA512 de9b3efe72731152d8c6320e8ce4b5d9bb9c44ed1116dcebefb8dc87d725c1d3feaa81f57bed3eda7bac34d7745811ba373bbfc540bf94761d42a216ce09ab58
 AUX reload.patch 595 BLAKE2B 61d89b27f1e192d160160f14a3a58a57ea77e9ac6dd214a8fedb26b2ec554ed5b0b4ea360e04f52110054840821119a2f4dac6db71318c0edbfbeeca64485db6 SHA512 e39221716cda7a38dc6af4b39b68ce3bba023c625535227c40d01a87c52d4756cc46f9c014a8806b468cd9a01e8a65b848f397203950ef03528393121c2c6537
-DIST camlp4-4.04_p1.tar.gz 648320 BLAKE2B d383a366facaaa440b24184bb54a8e1c3bb22ae02387a0bc4f9ee4331ecdc60e5bf22715c1022c987041fb081eb448794a74026736df9f70e05c7213e08bfa44 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776
-DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
 DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
 DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
-EBUILD camlp4-4.04_p1.ebuild 1024 BLAKE2B 20c33c06a5a541454f0b750fc7c23f32bac0e4af3272432c65cbc3967f1d3aefa4b43be226dd0018f6f338cd18d02266a506ac7ddb4cc0fd07bba48091c555aa SHA512 9d927b94f63edd9a12a51abe35d781c8d1260bef08a8dd91d588875d44eaf3202f8971f69036d530393f089dbc8b7b17c5eae6b176aa7a713c8116af9dec2fb2
-EBUILD camlp4-4.05_p1.ebuild 1029 BLAKE2B 2b3e8b2259584cf0a0e3bce97066e088375cad981ba4e4c352748949d26a4c3dcbb4c04cb6435fde8b3c3c25a5a5d882175676e2feb1fd3e29665ac1335326ca SHA512 d09be322a43d576bedd94133903d3841b2d847eabb5bd32e3680a8988bf9c9da82ad60ddada8589ec1effa7da8ed315251217bd9b47c1214e4344fb05029f0f0
 EBUILD camlp4-4.08_p1.ebuild 1091 BLAKE2B 4c0e75a3906c6778050b313cdfd97e87054ef38564a5ccfb0ef7d1993461cd82bf46b692cd6e7bf75530b38b1475a54026bc73d9ea93cff592d31df28206a3e9 SHA512 5061c2c1498b94ee14c78512ddbc8671d50f19031931dfbae61501c88fc6fb43302806a5da815e4a14249525d277586713093cf23257d8f1260eca237f9fb795
 EBUILD camlp4-4.10_p1.ebuild 1070 BLAKE2B 657cb82026e41f73108b3e17b037c5db39940327bab6a0b3c1ce2e21c995d77ceb6679bdb6fc05ee15a18f1daf6a9f0f4f1f15c46a6b718163628ff14a855ecf SHA512 c559a97688601ad409049f0a1a069a8aec654d37ae065f7f4adeb5e997ac4289bd6170c3209c35ec29451f75110c17c9b57751f13d19459145989b55bfbfcb72
 EBUILD camlp4-4.11_p1.ebuild 1070 BLAKE2B ccd8d0e94a8e4cac98cc1065531d92540e5ac51899cc5a27dabb46e84e40618a083c9b56ee3c2c056bed2a6a679a63fa91d253f8b2a1ed51d18857a05e750bc9 SHA512 9a953260137eaa8d1da68b3b9d9a6ab56536d2fce751cf644c39bf362e94f306adbafcc2afadba0262835e6e08774aca707db31431c3a47b96e9566033da3ad0
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
deleted file mode 100644
index dd82d7f3b238..000000000000
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_p/+}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="System for writing extensible parsers for programming languages"
-HOMEPAGE="https://github.com/camlp4/camlp4"
-SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt"
-
-DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
-
-S=${WORKDIR}/${P/_p/-}
-
-src_configure() {
-	./configure \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="$(ocamlc -where)" \
-		--pkgdir="$(ocamlc -where)" \
-		|| die
-}
-
-src_compile() {
-	# Increase stack limit to 11GiB to avoid stack overflow error.
-	ulimit -s 11530000
-	emake byte
-	use ocamlopt && emake native
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-META
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
deleted file mode 100644
index d59f89100ed6..000000000000
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_p/+}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="System for writing extensible parsers for programming languages"
-HOMEPAGE="https://github.com/camlp4/camlp4"
-SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt"
-
-DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-ml/ocamlbuild"
-
-S=${WORKDIR}/${P/_p/-}
-
-src_configure() {
-	./configure \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="$(ocamlc -where)" \
-		--pkgdir="$(ocamlc -where)" \
-		|| die
-}
-
-src_compile() {
-	# Increase stack limit to 11GiB to avoid stack overflow error.
-	ulimit -s 11530000
-	emake byte
-	use ocamlopt && emake native
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-META
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index 9f24378062e0..b76dbc54cd6e 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -1,9 +1,3 @@
-DIST cmdliner-1.0.0.tbz 46542 BLAKE2B 7a667e218c298dbe4f5ba8ff034f15596e9b89b1a267fbdf7f6f811e42d61b103b08a2c8b9bd45e83bb249ae5ed078eb646630cd8a174af267354b25dc13ca54 SHA512 3fc87e49504167864ba4d81fde7bbaa01b7d58b06e2b68b36647857590f41fdc8b3bbd547418f8159b0e76628236b5c30301404b3d8d57e2ff3f082228eee73c
-DIST cmdliner-1.0.1.tbz 46614 BLAKE2B 609220b8dbb0aa5ade9f504f420ed7c6ee1ad9aa1f9cd02b1edba60b86791e59a12faca0ebe6ed9cbb5fbeefdfe25b524509bf311f1611022b6c62ae38df01c1 SHA512 b792dab3a7f53f69d74d07acbb013e48235614e29a477b7e9e7d7b58013d47ff842fbaeef50acda305434185325855ef83d839d5acb0ccf460276f0ca880ee7b
-DIST cmdliner-1.0.2.tbz 47350 BLAKE2B 226481c73e66fb45a69b563bef9f95c6a04b782072643fd8e66e4da4907f899a72e2b4e1217b46c3a1f417bf9e4be193c3528da09954808043e4abf47be4d5c2 SHA512 d718d9abe4fe0ea0e7453ed09e57de2a427cc450225cf2b56513d99af4b4218c3fe96ab08dcebd202b9ecf25a471bb7c67511262f35148dfe15684421be6d743
 DIST cmdliner-1.0.4.tbz 49558 BLAKE2B 8ea922a22d08fc4cce6c0aff1adff9a2fcdaee8e13b7bdfad4a08b459e8a6557761fa70c9e34100bc8baaa4113e5729f2daf297fc1f618bd8c30b9323bb87ba2 SHA512 4cd1cc0932b8bbd607160cc9816b35c12a68a358a35ffcb6827f547052dc517e871a91ddbaed0447cb1fa5fdf510cdf5d760e8e5c1e4548f82e1d523e2b3ecb3
-EBUILD cmdliner-1.0.0.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
-EBUILD cmdliner-1.0.1.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
-EBUILD cmdliner-1.0.2.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
 EBUILD cmdliner-1.0.4.ebuild 1071 BLAKE2B c01b7fca5f865e517439b5f14df8614a55b46002b47f6d8b89dd47029ca807bbfea57aa5e02559ee76e168447a50edd65d52110730a57d45af46e544f5e1888d SHA512 9ca92c90e2686d3d3f5fcc1df014f14b40ceedc1107f7e8f1a4f0ab35d8973e52c409fa9f03a6d084c9b03a8f579873eec69bc75a3c64a23aff2a54f0a05da72
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild b/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
deleted file mode 100644
index 33b960914162..000000000000
--- a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="https://erratique.ch/software/cmdliner"
-SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/topkg
-	dev-ml/ocamlbuild"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--tests $(usex test true false) \
-		|| die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
-
-src_install() {
-	# Can't use opam-installer here as it is an opam dep...
-	findlib_src_preinst
-	local nativelibs=""
-	use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
-	ocamlfind install cmdliner _build/pkg/META \
-		_build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild b/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
deleted file mode 100644
index 33b960914162..000000000000
--- a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="https://erratique.ch/software/cmdliner"
-SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/topkg
-	dev-ml/ocamlbuild"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--tests $(usex test true false) \
-		|| die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
-
-src_install() {
-	# Can't use opam-installer here as it is an opam dep...
-	findlib_src_preinst
-	local nativelibs=""
-	use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
-	ocamlfind install cmdliner _build/pkg/META \
-		_build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild b/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
deleted file mode 100644
index 33b960914162..000000000000
--- a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="https://erratique.ch/software/cmdliner"
-SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/topkg
-	dev-ml/ocamlbuild"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--tests $(usex test true false) \
-		|| die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
-
-src_install() {
-	# Can't use opam-installer here as it is an opam dep...
-	findlib_src_preinst
-	local nativelibs=""
-	use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
-	ocamlfind install cmdliner _build/pkg/META \
-		_build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index bdbb39b45504..adc5f61c37f4 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,6 +1,4 @@
 AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
-DIST cudf-0.8.tar.gz 55147 BLAKE2B c091a55e438979f73bfd5fd16f1e793ec984b24becc902e6eed856afea0f39586001174847b8626bbf162c2b51cbb98cdb60d9539c9aac0a1d651b693e686704 SHA512 cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3
 DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
-EBUILD cudf-0.8-r1.ebuild 1369 BLAKE2B 7745e2dcd6ded40d3bc34847f651086156d4425c4c88bea34fde1a10c9e224655625c10bcc4acdd74a67f1e1ecc67c11e9d78cb9cd9d79ca1c88ca808dcd7d87 SHA512 45c6b14fb173794aae906e2b103cdec0c546b7e07954c0bbfa6180f056ceaf58e0915748aed957e2206dff59b040f38e9461873dc1112202fc314aaf3370d577
 EBUILD cudf-0.9.ebuild 1642 BLAKE2B 0bac926cdaba47d0a1204245191cb84c243ebe001bf4d272905832896739e3228939e2eaa9735b0a5fea049b946c5ab6b1dae77ff51c6ef249fa545de3da2e98 SHA512 8f9c6ddac87ed93c18ad19c08057424e0c004d1283debbdbd67ad57af1c5cce6da62dcba62cfae04fc4fe10bb9de392c9ad096c0108ac7a15094ac454d8dbd87
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/cudf/cudf-0.8-r1.ebuild b/dev-ml/cudf/cudf-0.8-r1.ebuild
deleted file mode 100644
index 682642554816..000000000000
--- a/dev-ml/cudf/cudf-0.8-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
-HOMEPAGE="http://www.mancoosi.org/cudf/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/34659/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/extlib:=
-	dev-libs/glib:2
-	dev-ml/camlp4:=
-	dev-ml/cppo:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-	dev-lang/perl
-"
-
-src_prepare() {
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		Makefile || die
-	sed -i \
-		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
-		c-lib/Makefile || die
-	sed -i \
-		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
-		c-lib/Makefile.variants || die
-
-	tc-export CC PKG_CONFIG
-
-	sed -i \
-		-e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \
-		c-lib/cudf.pc.in || die
-}
-
-src_compile() {
-	emake -j1 all
-	emake c-lib
-	if use ocamlopt ; then
-		emake -j1 opt
-		emake c-lib-opt
-	fi
-}
-
-src_test() {
-	emake test
-	emake c-lib-test
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-	dodoc BUGS ChangeLog README TODO
-}
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 08e7827b7b85..c5d3ba1faaba 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -2,5 +2,4 @@ AUX ocaml406.patch 1623 BLAKE2B 741d94b936ed59aa3b158cca587ee2aaddb72e06703cbeee
 AUX unix.patch 406 BLAKE2B 270b1e747ab9f270c49ea2ccfee0734600160f1db2f6ee912467989e1c59b31a0840d3a83fa857000b50a5a61d29422629bc9eb2334c7b08db93ef43d12229f7 SHA512 f6d7a3d100c425767ce304c620376cf815b8de59b04aea7ee439e79159cb7aa96cf1903498173d341fcf8d61391edf0b183ab4cda17ce91f41db9aa25ae8aff5
 DIST dose3-5.0.1.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
 EBUILD dose3-5.0.1-r1.ebuild 1678 BLAKE2B 4d9ee4f7be0f91bdbbd92d256202e0a7f4f93ada147e95d4b8df002d0583636d87a81e9d59b060b13b51560786099c42451f6c5a1f31f2766c994878fcd39308 SHA512 ab0fceac967da108330269bb6b8a845e9a6406ffd3aaf83fb2ca16fa5d1bdedf31c05ab1986823e2c9b39ed1ec83409b1c2e369ad556dadb03e85d518e059ba2
-EBUILD dose3-5.0.1.ebuild 1541 BLAKE2B d1bb17c74e7f0882ff94993c4aa1cefaed79445cc413d827e4ba9283df807798f9f11510dcd8078beb7b382c0c18127b269e80ea187e72c12b5c9cc32e885e44 SHA512 01cf87d3a0e2f817801ecdfadefb8e34f18b2676b34488559c324020edf76ceccd5268941f20edaccfd75a4275c1a724f2a7f7d9352a165c438fa0b977878ab5
 MISC metadata.xml 474 BLAKE2B 51884c8074342dbbe0e961495b12b69460ba0429134c50a75c68008fe54a8ea89dce28e114553b433f7c8dca503daee89b858c92995fd0aa4651bd1335e87a62 SHA512 245deea20a81b03063b19e4146982bd6a6d64b363153cdcdde811800c64f8d72861f749eac232f6530889ceb2fa84828db83376039868d3a097b488ba6331ee2
diff --git a/dev-ml/dose3/dose3-5.0.1.ebuild b/dev-ml/dose3/dose3-5.0.1.ebuild
deleted file mode 100644
index 161fafebbd3f..000000000000
--- a/dev-ml/dose3/dose3-5.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_P="${P/_beta/-beta}"
-DESCRIPTION="Library to perform analysis on package repositories"
-HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/cudf:=
-	>=dev-ml/extlib-1.7.0:=
-	dev-ml/ocaml-re:=
-	dev-ml/cppo:=
-	parmap? ( dev-ml/parmap:= )
-	zip? ( dev-ml/camlzip:= )
-	bzip2? ( dev-ml/camlbz2:= )
-	>=dev-ml/ocamlgraph-1.8.6:=
-	xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= )
-	curl? ( dev-ml/ocurl:= )
-	rpm4? ( app-arch/rpm )
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-	test? ( dev-python/pyyaml[libyaml] )
-"
-# missing test data
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
-}
-
-src_configure() {
-	econf \
-		$(use ocamlopt || echo "--with-bytecodeonly") \
-		$(use parmap && echo "--with-parmap") \
-		$(use zip && echo "--with-zip") \
-		$(use bzip2 && echo "--with-bz2") \
-		$(use xml && echo "--with-xml") \
-		$(use curl && echo "--with-curl") \
-		$(use rpm4 && echo "--with-rpm4")
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install
-	dodoc CHANGES CREDITS README.architecture TODO
-}
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 0df8ca5f7f7f..d164822ea909 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -2,13 +2,7 @@ AUX externalmeta4.patch 675 BLAKE2B 14c3b5c3a2cd0b0224849cce401752c32658a5d0426c
 AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813d2e2fca76c1546bd883d4992c0fd14938b8be1c6c72a5597d52b92e1b324a6e59db58667493685fb3b9c SHA512 2a1e14a3eca3f95ee29e1902324469ab11f117012db60d2f34e0ab7818a44abaebd023562a6f521db7451691219461c453ba5f3fcf424e2fe65e407a11741863
 AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
-DIST findlib-1.7.1.tar.gz 256883 BLAKE2B 7459082dee3cd04045e8dbf59bc82075eb1c24bb8daff4a58d0002d7962ab19c5635ebb0551f29f99f37f1e08acd8eaa4dcd99d213438ff7a77cfc36ddadedd1 SHA512 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4
-DIST findlib-1.7.2.tar.gz 257747 BLAKE2B 826993e9d3e5a9dab9084b006347a0324c848aa50a42ba1daa0d76010a0cdbf6e1ae9f0754dd3bef84f043ee43c3bd9775284a73ee5b130b678834d14d4ddb1c SHA512 f2aadaf8630482785ebfe6788bfea6716defdd6ba94e7f4e3b743c3415fa5b169e31301d605857823e9c74f7bd2f774399ee32a8acb35e64ce0cba5e98e4dd2c
-DIST findlib-1.7.3.tar.gz 257703 BLAKE2B d69687ee4b75bd7ba514c5507bd474764cfb76f0502ef613c3dd8d8e9e92b5f12704c101b9228d71f2d9f151ab5e63b4352b759a2c7a2694f23b10b6c4e724d2 SHA512 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.7.1.ebuild 1664 BLAKE2B 1af93d91835630f39c86177dfad22f82ec8f9e64ef259a27b325fb5867aecdb1ba413970d004d2e110be24ab26cccdea83e188a68d3826e721bbc69f5d49cf31 SHA512 539b7b1ec074f1c74be90a02c9f98af06129c2703249ef295dbb1210c24c10bf8b2928f7658aefd60d625e9beb68a6003e545444a826acb26f7e685605453e19
-EBUILD findlib-1.7.2.ebuild 1669 BLAKE2B f81ce1f06e38ea45989f44411a33bc5fbaed3cc0c7874750b9609d8843af38e1ab59c00a9a51903e71d09ad8ce1fb575a11d959292eede547dc7edb392ef8429 SHA512 40ad1ccd4d6073356d2bd7b98420db133e0d762679d6250774eed21eed46a37b058ff6d47224fe7a7aa60d919ae2eabc6a177a56c7a6311f1d7f1c9ed55b6358
-EBUILD findlib-1.7.3.ebuild 1682 BLAKE2B ee700751e5f7c66cd8b4e72e430d9b12dea14925cc7d5b2037cc676f8e1375e99ba27e63f5927477c3e57654227aeb5bcc75ea2308f4da4521cf8df5493d1e0b SHA512 ab52c2255948d5864d2eb27c6274b1816bc8b31a98a13c68fdf9e804d029e0a309e57d542e68ccc7dba63de7a9f070a1736d87544f4a8d534e2e9f0a344a7c38
 EBUILD findlib-1.8.1-r1.ebuild 1672 BLAKE2B 13c847cab7bbb9b4d3fb748e4d1150ed6c4e28337e4234a155b411fa10665c1ff741663089a6bb9369797e8b96bb554fbc82ceb55a57d5497eba5bf96c059351 SHA512 6a71a4b101c6787060cb9413e8a02f40fa62b0a0780fa91e64eb59badd03b3b3f1e043dd52482150e88409046a5d8da421f306d91f3d7fa64fa2e4087e994865
 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.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild
deleted file mode 100644
index 3dc2daf05896..000000000000
--- a/dev-ml/findlib/findlib-1.7.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib eutils
-
-DESCRIPTION="OCaml tool to find/use non-standard packages"
-HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# it does not compile with ocaml-4.09 (bug #708696)
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	tk? ( dev-ml/labltk:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/externalmeta4.patch"
-	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-	export stublibs="${ocamlfind_destdir}/stublibs"
-}
-
-src_configure() {
-	local myconf
-	use tk && myconf="-with-toolbox"
-	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
-		-sitelib ${ocamlfind_destdir} \
-		-config ${ocamlfind_destdir}/findlib/findlib.conf \
-		-no-custom \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt # optimized code
-	fi
-}
-
-src_install() {
-	emake prefix="${D}" install
-
-	dodir "${stublibs#${EPREFIX}}"
-
-	cd "${S}/doc"
-	dodoc QUICKSTART README DOCINFO
-	use doc && dohtml -r ref-html guide-html
-}
-
-check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
-	local ldconf="${ocaml_stdlib}/ld.conf"
-
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
-	fi
-
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
-	fi
-}
-
-pkg_postinst() {
-	check_stublibs
-}
diff --git a/dev-ml/findlib/findlib-1.7.2.ebuild b/dev-ml/findlib/findlib-1.7.2.ebuild
deleted file mode 100644
index de59d46e91ac..000000000000
--- a/dev-ml/findlib/findlib-1.7.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib eutils
-
-DESCRIPTION="OCaml tool to find/use non-standard packages"
-HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# it does not compile with ocaml-4.09 (bug #708696)
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	tk? ( dev-ml/labltk:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/externalmeta5.patch"
-	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-	export stublibs="${ocamlfind_destdir}/stublibs"
-}
-
-src_configure() {
-	local myconf
-	use tk && myconf="-with-toolbox"
-	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
-		-sitelib ${ocamlfind_destdir} \
-		-config ${ocamlfind_destdir}/findlib/findlib.conf \
-		-no-custom \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt # optimized code
-	fi
-}
-
-src_install() {
-	emake prefix="${D}" install
-
-	dodir "${stublibs#${EPREFIX}}"
-
-	cd "${S}/doc"
-	dodoc QUICKSTART README DOCINFO
-	use doc && dohtml -r ref-html guide-html
-}
-
-check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
-	local ldconf="${ocaml_stdlib}/ld.conf"
-
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
-	fi
-
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
-	fi
-}
-
-pkg_postinst() {
-	check_stublibs
-}
diff --git a/dev-ml/findlib/findlib-1.7.3.ebuild b/dev-ml/findlib/findlib-1.7.3.ebuild
deleted file mode 100644
index d77ea4b9afe4..000000000000
--- a/dev-ml/findlib/findlib-1.7.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib eutils
-
-DESCRIPTION="OCaml tool to find/use non-standard packages"
-HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# it does not compile with ocaml-4.09 (bug #708696)
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	tk? ( dev-ml/labltk:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/externalmeta6.patch"
-	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-	export stublibs="${ocamlfind_destdir}/stublibs"
-}
-
-src_configure() {
-	local myconf
-	use tk && myconf="-with-toolbox"
-	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
-		-sitelib ${ocamlfind_destdir} \
-		-config ${ocamlfind_destdir}/findlib/findlib.conf \
-		-no-custom \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt # optimized code
-	fi
-}
-
-src_install() {
-	emake prefix="${D}" install
-
-	dodir "${stublibs#${EPREFIX}}"
-
-	cd "${S}/doc"
-	dodoc QUICKSTART README DOCINFO
-	use doc && dohtml -r ref-html guide-html
-}
-
-check_stublibs() {
-	local ocaml_stdlib=`ocamlc -where`
-	local ldconf="${ocaml_stdlib}/ld.conf"
-
-	if [ ! -e ${ldconf} ]
-	then
-		echo "${ocaml_stdlib}" > ${ldconf}
-		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
-	fi
-
-	if [ -z `grep -e ${stublibs} ${ldconf}` ]
-	then
-		echo ${stublibs} >> ${ldconf}
-	fi
-}
-
-pkg_postinst() {
-	check_stublibs
-}
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 73c0aeab1d0f..d997257d28ce 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,9 +1,5 @@
-DIST menhir-20170712.tar.gz 855262 BLAKE2B 259a165f30f18720ff2fb3457a8ee51dc63202860a9ad097ad6e49e2666480019b7011a11764f2c3780cf12a246c313058a35f07d100c891e07ba3ed7cb20cca SHA512 7850fa031a2bd69e9cf17db6d8f82f716ab5f9e60b34d1a53591a3ff46750fb01880f3282a7194465441abc4c2ba60f543646097f5f0eef6fe78b36266a3dbdc
-DIST menhir-20171013.tar.gz 854000 BLAKE2B d50ce48d32d3bfd588520d6e5a8af4ea628089010fb286df6f87ee3f773273427f9ac6956b4b4bc1c27592aaea1f29447f0223b6b29d9cd0533c47d10eecb318 SHA512 ba6359c471aee62c996bd6495612f444e7ac226f7aad9991a76e4daa2df00cdec2387c488c6a29246ca48079bd8199b94de09a44f1fb05465cbeddff0b39df54
 DIST menhir-20181006.tar.gz 6665871 BLAKE2B 98820922c3dc9ffa27e0f9432d683aae3a1115cd5ba7d1114c57730c7dc679a918c14ef692d1287ca851c62d32aca50a034de1d4c6d4049ddf80e4694bbbae3e SHA512 a838c0b6411345ae64e21f8649367541a7e137af7e552e1dcc3da0c2212813de3d0c359dbd863d0130be897148063b406e0757fd2f18b42d43d3964963ebd4c7
 DIST menhir-20190924.tar.gz 2491000 BLAKE2B 463825aa0f3ea41e49d9c130226bc8bbfc2b96650debf8d79422a90b93338ead58e01aa0c34b2161e4383d1c9a8d77ab58bb1da78e3187ed60b02e13f7742844 SHA512 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
-EBUILD menhir-20170712.ebuild 894 BLAKE2B e62e9439edd990293f8ab860de8603a3acfcebaeb8d1822362722eca9fbe2cdd6d515ce744c40a03c7ea97f903c29f8a8c874ec004fc2b7e30cd32a529ac255f SHA512 aa34340bdb35e4e928513c2bed7c5d6f146385d8b5b6bc5a5a1e82ec9d2bf9fb4cf2c4d172f92ba547ddfc2a7b042d0138490e856228dc35c4dd0b8254e8f3c1
-EBUILD menhir-20171013.ebuild 890 BLAKE2B 3de73ccdf507992b5bf71d813d85d669ad4c849fda53a05e3d797abaae8b84f3d298d0f7c7fac9faef70d16fc9d15573a653af1ba7bcf7c6483fb19b79557d29 SHA512 6a8c92fb546d5812910ea8ad9a2bb1de9ba1ed022b382c0b24932da132d35d4f18a2094e91c541171b7678831324cb4b34bd376e8bbfe8c3507b1f392affce5b
 EBUILD menhir-20181006.ebuild 890 BLAKE2B d9bdda28d00ccc0f528d6f7a43abc8b9d394073b5592fef9857b2c06092a6d8f0f7de49bea4b974379b0d789e4de044f456f65984f2575665cb4e2296379525d SHA512 420da808f42896ece95cf6b9487140a3509e1a60cd6c4f4fabd9fadc0c894d3cb054e51e52d6aba16d52ae1af6832dc461eec8fba65e0db12edfccec00d0fb2e
 EBUILD menhir-20190924.ebuild 905 BLAKE2B f04704503fd1c2e8f6375774969e53838798c07ff7109ce5773f509ab5e3d236cb6071c28e83f173ed0c843b343e269d7aa1f46f809aac1f32ca78a053dccb6c SHA512 8450caaa0657159ae143769b4d36169367bff66436a8264ce9d45427c03f3ad266fc04034033ae72e17e6ac6684b291aca91f911393fbb4997f6c0babc3596db
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/menhir/menhir-20170712.ebuild b/dev-ml/menhir/menhir-20170712.ebuild
deleted file mode 100644
index 51e7184f445c..000000000000
--- a/dev-ml/menhir/menhir-20170712.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/menhir/menhir-20171013.ebuild b/dev-ml/menhir/menhir-20171013.ebuild
deleted file mode 100644
index b34b8feeb563..000000000000
--- a/dev-ml/menhir/menhir-20171013.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc README.md CHANGES.md
-}