gentoo resync : 30.09.2020

13 files changed, 121 insertions, 158 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 20e65f79f34c..c1faffa927ea 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index d556f47ddf5d..8aceacc3d0b9 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,5 +1,3 @@
-DIST alcotest-0.8.1.tar.gz 24358 BLAKE2B 4f905cb478183015355b7bed85b2b20de6880b64d6425a4804cf050dd95fe024e83d9c2f6b57f908bdf7eac650cd2133811219fd30de0c45fa0e66caa3178980 SHA512 76224df2d4923e666fd844a0735f2a23035454bb3c3aeb6a6f8d19376342f0f94f39a401d6225af3f90cddd2f65aa779ce87e42ee8d82e6b3ca33730d4277253
 DIST alcotest-0.8.2.tar.gz 25456 BLAKE2B 6f3362dd83d127600710a9efcf5428ce1d960a2a8798a533c3216d7c8934dadd38f672f383e45c0a0ab441e723b4c6477a3c92905e2351e81bbfda324e373e69 SHA512 df1cf5ab42e91a66cae2913504d6825f842169332b8673047faea769966f62d61cb1c288325a840211df0b22c31208566cf754b0816bfdf5d8ef34e8c5127668
-EBUILD alcotest-0.8.1.ebuild 642 BLAKE2B 882f487e41026d7d61b9b87feb03cde4c88076842e946053bc846e55bd708f416ea4eabea1d0d4fd25d1f9e8e86bee325b8bd00abe9d399b7810ab5bfdb004c8 SHA512 55f2359e9f260b46559c86190268854c925a9c5771e8072ab99f7d82cae7ff9a8efff36f5a0ddea83f6bb00aa119baf51936d44be56e8bc9f130760ae504f9c9
 EBUILD alcotest-0.8.2.ebuild 642 BLAKE2B 882f487e41026d7d61b9b87feb03cde4c88076842e946053bc846e55bd708f416ea4eabea1d0d4fd25d1f9e8e86bee325b8bd00abe9d399b7810ab5bfdb004c8 SHA512 55f2359e9f260b46559c86190268854c925a9c5771e8072ab99f7d82cae7ff9a8efff36f5a0ddea83f6bb00aa119baf51936d44be56e8bc9f130760ae504f9c9
 MISC metadata.xml 247 BLAKE2B ddda0ea2f5068bed824871d1b734188ba122a58d22ab67fb491beb7d48349ded25fb96d6c95f0efa4c756d44a7e30d8a78b0a2b8020fb35b2715c4ea3b41c02a SHA512 4fda15644be2ad3faf61b9a05fad67cdb8ac023dd63de9e0fb034396a38c512d51721d299e07881521fac159d18ba7561fa614980b7ccb60b741fec24e1ef609
diff --git a/dev-ml/alcotest/alcotest-0.8.1.ebuild b/dev-ml/alcotest/alcotest-0.8.1.ebuild
deleted file mode 100644
index b0d314768165..000000000000
--- a/dev-ml/alcotest/alcotest-0.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit opam
-
-DESCRIPTION="A lightweight and colourful test framework"
-HOMEPAGE="https://github.com/mirage/alcotest/"
-SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/fmt:=
-	dev-ml/astring:=
-	dev-ml/cmdliner:=
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/findlib"
-
-src_compile() {
-	jbuilder build -p alcotest || die
-}
-
-src_test() {
-	jbuilder runtest -p alcotest || die
-}
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 094c613e49d6..29c78836b890 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -5,5 +5,5 @@ DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a329609
 DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
 EBUILD camlp4-4.04_p1.ebuild 1080 BLAKE2B a82e0f1ef9b7ad40793b6d084e1bade7a161d5cadc60b2813cacff2e85b4334691297bf4583bdbe9de66a3bf5f9704041b32429e7856eb4ce7374fb835a98472 SHA512 d0bb1de5714a47bce471366a3237d07a292a10a7609e6503a154e71c4a58a900ee023e0089241a5f156ee74525eee434f5d6489677ebd58a59a0ec0d769ac306
 EBUILD camlp4-4.05_p1.ebuild 1086 BLAKE2B f35abade6648a491050fdf6167c24d6e95db7236ecf95cce33ece643fd27c8022b132b290d56d41eb4e6a836f9b92c8974bcee6e4db139f8381574ecbbdf8d7b SHA512 87c5d9df79146013a030411b0adbd0524c7ae6984d42ef5f30e007d8c979f82f1870f18659993ae598064ace7f0b1ea27b87e7b7c60426836a8871349e2a6e4a
