gentoo resync : 08.01.2021

14 files changed, 85 insertions, 296 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a4599a2432eb..471a9e0b10c4 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/biniou/Manifest b/dev-ml/biniou/Manifest
index 1f8f2efc89f8..c4cadf1b4b0a 100644
--- a/dev-ml/biniou/Manifest
+++ b/dev-ml/biniou/Manifest
@@ -1,3 +1,3 @@
-DIST biniou-1.2.0.tar.gz 23611 BLAKE2B 01f5afada666d23b74f31cf12b5f578f3622c85311d7a1b6eb319843beac4c3ebe8e8e314a47ec14ee0ef6f5c1a5b6dd849dcf24b0c3cc8a38ca6a54d89e4c4d SHA512 04c04c2dd5e3e1237106db257567ba6900bd94759b07b02ba2e0d9209d1bbdc9ed629864e06d44a8b61f72d46fbcc7a0ffc86f82feb223d9d99ca41afc625fab
-EBUILD biniou-1.2.0.ebuild 732 BLAKE2B f64f5a8ad8cf933c1866426cb035f52e0f61a43177dd00cb73b5ba427374cf08ed458421c2300b536892dfd04090227133d53abd3e7b345bf1c20ef56298ec5d SHA512 911cd2d6d7b53d34b9907b83b32b0824f3708d4dfa5a53fb3ec666efc91c089ac5b0fb8956e735e8f05e5be3991217c03c35f9e9fef45fb680dca54d3d4a7f84
-MISC metadata.xml 246 BLAKE2B 293edb7a04720164c7fe980b83a53e65fa0537bf20ee28f065f980b1a474ff468f2b7c4adb14c80b691080a801bbbc9095cb24fa4102ce10d57b0ac47d67ffa7 SHA512 d922d11e07aa5d95318b09b38f66979151ae05272a7f202e87a03ebc7df9fd985468cfdac2188e04b27e31a69c03d63b59f2682374430ad3d0dbdc7c909a2e1c
+DIST biniou-1.2.1.tar.gz 23970 BLAKE2B 139f17e3fd31f3f834c8111d81cecfa5fa48f860fc4fc898f7896b6d39a9756989504fa88901efaa0f67a51de25cdf304bea2ecabf15ea9cace59b4b311c00e1 SHA512 f0166666559f3a767fdc6987bad45ec4a772b70b8880b6d769ef644c9bfd46962f089c7b5dfff368413015e765daf4bacffe253bdb3478d9a4d30a15f0d29589
+EBUILD biniou-1.2.1.ebuild 512 BLAKE2B b3e8d9196a7de4ae7bf5dae3d29530cec59655464402ea245d6b087152d3a856d61487d53524356b5310b9936d2c8e87e24eafbbe419184090c27bb24720c437 SHA512 4c6b55613e66315870e62da45392477d86c2bbf306dacf923e5a2eda55970f96556eeb9bec624a9931f322319d8952a7f242c812bfa8de4b682afbfa9108f7e3
+MISC metadata.xml 456 BLAKE2B ed44520d2c0c3cc8914be5c6d7bff366a5c14ec38b4752df5c1c5d4f7cb81cbe0768dcf0ee7a15dced0c419d5513d450633acd67ce029edd82125d3c164b83f0 SHA512 e79e0232bd52a7bbbd2a9df561e76689efe529f15d5db6e53c47bc8d22d893c553dd4571cb7a6609c982e12b1b70b07d230d866a2d2cd5e32a676d2e89a83d4b
diff --git a/dev-ml/biniou/biniou-1.2.0.ebuild b/dev-ml/biniou/biniou-1.2.0.ebuild
deleted file mode 100644
index 6a9705355a2a..000000000000
--- a/dev-ml/biniou/biniou-1.2.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/biniou/biniou-1.2.1.ebuild b/dev-ml/biniou/biniou-1.2.1.ebuild
new file mode 100644
index 000000000000..0f3a349bbbde
--- /dev/null
+++ b/dev-ml/biniou/biniou-1.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/biniou/"
+SRC_URI="https://github.com/ocaml-community/biniou/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4.02.3:=[ocamlopt?]
+	dev-ml/easy-format:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/biniou/metadata.xml b/dev-ml/biniou/metadata.xml
index 7bfe73bf6d81..e8bf7a1ab03a 100644
--- a/dev-ml/biniou/metadata.xml
+++ b/dev-ml/biniou/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<name>François-Xavier Carton</name>
+		<email>fx.carton91@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mjambon/biniou</remote-id>
 	</upstream>
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index c6d2f1a450f9..247355cd489a 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,13 +1,10 @@
 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-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
+DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 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-11.0.1_rc2.ebuild 3037 BLAKE2B 4f8b569495b3248f95e3e363b7bcde257d28d7160be55500aca8dc5160937956ec52b3b3e0eb83bd98d50ebfd04117112c5eecf5afce6e5fb30873aa834f4b06 SHA512 3107f267f868c1420f2bad3a4b27e5f9863fbfa23f9548e568a82fd414ca64d5f1491d26e153dd2a2c11fc840051073f4892ef9056ab977c16ccc7afd436bbe2
+EBUILD llvm-ocaml-11.0.1.ebuild 3053 BLAKE2B cc4118d6db256fc34e0ec28a9baa2ffe4aaefbb622b236d86fabb482a27eb3a1e54c7dec13284d6a7b6e9a362dd67be18be73e462f7dfa2c0d459794a19c8db3 SHA512 a0c48923514eef7c205225cee0a0eb15fd0a65248f80a706e2db24731e279707fdd971a0f0ba71d106d3a871d746c98e9fe7bef33b051ffe40bccc007241be62
 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-11.0.1.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.ebuild
index 40fb0676b744..7329a6b3931e 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc1.ebuild
deleted file mode 100644
index 40fb0676b744..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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/"
-
-# 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_}" )
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild
deleted file mode 100644
index 40fb0676b744..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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/"
-
-# 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_}" )
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/num/Manifest b/dev-ml/num/Manifest
index 7adb6fbd5e0d..d8691e62be8c 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -1,5 +1,5 @@
 AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a51995c015ddec399747381175936e523f25b2312aed434ef25dfbcc2d6ef3aaa502ade39ff14fbd0ead636 SHA512 95245b0c3738511ff6a8a43b5f4c8897a82502a751552e1f1c846f3c7bb1040a5227055a55303292c1eca18a454d0f7c038ef574f00a772db2b72611857e15b5
 DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
-EBUILD num-1.3-r1.ebuild 810 BLAKE2B 2fa8b762ea14b725c67a0b82c66a977f8d2f7344ffd6122d1b15aa1df51efaeb763651c3d2347d98480e7cf3f8a2a7ce98fdd7709329249040bb2d8d827bdab0 SHA512 08f239c556753bfecc69e106b326544b490c1df71a8173456a840d46022f6fc134fe15bd820664c57006dc2253c768e8dafc5eda45de6226d9419a319fd7f76c
+EBUILD num-1.3-r1.ebuild 804 BLAKE2B b5f0ec6dd0fb889124e0b868ad9e440e2c3ceec9cacf0d7e70b4a3d706389481fcfa27bb19034db7d53f32aa0423dbfb6b7f069ee4a397ac58b71702fc7842c8 SHA512 4dc33357474ea530206db05451010d4ed4dd665b81e12c398424537b0024de064b03beeedfd94213bcd3244be6627f67778e876e633150341402aa346e5d40d1
 EBUILD num-1.3.ebuild 723 BLAKE2B 50ac5e2566b164c5b1aa77037a77f68763ab7d7db2d043f67ce011b1aaf49b97eacb6eaada17af468e9d0f4cc451f977e5964e789dcf03f2b7addce7c935d01b SHA512 d3c8198445dc5eae9c517243bd54a72762e0c3a698a4ef332e48c6fa8cdd1c9f18cab924980e575b8170a85e19766380a4b053b999e24dae5dd9d9233632fb7e
 MISC metadata.xml 352 BLAKE2B 09915ccff13920cb1e43159bf0219bd2312529a87c09f2ec689c575d8f87a78e23033a07c9052b535a8584b19fa06229cf9b5213013fd42d7a1b5354d8236ef6 SHA512 c5dbac31e43517ba73f20a6cf8119b27c2d13334f1736b7e92ee3d9685145fde839cbdd09af311c01a3c5897684bc6c1d668d9a2541b921c7a9816bb3afd3223
