gentoo resync : 18.12.2020

15 files changed, 10 insertions, 271 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 38ce002ed14a..66dbadfef331 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
index 70fc63a89309..9eba12c62357 100644
--- a/dev-ml/cairo-ocaml/Manifest
+++ b/dev-ml/cairo-ocaml/Manifest
@@ -4,6 +4,5 @@ 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 1951 BLAKE2B f2f5d85f5ca53294fefcaad7ea08c45a3b6926ed3484a6cdfd9da01ec6d8f9cb57e8de938004b44ac9306959cf2e15649773ba93d5241150f957c72b0d24396f SHA512 05a793768810c7a114f73672e1e7a58f384c1a0a834e588700878eb41d989d50276ed822775d72dd3904a001be3ca192fbc8b86bfd6e305e5a8b604e5e225780
-EBUILD cairo-ocaml-1.2.0.ebuild 1896 BLAKE2B 50549894df7f733d386d7611fa9adde2325e20acb0731adc5b1eb760c385f6292acb0ffefabcd2a0bece62c7de481997fb1dd937f68fdc216d90b92319f5dfe3 SHA512 b1ce1ed398e94271e9a608b1abd3d3be2543065111c1d6826e19db71022f3b898de1c97d524884a460de9ba841b4c7074f68561d353c5142cb2bb7b83d569707
+EBUILD cairo-ocaml-1.2.0-r1.ebuild 1950 BLAKE2B fbe82ba03868919e71c3e55e20d38e443616458a3493a8a8ab598af78e481dde3ffd31c3aa0d347093961831ca05444f62c1eb4a58724207da812bdde928836a SHA512 a772d777572b0c7b17e416c636067718d2b71029a2c017ec7b8fa8c18c438b56f737742ef40b8ea2f0ac811de0893eb81c62f5af78c0facd480280b54b1aa304
 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 19eead630c6c..f05710bc7330 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/cairo-ocaml/cairo-ocaml-1.2.0.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
deleted file mode 100644
index c9c07c183718..000000000000
--- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils findlib autotools
-
-DESCRIPTION="Ocaml bindings for the cairo vector graphics library"
-HOMEPAGE="https://www.cairographics.org/cairo-ocaml/"
-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"
-IUSE="doc examples gtk pango"
-
-RDEPEND="dev-lang/ocaml:=
-	x11-libs/cairo
-	gtk? ( dev-ml/lablgtk:2= )
-	pango? ( x11-libs/pango )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# 3 patches from debian and one for automagic on libsvg-cairo
-	epatch \
-		"${FILESDIR}"/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch \
-		"${FILESDIR}"/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch \
-		"${FILESDIR}"/0003-Fix-FTBFS-on-bytecode-architectures.patch \
-		"${FILESDIR}"/0004-no-automagic.patch
-	AT_M4DIR=support eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gtk) \
-		$(use_with pango pango-cairo) \
-		--without-svg-cairo
-}
-
-src_compile() {
-	emake -j1
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README ChangeLog
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.ml
-	fi
-	# ocamlfind support
-	cat <<-EOF > META
-		name = "${PN}"
-		description = "${DESCRIPTION}"
-		requires = "bigarray"
-		version = "${PV}"
-		archive(byte) = "cairo.cma"
-		archive(native) = "cairo.cmxa"
-	EOF
-	if use gtk; then
-		cat <<-EOF >> META
-			package "lablgtk2" (
-				requires = "cairo lablgtk2"
-				archive(byte) = "cairo_lablgtk.cma"
-				archive(native) = "cairo_lablgtk.cmxa"
-			)
-		EOF
-	fi
-	if use pango; then
-		cat <<-EOF >> META
-			package "pango" (
-				requires = "cairo"
-				archive(byte) = "pango_cairo.cma"
-				archive(native) = "pango_cairo.cmxa"
-			)
-		EOF
-	fi
-	insinto /usr/$(get_libdir)/ocaml/cairo
-	doins META
-}
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index 8cfaa03d56e5..b5f193dc9065 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 495 BLAKE2B bf485604d6a8875dfd6248274645cf1b9d7da5b798567fa84dcde24998db237d4508f910d73c673577dd9bf035e9571899790745e6d261537c9ea3dca1e076c9 SHA512 26c4a9391eeeec71df98f28bb5d0f6cf75c71216878cf35675ab07d537128c4d1c56a9d0dda21f1d881f8a4ad58cd1fb79437cda8a3096a9ba25aeb0b89256db
+EBUILD cppo-1.6.6.ebuild 494 BLAKE2B 46d27c808928cce0b416d174a675b4662821c5da078e4e501733adddcdb91df702c97f829de8bb8a09b1e18cffcf8f790d2cb129bef0b55d4ff8f23bfb783b4c SHA512 fd55f02cb284c211de1f39d4c98baf866ab5eb8df5653816bdc94ba19072cc75d64c8e2d50a678172b5689915d8e605bf3dd032a7c4e12dc53004edd4f5e241a
 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 320c0464d7fa..893668e3e2a6 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/dune/Manifest b/dev-ml/dune/Manifest
index 2fc56835df3d..34614f685ee0 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 755 BLAKE2B 70fa67419edd45e0409bce5eb0d19d61ab7bc063d291d39db6c1e52b602a9f08736bfa8ae3ba1ad9c2ce28d3601257b47f1426378f0089c4f52faf43bf5642ce SHA512 a49efae0cebe240a57210f3c2a62cd6425f86da71cfe9b81676a18f93dfd245bdca6ffcd98aba37fb5663aeeaa46e33b6598063622da23dd16090b5e610a5ddf
+EBUILD dune-2.7.1.ebuild 754 BLAKE2B 9ce38f0520e2d851dba0949ab45b45764e76d9c1b1c50a75850e715deb4ef4aa7d2ba4774eae55eb3227b19d5ab0ad04a6ae23eb1bb044b17f0d895bb404110d SHA512 99826621d5b4d2be503e7c21f16382f31abd3de0c71dcc0d9edd5fd6e5c425a2de6f6be01fdd5b251efe3c5aadb500b03a1e989f91ae7cb560bba6345c4fae0c
 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 36da8ec6f77d..010bc0fc6a56 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/extlib/Manifest b/dev-ml/extlib/Manifest