-EBUILD camlp4-4.08_p1.ebuild 1151 BLAKE2B a8bdc5d0c46b205f1e046f1205251d5acc70211478b8691880e8b3630debdf715572107aac8222ae86495acc73d3a899868076269a077a0906823fbd3b020be3 SHA512 73623777ec50db527d57a16440b421a15322c2fe9165b86775b662e41b00eb5c583c51a4969e2bbd48071a52d3d5739a8d8604e46e5a0ece88a58c599517507b
+EBUILD camlp4-4.08_p1.ebuild 1150 BLAKE2B 81fd6efe4bdd0fa9ba5a96d166a90f3bf2552c22e7e6a1ecae1bdc1d37c2339d52af5a11c9b6d6494cf30e70a36541c95408750bf9f733cbe51dd063cdd737ac SHA512 fa27787074d84b42f2a16f6468e27414e675a14427223caf39a85bfc473480488aedbba4bb0116642d3f6d3caa9569967d882e3331c0283f40bc10b747bc1ec8
 MISC metadata.xml 250 BLAKE2B 6e80f75f919556451e33d44238de1d3f78f80356deeee40c8ba8ffeae46cd00cf1ffcc9cd5bcc2795f91cd7e2bcdab31dc7cb815a28a48a7b1746cef356395fb SHA512 e4a2f011f87a8a3442fd64fd97e19a6b74f9fc4a5f0da4ad49ac023258461633e6b12fcc8fd68900b57c1ec7db48b29733e264642c6bbe3a8dcc62e51c86a458
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
index 0aed51629a8d..aee3b5ec2ecb 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -12,7 +12,7 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt?]"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 5fe0a52bfe27..06f6742d922f 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,11 +1,13 @@
 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-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 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 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
 EBUILD llvm-ocaml-11.0.0_rc3.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
+EBUILD llvm-ocaml-11.0.0_rc4.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
 EBUILD llvm-ocaml-12.0.0.9999.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
 EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..575154be6047
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 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=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	!sys-devel/llvm[ocaml(-)]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	test? ( dev-ml/ounit )
+	${PYTHON_DEPS}"
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index dba1fdae226b..a466d8bfb255 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,8 +1,6 @@
 AUX ocaml405.patch 4761 BLAKE2B eb6a2fabcbcda0676652e4010e28edc8fd82b0d2307fb5d847105aff775e405b3399854d13be13660255aaf0a55627ab0d307545fbb7d91076a50ff103b97d34 SHA512 79378c0cb59ca4abc2280932045ca80e5d7e3ff47919067c363f96d32e24899825f79a83bcf0abfc600513eecc8e046382a42937545b4b62f9b5f992d8d29480
 DIST ocamlnet-4.1.2.tar.gz 4623183 BLAKE2B 7e8d5cdc823b9e924258f75f00957ba185d49555377ba2a2d960c47e2ea958059e1ab62e27be63770bb4f547e1fa0cb788a54c3e698180b2b15f0097fe84455a SHA512 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d