diff --git a/dev-ml/num/num-1.3-r1.ebuild b/dev-ml/num/num-1.3-r1.ebuild
index ca07753a4fde..ceaa548dcdef 100644
--- a/dev-ml/num/num-1.3-r1.ebuild
+++ b/dev-ml/num/num-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt]
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index c9283c9c1683..5309b5931aa6 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,3 +1,5 @@
 DIST yojson-1.4.0.tar.gz 26197 BLAKE2B c7d1a9d47f448995b31cd7631f64dec29e65b1f141854092bfe186a58c28b96c5c7f246f7e4ab4563dfcd84776904d4af77bbcbdc4e149229fbde339bd92df9f SHA512 dc019ecf0387299282c3df9a548456d2529993241911a83acb14f2361ed14886e5ebebe415773b6bc718cb0b12a25529184f3b5b62c71b42960fbd62e1c63bf6
+DIST yojson-1.7.0.tar.gz 29704 BLAKE2B edbd7f66d69a85880fc8ee9bb25a993744a310887024f7af63665ba8f5067f1b9383ec4d6dd5f4ca3376d698665a8f605c078f7597ddd4e71857c1a20143c2e5 SHA512 25eedb64e4bf7c7e8d5a5a115812cd502540afbdeb7c947da3a14e5968aa0a7db8ab402425662571d8935b9cd6a19796ce81dd80a65dc614f156626c60e7036e
 EBUILD yojson-1.4.0.ebuild 686 BLAKE2B 78ad59c5a42ab869a543ff97dbcb004cf5a7b5a49cb79d80f36a821eb866b06238d5843b7ffe72f272c559fdef8afb7443f73b05d7aaa742dcefabcf6eb28fac SHA512 7550239f54c45845b2844d9fdf00235d4fdf62990e5b8f988019772ecfa10e2c4cf1bebefac45e3ec2aa8cca12d04eb84858ae05fc016861deec9ba181b28756
-MISC metadata.xml 251 BLAKE2B fa0c2c2679ffa3d7ee1d66435fa6ae0a87cd066936bef24881ca3c1559420ef9cb9aef9a8956f97d422a0b01ec5979674b4002f8d2141da8259c2e0ed049c506 SHA512 df914b4514c8649fb6ed3d115eb88866177d9cb8a9e4cfc743c28b7b1b17a32a4c3e5a5051f8f499089727ecce11dbe366f5065917795dc5f08f9524a499f676
+EBUILD yojson-1.7.0.ebuild 768 BLAKE2B d7fc71d5d6c18f70f172fa3d3bf39e16d9b206d17ebff4bda65a9a1779a2b32e454e6912d2aa62db5b8bb29b263bab32503c3ded92526951cad7b9bfa732675b SHA512 6ff1bd5e9122cb8e312b29376efa45bd052900b7639a747674a0bc823644cfdd350e82fdf80956b37d73ab1add4975c59ce8943844a52642d6471fb8bf63640e
+MISC metadata.xml 472 BLAKE2B af78e0eeeff9b5b49523f0ee84fb80a8b159742ae7e2c19c83ac2b78671665b69ced7dfc80dda4e4c09ac9bacab1e5473e1e2e38923d0e570ce44e9fc4f193d9 SHA512 b9aafa0f9b92b182fb031b57409a0c40884a1449140e19edc14f61dd0e5e7a6168b813a8156d21d8120b783b30c141acc8bfa82af22547b98aa59db2db234cb3
diff --git a/dev-ml/yojson/metadata.xml b/dev-ml/yojson/metadata.xml
index 96ead416877d..a6f01f34da1b 100644
--- a/dev-ml/yojson/metadata.xml
+++ b/dev-ml/yojson/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <name>François-Xavier Carton</name>
+    <email>fx.carton91@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">mjambon/yojson</remote-id>
   </upstream>
diff --git a/dev-ml/yojson/yojson-1.7.0.ebuild b/dev-ml/yojson/yojson-1.7.0.ebuild
new file mode 100644
index 000000000000..48357a363ee7
--- /dev/null
+++ b/dev-ml/yojson/yojson-1.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/yojson"
+SRC_URI="https://github.com/ocaml-community/yojson/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="examples +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3:=[ocamlopt=]
+	dev-ml/easy-format:=[ocamlopt=]
+	>=dev-ml/biniou-1.2:=[ocamlopt=]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-ml/alcotest )
+"
+BDEPEND=">=dev-ml/cppo-1.6.1"
+
+src_install() {
+	dune_src_install
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}