index e3cdc4516522..2e1fe7419b31 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,9 +1,5 @@
 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.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.6.ebuild 844 BLAKE2B 1aac975321754c837889f58a9899ad546ed04790bfe697aad4e65058a85d6c47ed997f5f72fc4e13064635bc4acf4e4a6ad07fce00e32080b4e6176b7080fe31 SHA512 57c1ac05e1456012a35518ad52709e806052e4cd06b22c150852cd8fb7113b1a1504c9fd18add5f1cd366966b040bf298d7ae75ffa74eb3ea2494342cb3f5887
-EBUILD extlib-1.7.7.ebuild 975 BLAKE2B 444b1f422390cc7b2d13a2023ca0b68fc029e73b7829542434d0add44711be0eee321fabaa7f064829ca13dfbbf5d264046e8cabe4e43b9094dfd1065bc53ddc SHA512 20d8f8b27d6e25d0f19d432e27f07f950c5689bc69ea745257eec47eea4527d144227435e1b659bbc7b80b26967aecec6194e38491ba6516a3f425981fa1aa94
+EBUILD extlib-1.7.7.ebuild 974 BLAKE2B 088462e2f36d5f72718565c76e6c757192edfb0676328ffdffb025d7584af021f65e9ea5316720c5eab2ef559c99748e2f3433b77ead7e733bb3b85b89e6f153 SHA512 a8a764739942c825d62f05386ecc7b3a355890215133d9084f4bdb0e2b66fec6edae32e7d549926c10986114ef84c72c8baa35a85ff42adda2cd716af072f439
 MISC metadata.xml 384 BLAKE2B 5cf5e456304e88b37a2a9635fecaa5536bb2bd58eda884676f93545969a3361eee4a0c94750352eef6fc7c63117391f58fb4a8bb9eec18ea8eb3dfb3c2f017de SHA512 88ad9b420b173c120be33305275c08becbce8c8490421cafffc1ba64131b27ebd88cfb8b1951d2e780c9eb93b45c38f9de83f2a134812edc38103e28f05f5f05
diff --git a/dev-ml/extlib/extlib-1.7.1.ebuild b/dev-ml/extlib/extlib-1.7.1.ebuild
deleted file mode 100644
index 6cdb6da3e65f..000000000000
--- a/dev-ml/extlib/extlib-1.7.1.ebuild
+++ /dev/null
@@ -1,51 +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 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc +ocamlopt"
-S="${WORKDIR}/ocaml-${P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/ocaml405.patch"
-}
-
-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.6.ebuild b/dev-ml/extlib/extlib-1.7.6.ebuild
deleted file mode 100644
index f3159e67c8f3..000000000000
--- a/dev-ml/extlib/extlib-1.7.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-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"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-
-S="${WORKDIR}/ocaml-${P}"
-
-src_compile() {
-	cd src || die
-	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
-		dodoc -r src/doc/
-	fi
-}
diff --git a/dev-ml/extlib/extlib-1.7.7.ebuild b/dev-ml/extlib/extlib-1.7.7.ebuild
index 008178d6306b..3e4ea690aacb 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 8e023fa8d803..03cec4dd980d 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -3,6 +3,5 @@ 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 1668 BLAKE2B 84307716d465e5d10b0df3f37ddd5a7533dd07bce02827d7c5fa2fafd1be51d26be90f4cccb78c1add70d00865fd812380a7cacd9445973ee7695f2272ed212e SHA512 e94c9836cb19b1eb59b33f7570b9104d697d73ca6af00d3a0986f7823ca726cc6106bf6f124aa9955e283bc9810ad85f32186345357f03438936f6d54323ca59
-EBUILD findlib-1.8.1.ebuild 1681 BLAKE2B 3e4cca14ddb76b0dc5dcc5f2d94ca4bf4b7e8cdd26696a5b104434195a2b73fb43bcf27338ac7444a4d80ce58cf868d3d309bf1fca59b54d4b30aa398e27a9d4 SHA512 f2de64a87a1f859c2840a849246934052baad12cce4708eb592d63df20915569a6f69c87b9936c3951b2c856d42e50ab3ade8f2182197deb9631be14150e0862
+EBUILD findlib-1.8.1-r1.ebuild 1666 BLAKE2B dc1031afd592e0b82a11768991bc6c13d2034ce0354d8659d18397366e3eb4d5bbac50b1f62d0b944ec3e298cdd2ffe3134d10a16a9d2c2f53d8528188fc44a1 SHA512 ea9348133fa3c07f312121ea5a02e255cf5848ee6bc149972cf548df0531fb87e4c388d72e7134d0afdb61908d29390b6182aec36fe244dea51b6e3d3585dad7
 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 6880e1c5c7a4..9c3988c304ea 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/findlib/findlib-1.8.1.ebuild b/dev-ml/findlib/findlib-1.8.1.ebuild
deleted file mode 100644
index b2c69240deb4..000000000000
--- a/dev-ml/findlib/findlib-1.8.1.ebuild
+++ /dev/null
@@ -1,73 +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"
-
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
-	tk? ( dev-ml/labltk:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i 's/\$llabltk \$lcamlp4 \$lobuild//' configure || die "Unable to make meta external."
-	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
-}