-DIST ocamlnet-4.1.3.tar.gz 4553037 BLAKE2B 177d2a3b947e6123bdef0ee180c612f832a22dfd90fe0c44b60ba2ebea3629103db9730eb1b926b7d7bf39b489934b8949b0fd08e5155c7f41e3c065c215558c SHA512 683ab6f529639c9da01478ba8ba7a1bf89a418ad3872331bb3e29067c0a75ddc0db996630ce5a5dd116967d6e3e756ade02d9a78b865bbc226f95d01af9e3956
 DIST ocamlnet-4.1.4.tar.gz 4552969 BLAKE2B 3dfedcd09eb91d1ca8e13b7a87dfe70cfb88d57d0b4fa970fe6179affa05ba3fdeaad0dfbb6ac267e7a6530c289408b1a8ad66a805226245f80fe66770addad5 SHA512 ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0
 EBUILD ocamlnet-4.1.2.ebuild 1638 BLAKE2B b333c280a66e1500d2c99956c4d2bf21fc034e466fe2e777146f2477f88cf2709e22be8ffb03a1b991ffb9a5f1f28f7bc63b4f08e1fbee2217669313ccad5117 SHA512 5343d7253ae2019b0ddcda5ae1174038c3a32350b17c0b13216c9618f67101006b703e23d92b5462a15af1de250c0bc88754c55b9ea1970118d2a9253b4bfdd9
-EBUILD ocamlnet-4.1.3.ebuild 1585 BLAKE2B 2f56a4f9c6a9e528e08aaf1b393cedad05ea17ddbed7f214749f80cadadae4dcb4986b5d47eecb959de2868667ac76eab41b2b0b9df8a5ca15339d5be17f5ae2 SHA512 9324a69d39084ece0c4bb521d9f51424bb3df5252b216b55949ce64fae8dc73a7e002c080306f0efc2f648666894b3fe3356e5dbf38866f827f8d44a6e72b1eb
 EBUILD ocamlnet-4.1.4.ebuild 1585 BLAKE2B 2f56a4f9c6a9e528e08aaf1b393cedad05ea17ddbed7f214749f80cadadae4dcb4986b5d47eecb959de2868667ac76eab41b2b0b9df8a5ca15339d5be17f5ae2 SHA512 9324a69d39084ece0c4bb521d9f51424bb3df5252b216b55949ce64fae8dc73a7e002c080306f0efc2f648666894b3fe3356e5dbf38866f827f8d44a6e72b1eb
 MISC metadata.xml 340 BLAKE2B a5d53a85c5073945cf7c9c2368fa6f6b290d617f47e4f71482ac784e969e5ac26dc7df9e6261cb892f21d285b28b8ec2cc09e4d196b1e0b137b294ed9aad79f8 SHA512 e3341232ffe5655584bf06dbe24f44909512d2f73cc2f47a67e1c0116e1b86fc410d6910f74f752adcd78fd7706ece9f20367e10a1b4b075a7064f69d6a8b490
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild
deleted file mode 100644
index 1d38ddb0e813..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources strip"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-RDEPEND=">=dev-ml/findlib-1.0
-		pcre? ( >=dev-ml/pcre-ocaml-5:= )
-		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-		tk? ( dev-ml/labltk:= )
-		ssl? ( net-libs/gnutls:= )
-		gtk? ( >=dev-ml/lablgtk-2:= )
-		kerberos? ( virtual/krb5 )
-		zip? ( dev-ml/camlzip:= )
-		"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
index b7b2cd6de77e..1e2fb4949ab7 100644
--- a/dev-ml/ounit/Manifest
+++ b/dev-ml/ounit/Manifest
@@ -1,7 +1,3 @@
-DIST ounit-2.0.0.tar.gz 103504 BLAKE2B e936d0a3df48eb46623eadfc39a4f64a6776972c713280c388ef5e9e1b6a20d9959a68b30ce21fae7e553e4e43a7ad1cd5652d49da7aa2699ca59fc03e1f1352 SHA512 e12c8fb534ef88de7a83a34e5a578060a90abfce601d8532408412a56e843f69b89cfd6ce69bd7c5519e9a04e306d46339e9b8f13975727a3458afe20cd776d0
-DIST ounit-2.0.5.tar.gz 114285 BLAKE2B d41faf95ec11f16accb70aaa1a9005f468727ebfe01082827669d7a7afbeb44d8cd740376ea9df26a811913b3a87b8d9fb85c0d4690e0d18e6b129949c2b145f SHA512 b2414b7581ec230a949de0d7a677786bb63ef3a3ee0c3dc666d176f83705b5bc8aeab4b6e2327c98714bb26c249d71766ed831ebf572aff2b8829a33cc0e4b75
 DIST ounit-2.0.6.tar.gz 114305 BLAKE2B 94ae4e2f7ace6fe5732253d724115cdc3e24af91db2066b36439501cb17df7f44fb9230242b8400ec59a72f9317c22361f068f7f2634d29ccfdcca63cb95c275 SHA512 466ec1f691a81e0abd93f698c7328e6db4fa2d617d8f5262d9f18b57ede3d389a3ee122ed7bccc8dff20600826fbbae1d17dd88d7c1329562798792fae54417d
-EBUILD ounit-2.0.0.ebuild 469 BLAKE2B 89032c445cb8db73518b2fc945996b6d080b70cb1b3bf3734870db57ab79297162424121ed0af7229c9545f8fe87977b3bb9a6be1976cb7a19e0b2522e0f711a SHA512 73b25b25c9b1f380bcca7e3ab625daef5d2b84d57c8da535f93d547e5e4d4da238bb370261f85358af7c5c04f66ffca4281a262a8aa3e33657c5d8f435f32d0d
-EBUILD ounit-2.0.5.ebuild 473 BLAKE2B 7971d57958b50f8a8eb74add4f51a57cba036636ce6a58b10a51dea1143077b5e74e225babd60a54a2d5a1dd35ee13b577c71a36004f55b2adb9a53e3f784984 SHA512 c517aa5f0d2521050624d0dcfe58089d3f59e013fa7db9809d9045db286d753b0703ab3317cb0e00a390a1fdef38df1d6a5c2c1779c5861ab04a443707fb37bf
-EBUILD ounit-2.0.6.ebuild 468 BLAKE2B 55f1303b5624c091f3c0be4c9f3e0e31d053f99a257d44b4672e42072e5acc9cac57cd48140b6d4b278366fa9f26bfca09ed9d729d044643a5144e225e282ff0 SHA512 8a1241e3c80592bb900ccc170bc661ddf3457fcb0e9ab488f363fe87f592fdcb41132d2504171a22a7b29e8f8552cec2a9f357ee108116cb154b04d1069fc74d
+EBUILD ounit-2.0.6.ebuild 467 BLAKE2B 5d98f2c39230944bc3a2555ed19e649f21b1c0a31b7cdcdd0d903eb3c0c54b073d0cdc2aeeadca27b55b7fc25b8f38a4bf8987f89642dd0dfc91f7ccdc2a08e3 SHA512 1ed4883c62fca5854fc577ebce066add696f72732e5afaebcd5857f17580d45f9a4d5dce0402f1b81ec8e359bd5c39be31814047012e3217a579bd0c0f300fde
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ounit/ounit-2.0.0.ebuild b/dev-ml/ounit/ounit-2.0.0.ebuild
deleted file mode 100644
index 8779d2f64cf7..000000000000
--- a/dev-ml/ounit/ounit-2.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Unit testing framework for OCaml"
-HOMEPAGE="http://ounit.forge.ocamlcore.org/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1258/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~ppc x86"
-DEPEND=""
-RDEPEND="${DEPEND}"
-IUSE=""
-
-DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/ounit/ounit-2.0.5.ebuild b/dev-ml/ounit/ounit-2.0.5.ebuild
deleted file mode 100644
index f597ba581192..000000000000
--- a/dev-ml/ounit/ounit-2.0.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Unit testing framework for OCaml"
-HOMEPAGE="http://ounit.forge.ocamlcore.org/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1719/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-DEPEND=""
-RDEPEND="${DEPEND}"
-IUSE=""
-
-DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/ounit/ounit-2.0.6.ebuild b/dev-ml/ounit/ounit-2.0.6.ebuild
index 904805aa573d..2a141c85006a 100644
--- a/dev-ml/ounit/ounit-2.0.6.ebuild
+++ b/dev-ml/ounit/ounit-2.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ounit.forge.ocamlcore.org/"
 SRC_URI="https://forge.ocamlcore.org/frs/download.php/1722/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 DEPEND=""
 RDEPEND="${DEPEND}"
 IUSE=""