gentoo resync : 25.09.2021

28 files changed, 148 insertions, 120 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 981dc29697ac..0ddebea05f19 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/calendars/Manifest b/dev-ml/calendars/Manifest
index 106335f26661..e7119b3e6d4d 100644
--- a/dev-ml/calendars/Manifest
+++ b/dev-ml/calendars/Manifest
@@ -1,3 +1,3 @@
 DIST calendars-1.0.0.tar.gz 7374 BLAKE2B 8792bc8b9996ec4f71eec6d34570d5b3d4fa17ea40be3dbc6cb379f0318ae01897b50df20e8cbfe5d91450078231155547bcb2a25b1789efc0e6c9993b3d2c3d SHA512 84bcc9c96eab1a1821699ebd90ab04a14c3afa54d9f112001a5bde8efb3b8fe29baf6da133dde561e9ed290fec5babd673818e490779986725f6c5ab644c2391
-EBUILD calendars-1.0.0.ebuild 471 BLAKE2B 4049f61465eb908523e5fecc93e2a3df20b6848436b9dd581b337558bb951f567d37db77d0bd32f1832b01a75cf70cb7f8b1aa5c14d16900046ce18ca30adeb2 SHA512 fd90522170d429a06934392964ad66e57468d41d7ae296cac4111beb1194d64ee49796c41e86cd4b216d186186ce1094ba2e721eee147f82422a7293b5c30057
+EBUILD calendars-1.0.0.ebuild 469 BLAKE2B afdb313230508da33519d8872e67c4cc8f7c1e9acb49e63c5f5f073dd609f032513f6c2aa07a013c055f5507ea51fb1f13fa737ce40999e66dd5bae98d058408 SHA512 4f858b92503ea7f36af84b34ee362634c0c17a3085c05b5dd2b242b110f7bba478f77b0a3d90a2102ae42df2b4101b8762009acfe3811ac68432e5c23e26015d
 MISC metadata.xml 315 BLAKE2B 187f82b2b8ef0ed6405e65e0811d4ddbf3af000ab5bb923208b6e53fb6077f9c0e0d1ef5f23974ee62f782b74efed4d7094f58b56c8a1985e35796cfbcc5c944 SHA512 fa5d8556f9bf9a7378121dff06895f1c3c9da59fc61409e1e2328c54fc100993be6ac314033bdeae152931bb563f037dd455f14262639c8b5d7d7683e6b1bb8e
diff --git a/dev-ml/calendars/calendars-1.0.0.ebuild b/dev-ml/calendars/calendars-1.0.0.ebuild
index 23b2fd6daec4..3b03bc654b4e 100644
--- a/dev-ml/calendars/calendars-1.0.0.ebuild
+++ b/dev-ml/calendars/calendars-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/geneweb/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/jingoo/Manifest b/dev-ml/jingoo/Manifest
index f8be8ff17b46..10a2d56e5eb1 100644
--- a/dev-ml/jingoo/Manifest
+++ b/dev-ml/jingoo/Manifest
@@ -1,3 +1,3 @@
 DIST jingoo-1.4.2.tar.gz 67611 BLAKE2B 5d2ead117863a2edd18320da4fa7539a7ebd6c537509b5cd37df3778d90c3459dde73d03d3d97b0ed64cfa4b7ef46f620e5638dd75f7e5b290340cc53761deea SHA512 d54d9114b87efdf49b81931b28ee2b61edbd984792c8371f7498b42175f574da7d2774b7b28702b62eeae704168e18c7e9283c4618045abc559b2d1d680e92ad
-EBUILD jingoo-1.4.2.ebuild 665 BLAKE2B 60f857f90c6d346d3180ecdcf63705a326d80c5a9c5a2c4b9955e04a51938d223854ef55ecfbca46ce2a959fb4143ab60820f499777e2aad78cec370670ccb33 SHA512 299ec5c9022f7de6a7ce99d81bc19bc072c725c6267b088f7e989e290809e4435039a53864f612d04dd4b8edc1897eadff73210e0404e078fa6f4bd5403685ef
+EBUILD jingoo-1.4.2.ebuild 663 BLAKE2B 2176756579be0c84d8950f587c6fd7cf94c713414b257b6bc7b844ccb33fb19c8b6f684880911fbcb82f28f121271d816f21bd3ffff75bbe458f5171871b14e1 SHA512 93746632bee1b61adab7209d480b6598e35395c8e5f01c298bc1320247df62a2ed29e9da990a778a9658cdf73ecaac3fc0245017632453243c66d35858ad8b79
 MISC metadata.xml 318 BLAKE2B a882d48f971b725d9604a9205258cdf6747d2ebcfb868f9782267fa54ca4aca64482032bca93c54708bf9908e700b0c38a96b6f075f834ba2381744920075fd7 SHA512 15f06496cd273fac20f93fd79dec7bfc08ede35639e162e4de9e2e9c90cb187218f0232e4bd011d1b4dd8ebd9ee7c2ec32ea4091cac2adee2f772a3db5e88652
diff --git a/dev-ml/jingoo/jingoo-1.4.2.ebuild b/dev-ml/jingoo/jingoo-1.4.2.ebuild
index 21270b6af09c..7002d58653e8 100644
--- a/dev-ml/jingoo/jingoo-1.4.2.ebuild
+++ b/dev-ml/jingoo/jingoo-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tategakibunko/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 215736778d56..fbd78b3cc31f 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -3,11 +3,13 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
 DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
+DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
 EBUILD llvm-ocaml-10.0.1.ebuild 2991 BLAKE2B 8f6847347faf4ba2afd66e3b2f8052b27662a9db05ca3d03e5c1ba44ce77ef9731dca1632e21a5bda21ae963531d85db9633f92c33bb9713e0a4b9fdf19ea775 SHA512 2d43e10b0a15ea9b438f93a15bf32575e2d111eea1954c8c36f7ce949774055ee720d448cfd7e08a7627539ca8095d81c8f65e69de926475b8f40d5dbcc75db0
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-12.0.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
-EBUILD llvm-ocaml-13.0.0.9999.ebuild 3049 BLAKE2B b98f105c8171cea5be884b9dcaa58487d659ac0142c9d5e92d5b5cc6f6e338e6e8869a4a4aaa05078b4dc7185c87ecaf2fcaf4c5371974080358707801a422bc SHA512 846c778216f2295fa8ee87552317dd9260a87f39261bbee1e81a1d636d500fe57ac48b650bed6711db80ab936cec6a0a8c689a177ff7bf8227ebdfa048cd041b
-EBUILD llvm-ocaml-13.0.0_rc2.ebuild 3049 BLAKE2B b98f105c8171cea5be884b9dcaa58487d659ac0142c9d5e92d5b5cc6f6e338e6e8869a4a4aaa05078b4dc7185c87ecaf2fcaf4c5371974080358707801a422bc SHA512 846c778216f2295fa8ee87552317dd9260a87f39261bbee1e81a1d636d500fe57ac48b650bed6711db80ab936cec6a0a8c689a177ff7bf8227ebdfa048cd041b
-EBUILD llvm-ocaml-13.0.0_rc3.ebuild 3049 BLAKE2B b98f105c8171cea5be884b9dcaa58487d659ac0142c9d5e92d5b5cc6f6e338e6e8869a4a4aaa05078b4dc7185c87ecaf2fcaf4c5371974080358707801a422bc SHA512 846c778216f2295fa8ee87552317dd9260a87f39261bbee1e81a1d636d500fe57ac48b650bed6711db80ab936cec6a0a8c689a177ff7bf8227ebdfa048cd041b
-EBUILD llvm-ocaml-14.0.0.9999.ebuild 3049 BLAKE2B b98f105c8171cea5be884b9dcaa58487d659ac0142c9d5e92d5b5cc6f6e338e6e8869a4a4aaa05078b4dc7185c87ecaf2fcaf4c5371974080358707801a422bc SHA512 846c778216f2295fa8ee87552317dd9260a87f39261bbee1e81a1d636d500fe57ac48b650bed6711db80ab936cec6a0a8c689a177ff7bf8227ebdfa048cd041b
+EBUILD llvm-ocaml-13.0.0.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
+EBUILD llvm-ocaml-13.0.0_rc2.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
+EBUILD llvm-ocaml-13.0.0_rc3.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
+EBUILD llvm-ocaml-13.0.0_rc4.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
+EBUILD llvm-ocaml-14.0.0.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
index d082ba50ed27..d0039fc6ae95 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
@@ -9,18 +9,10 @@ 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 CSKY M68k 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[*]} )"
+IUSE="debug test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -28,11 +20,6 @@ RDEPEND="
 	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="
@@ -43,6 +30,7 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
 pkg_setup() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild
index d082ba50ed27..d0039fc6ae95 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild
@@ -9,18 +9,10 @@ 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 CSKY M68k 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[*]} )"
+IUSE="debug test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -28,11 +20,6 @@ RDEPEND="
 	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="
@@ -43,6 +30,7 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
 pkg_setup() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild
index d082ba50ed27..d0039fc6ae95 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild
@@ -9,18 +9,10 @@ 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 CSKY M68k 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[*]} )"
+IUSE="debug test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -28,11 +20,6 @@ RDEPEND="
 	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="
@@ -43,6 +30,7 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
 pkg_setup() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc4.ebuild
new file mode 100644
index 000000000000..d0039fc6ae95
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit2 )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=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-14.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
index d082ba50ed27..d0039fc6ae95 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
@@ -9,18 +9,10 @@ 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 CSKY M68k 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[*]} )"
+IUSE="debug test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -28,11 +20,6 @@ RDEPEND="
 	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="
@@ -43,6 +30,7 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
 pkg_setup() {
diff --git a/dev-ml/markup/Manifest b/dev-ml/markup/Manifest
index 2079b32eabd1..dbacd03e1bb7 100644
--- a/dev-ml/markup/Manifest
+++ b/dev-ml/markup/Manifest
@@ -1,5 +1,5 @@
 DIST markup-1.0.0.tar.gz 280927 BLAKE2B cdf670e97c9f6e9b514d98f19a50bb4915c0c434a4ca27ac71be36f3893ed049eef8c0b5f48893e3f247938283272ff0c03d24743d679ef5e0296f7059131c58 SHA512 6383ed24fd86be0f6a64d9386b547d323fa0e763571ff3e7405119173c6ac6a7ed043bc0d35afd6e933101f22ed4b2f8baa08ba07d3df57a68015caaf79030ab
 DIST markup-1.0.2.tar.gz 281957 BLAKE2B 04094edf2b6e7cec8de8e1d2ebc9c43b55aa18ccd7c38ee07217a7578764e1b919da8f30b3855d04deb75862be9c429ddf2c24c7a8a2baa2ed01921514f3b334 SHA512 6a04240da095a7557932e26b8f20979e0a8dc4ef2b5ce98aac7dfcaf82f0350397633120b638f76efd2a30a482a2381566b66a35c0585535e225f44004539b87
 EBUILD markup-1.0.0.ebuild 546 BLAKE2B 5e6b2a2f5c9d21407a27e2f1207f13fe834ae3a19b1f63c900846a9a3b2245a1bbb30533e169bb19c08eb4615fa6093031404e1c7174eca66f8e9d7551bb9353 SHA512 da5764d2f11222f03be7811a4bf5fe23c4190866aa3ea0e351d223615384e737b943a8f5c311a1532219d951ee6ef708e74e7758364f6d46276261d16f03bbc6
-EBUILD markup-1.0.2.ebuild 546 BLAKE2B 5e6b2a2f5c9d21407a27e2f1207f13fe834ae3a19b1f63c900846a9a3b2245a1bbb30533e169bb19c08eb4615fa6093031404e1c7174eca66f8e9d7551bb9353 SHA512 da5764d2f11222f03be7811a4bf5fe23c4190866aa3ea0e351d223615384e737b943a8f5c311a1532219d951ee6ef708e74e7758364f6d46276261d16f03bbc6
+EBUILD markup-1.0.2.ebuild 544 BLAKE2B 06d03dcdc64848609f6cb7ca50634ecf4adff19e3fc88d9ea49d633c4dbe87bdd822e9dc4c12d0e61373d637bb416c150ac335e18a15f8c6e6073701bdf9e1eb SHA512 08176146753c6e4aa1e03826336e2200e3f1858961d3f0c0a702155e1be19fc044112a9071672002f359a566507757928a52741c9247017809d7eb5ac2406711
 MISC metadata.xml 325 BLAKE2B ea165e3e224f8b6bed6a57df2a92aea3e5357ca8a64e0874f511da9acb43025971a22ca115ca2fd27a098aa0e6e2fc8a171da837cefcd5c9d718184b9b2b7074 SHA512 add982e91fd67dd3e57375866530324c64a2808373b85c923d35cde035c2a532fc87206bfb6b32a680621234b0255a80558cae516bc17d2d3b49fd571095b350
diff --git a/dev-ml/markup/markup-1.0.2.ebuild b/dev-ml/markup/markup-1.0.2.ebuild
index 65041afd6bac..9cf732cb7579 100644
--- a/dev-ml/markup/markup-1.0.2.ebuild
+++ b/dev-ml/markup/markup-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/mccs/Manifest b/dev-ml/mccs/Manifest
index d5c874601cd7..7c791f96c42a 100644
--- a/dev-ml/mccs/Manifest
+++ b/dev-ml/mccs/Manifest
@@ -1,5 +1,3 @@
-DIST mccs-1.1.11.tar.gz 1008163 BLAKE2B 49f173b99baa1acfd96f8ef873b664ba61dc9a770ad62873f956f017e3940737be74f5d5392d4043c9ade3e74e09d9c6b11c47af7755558b25f1f62e6ab80d84 SHA512 095393ca63fb591a833a7a37117a80a2e817b437bbcd655301b376f749a3756c8aff26b2fcdebfc5f68b9c30d8971a7ba057f610117516e3e85a3fe7bd3906d0
 DIST mccs-1.1.13.tar.gz 1024449 BLAKE2B c653c7d0b5fb6f9ea8facd8bfab517d80c7ec8cfd1ca512d81b81760e1d21c6978696af1cac596f0b11014464851c0c32e3bb5c6f70d88ad1bb7ef0034b8ff7d SHA512 2c2bc3c0e82b53a0e20c2542704eba8e3a2a1884f31b1a0a0079dd22fc02be8a8a62e582bdbf501339be0e9d6824872d737087e0fe150073b29b374505de073d
-EBUILD mccs-1.1.11.ebuild 632 BLAKE2B bbfd52836642ef6d1482ea4a5088a6f6ccfb6bb62c08879ee0a39001b297abca0b0180251eb4bc1c3505303e573214aea5d3b8237873ee249e45383e9f9a481a SHA512 3ca6ae2551903f4e49e52673a973dc0889d47967126ab7c6cdbd9df95ba9e1feff44780cdcabd0203c38256b92c1bce5a43dba3cd09286ee1bb158616f30cd40
 EBUILD mccs-1.1.13.ebuild 632 BLAKE2B 6989d6123e50c6652f1eb2b39123e2a1639da93c2f9671940d03b5d6d5a2ff00becca0a2c317fee7c785fd2282bfa20d55d73fd73ce1868db3d140afffd83dcc SHA512 71e1ed02e5bfa5da216a0b5bd8e158fa5689cb4167f0005547150ad7c22d4f4268568d4d9db044674f2f3e2ff720169aefc9622dfd1f474510aaa678ba3396d9
 MISC metadata.xml 326 BLAKE2B 19b0c40c5c63bc7a4a1e5d60535eec48fa387e5048bd966f943e5d5470ebce1cc6e38ef7661d26912bc88dae64c795f02252940a0528847bb4e509456861422c SHA512 88e86e039666e4380db1fc86cffba29188e9c36a701f7b7dadf15b6360c9a7c3eb71f9f2cbd6592cda50eff312c1afb2f486df006a15e6668db043edc7191e4a
diff --git a/dev-ml/mccs/mccs-1.1.11.ebuild b/dev-ml/mccs/mccs-1.1.11.ebuild
deleted file mode 100644
index 09637d8cbca7..000000000000
--- a/dev-ml/mccs/mccs-1.1.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-MY_PV=$(ver_rs 2 '+')
-
-DESCRIPTION="Multi Criteria CUDF Solver"
-HOMEPAGE="http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues"
-SRC_URI="https://github.com/AltGr/ocaml-mccs/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/cudf:=
-	sci-mathematics/glpk:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/extlib:=
-		)
-"
-
-S=${WORKDIR}/ocaml-${PN}-$(ver_rs 2 '-')
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index d3c979eb392e..fa513efb7628 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -1,6 +1,6 @@
 AUX ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch 1259 BLAKE2B d5ef0954e0a998b1ede15404fa2ed2e4aa8cbdb556aa22665e3193e179348274963303f384e984f73c808f5745ef347b5764f4408ca20110fe03383f0d92ffc7 SHA512 84671a1db5e4df6b4c21e313bb7b620e83016015ee32f508bbb14f791d7e09f138e83891b5c18a7a8ea2f9dd0d056bc9757152211e818275182df02c9701570e
 DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
 DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
-EBUILD ocamlbuild-0.11.0.ebuild 1343 BLAKE2B 18c9d7f585b6baa9d6a2a49608a9157f34a303317dc463f0f42cb9f432a144a0438d8d733c54ba10a06619447bbd0d0a2822dc2cb556fc66ac57e53d7119ede6 SHA512 bc5dbb630165db82392e937b6d7385c82c842317dabb5e03c4dc665d5213d4d44607d97d027bdb53a4777b9642a374fcb9c7c27ffccb74e920a8e67a4834a61d
-EBUILD ocamlbuild-0.14.0-r1.ebuild 1390 BLAKE2B c223c696ec9a0d976ad4873736acd7f11772f9171f73d31a285344c8780a1d868ae6bc69f8f73365dd29d740f10da159672c7140dd6d71a84206e72fabc18c95 SHA512 fe2adb9b6651587137bb88a176f10138a1df6a02fe3892f7c9907695609de9982e538a120e258bac9632f10a3995aa0bf3bcfa86ac16852ce51cdd20ff331319
+EBUILD ocamlbuild-0.11.0.ebuild 1297 BLAKE2B 06c06922091b5e8232a0010f7d774742d6315b7df1d5fd935e2dc5159681baf8ae50721eea8054aad79a51cd4b99dfd6d8a0c986954b8d4944203a1596c43dd6 SHA512 7a89f83eb743590bd909e807f499077291960322cb21292601f1886c9ee67df531a86082a3aa9d820b7d1958e214dc04021bc5cab97c3f973742198984539532
+EBUILD ocamlbuild-0.14.0-r1.ebuild 1344 BLAKE2B 8d68d113a3e755656acbe201a6970851f74d10945154887a8dff2241f2fe2e4910d14707e627052d8c32fe87f2e7636d5ca29424bd9b31ac2a4e7c6cc345fc0a SHA512 4f08d1360a9cbd94fd18fdab0c8345c624198dac962163dda6891e5460b98d1eaa32282e21c49532ae1d5d5acc7587afc84b7c6091cd2bc7a2e1756316a56be8
 MISC metadata.xml 419 BLAKE2B 10c584b700f9726f803ad4a72bb6f2c3216c8550a0e373ffe03b950bf61ef04fb9eb955dcf839065eedba0917546c914f6fb8ad147e6c762898dbcd1124ce03f SHA512 b9f22d5c890c578e527e9394a79c901932c2abc148270954d43744030e39e55e3276c7ee28057353bde3301de347570aa3bdd06b758ac57e6e6ed24497a81c98
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
index 13bf43e48525..5d11a50d5da0 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@@ -14,11 +14,8 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 # does not compile with ocaml-4.09 (bug # 708696 and #708872)
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-ml/findlib-1.6.1-r1
-"
-DEPEND="${DEPEND}
+RDEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
+DEPEND="${RDEPEND}
 	test? ( dev-ml/findlib )"
 
 src_prepare() {
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
index 47ec79c0341e..f6b0bede9b18 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@@ -13,11 +13,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-ml/findlib-1.6.1-r1
-"
-DEPEND="${DEPEND}
+RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
+DEPEND="${RDEPEND}
 	test? ( dev-ml/findlib )"
 
 PATCHES=(
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index 8bd94e9d4bc7..bc15c6afcdfc 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_deriving-5.2.1.tar.gz 46148 BLAKE2B 75c5f95841e4e54d5a58221c27d4a904347fb2b20ff0189bbe99bcc200eefd4abb94a476a120b6c6c7d0eba3b2233054875868a71064d032815cc8907919371d SHA512 01d2eb920f3375960a9228138ccb5f2af49bfba1111894795c24b3c37d5a021d6bc95e9de1d867c35d03645334300ccc89f1fca0cb75007ec62e5620f328e078
 DIST ppx_deriving-5.2.tar.gz 45766 BLAKE2B 67d041b69ad675873500844f8ef638797e271c3a3a82467407914a073e6eb9ff84f911d128ccf507be051fb89c7c85991987793067046b0dd1ecdc534b658b05 SHA512 0daf7d0050b8e2b18b441da994e8cf1f05e37f7d88d1f4512204979f19ac4d116a6c72f683c615b091e0340a4d380684f9b2ed1b70d84fae6ca928843ed3f479
-EBUILD ppx_deriving-5.2.1.ebuild 657 BLAKE2B 7a8b29acdb993ea00b23bfa2c44d9ca4f0b4b3b232f73d5bf3c2dcd25e91b1fbadc208cd82ea33eb96399bccfc839ad05a33aec11284d5dc34e7e824077f12aa SHA512 aaaf59686dc348c264e8276a466406487d5c3d59316597d1013bcb49dace07136270aacce6ebe9138269e2dadaec9d408f30cebadb8ba000ce93172f6697db27
+EBUILD ppx_deriving-5.2.1.ebuild 655 BLAKE2B 8b44fa4c51542dbd11eb2d720b6d3f92a1324153d9f4d8260d4dc5e36b574926a8108040a8f17b4863939b76caa4cddb8ce5bcbe029719f6a7b2ac4cf1eb7a44 SHA512 5b3196f33656097f0b88bcde472a3ea950ed0c32871c41fc368e9b9782a4276ba833eb34d974a0145e8a41f2613b241700950dcd94819225cc4ca188fa624d1a
 EBUILD ppx_deriving-5.2.ebuild 657 BLAKE2B 7a8b29acdb993ea00b23bfa2c44d9ca4f0b4b3b232f73d5bf3c2dcd25e91b1fbadc208cd82ea33eb96399bccfc839ad05a33aec11284d5dc34e7e824077f12aa SHA512 aaaf59686dc348c264e8276a466406487d5c3d59316597d1013bcb49dace07136270aacce6ebe9138269e2dadaec9d408f30cebadb8ba000ce93172f6697db27
 MISC metadata.xml 425 BLAKE2B 7205cca257094cbfeea975ceac94d102dad9d7a165cf1cee31fe9828d1c2b356424e473dbbcad8e4b6fc554146ec188a19c29cb2a564227db9b363a775bda360 SHA512 1283b517100b3960c2dd796654db9960869760617dffb64b719e36e263c2cfb5571e3e8f039d8f64a94f2f776f06e317290452f9f6eed0becd99587c61024b5b
diff --git a/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild
index 73a1495d16a7..40839d6f4a08 100644
--- a/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index f7959ebe25e1..74c782765be9 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8
 DIST ppx_tools-6.3.tar.gz 18811 BLAKE2B b1389dbe0c6fd855cafc8d64a9db550866317172909c2731f01acd412c6f8147f07e19a82d527187d0b211fca9eb2f2ad63bb53e8f375b0b8107c4e723710000 SHA512 6a88f6f877f49ea8736aeca60673a19c52d5104ad9e2a3e56db3f71cd557d39df9c709c4e678ccf10263ff1f3e0504f4676227bd05ceba1e0294453a988a736c
 EBUILD ppx_tools-6.2.ebuild 505 BLAKE2B 690649eab5fc48940936171e98bcf51edb1c0dafeebfe378a88b2c646f8df488270baed8845d480dfb47523819d6bc02daec4f9fd7265c4899cdd1bb4ffb5749 SHA512 c4cab13bb3694fad4c39300d31a9a81487f873eb45e0af9b243c891f646a505a2c33641cf25ddf084ae295f6577700cec8fcf478dce3c7f1b5391dee90d50b45
-EBUILD ppx_tools-6.3.ebuild 471 BLAKE2B 8eb9d070efc1b625c6f1d5e1b80babe69018e5626e1a45d37c0233f01b526707e90fae71501a227e16f3eda16ed22010ebafbf2c6fcd75df860cd6f80190786c SHA512 0cbc257b617cfd5383fdb42b130233993dc201836ea2dd29556d60e2915456b0d84bf34c5eb26f8e433af4e9ac7bd4c34560ba76e5eacffd27a9046aafca1a31
+EBUILD ppx_tools-6.3.ebuild 469 BLAKE2B b0c45a83419c6dbfb95d0585be01fccaf1e1af16278f1faabe7a00ec9e0e40d31335211ffdacc062ec05c251e39b33f1754364beb538d1afed6ca8c9ef55e933 SHA512 d483bf1fe95c97d0d23677d70d348fa5490e49be5bc7819696e0ae6a47a70cbfb116c5ab08dd3e8e058285ef73793793fe0af92e400b24c0063ff299d972c0b3
 MISC metadata.xml 424 BLAKE2B ef86805d6a907c1d81fa71dd3599c66bbe5f6f2275b17c8f43998276d3c99329d96754717bfe935a56ed50fdf65f9e688a01832220253bc2d5909c0717661ff9 SHA512 5dc85ce4085784bda6fe0b3b601858f784c542c26444eb92068328324898d5835eba450ef723d3eb1317f1a0eae82a1e7a430c609bf57162b1c2ac5ea142c501
diff --git a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
index 1d025b5dacda..b8a168bdfde7 100644
--- a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
@@ -13,5 +13,5 @@ S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/unidecode/Manifest b/dev-ml/unidecode/Manifest
index 1c58a46a3c7f..8b83da79cb90 100644
--- a/dev-ml/unidecode/Manifest
+++ b/dev-ml/unidecode/Manifest
@@ -1,4 +1,4 @@
 AUX unidecode-0.4.0-test.patch 464 BLAKE2B 43a8cfdfdfd87a3c8609ab428eaa6af3189c31813b7630578a6bac41f6a94270962a48cd4eb07084042c16dc3e5647a9c25fce8694e8944a35c6aa43f809aec6 SHA512 407aeff21aea1223838a90318dcfa556d32d477d2748a364cb06d146ee2220fe757689eaef430a50a97f7cfd188084827a30b75cdf47e7f21285f8744eeb3db5
 DIST unidecode-0.4.0.tar.gz 20571 BLAKE2B 864888e1f3db1a784f847f49584fcb6da93ad30066b8ea5764395b25d3d86c47749a98d13771107dbd6c68dacb2ff4e6e2cb9370e8adb35d84e8149b93122ccd SHA512 a411685ddb1d52585251eff3e2cd56fc9b4e91dcfceff424d7cfd5f721be73561d7a8e9223ecaeeda6178b02e5f6df74d50a49d4ce61d72a7d3fa1e8aefe5cf3
-EBUILD unidecode-0.4.0.ebuild 606 BLAKE2B 472a5ef18897cea494d229d18cd02c242780752b703e4e3efb84a151f4907c8a67bb2b0a58419ff6ad667baa9b71f24acc6befdef68f0d2c8a3097335436a574 SHA512 742ae25a5530e462152fd639e411a8f0e7add6c4686c1d3921eeace7e2601160a710db0082b73020a56ed85f4298e98db6da4c73e02c1fa51466aea0e154fc06
+EBUILD unidecode-0.4.0.ebuild 604 BLAKE2B ff19e4c747e180fd5ea77b343f0caf3a6eea05504c8e076203ab170ae3fa460748b6f7a52bc9f6ad07d9330ecff125e01345a0903dad6c18862e8b06b35d808c SHA512 1b1dbdd93cfb04656b8c2b2e7a308dd9dae4b17b2ff923e29f971e8c318d461d954aea37d5bbdd4dc8fbd4260c667b2e3cc88975edd110d5e214d938b0d072d1
 MISC metadata.xml 315 BLAKE2B 91bec91bc19750e07e96d8377ba20e410565d4f34886bf0d110ef44bb1181df10a9f9e04f508f8201176d83743ea29f6b98de7061c3209bffb5877cd4bdfe8f5 SHA512 6cf456a7bc1d7060a35bea3d9e3355798f5681734e345ac5880177a2a3a9f49a790d8253207c5426abcfaed21c61618ab522b0e947da2f266dd275a50eb1f756
diff --git a/dev-ml/unidecode/unidecode-0.4.0.ebuild b/dev-ml/unidecode/unidecode-0.4.0.ebuild
index 35cfaf39fd6c..3c454ae57fd8 100644
--- a/dev-ml/unidecode/unidecode-0.4.0.ebuild
+++ b/dev-ml/unidecode/unidecode-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/geneweb/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/uucp/Manifest b/dev-ml/uucp/Manifest
index 376f9d75c4af..63b6b6330194 100644
--- a/dev-ml/uucp/Manifest
+++ b/dev-ml/uucp/Manifest
@@ -1,3 +1,3 @@
 DIST uucp-13.0.0.tbz 466488 BLAKE2B 90b62446ed069f95b0ca8bbad8273b215f0a66f6a3d19639d60a73f440268e9274d4e98e7ac8a534bbb6a34ab485e989432894f22f2f5c1303ca49f828efe859 SHA512 24d0fc75ba337115fd6445d3c3dfa60fe5f6920b227cd8360cd60ad51b652ccc2129a47f195f7559d99635367e64855343dc03de1109987f296a280e0fefff4d
-EBUILD uucp-13.0.0-r2.ebuild 607 BLAKE2B 590ec915de9c7ab10079ff2e270391d26adf023e7d9d2b369c58cd79a4d38e49aaaa1b957f833e14e24694f2f8c3e93d62ee5187f72ce19896ef57cbe6268598 SHA512 5b1b7b752726d8e8a73888c15c2fac1ef329299eb367567d33f0bfd7ac363686f55c4fd49241d9d98c64b03b94dbc90ed736ff22df59ef6aa69db3857ded1d72
+EBUILD uucp-13.0.0-r2.ebuild 605 BLAKE2B 1474526e0e1a8d6a1229525c04328cd10a9712a36b74a7a1d9979218368e775fbb2581c965e78999a567e77feac2c144fb17422a651d36efd19e9aaba95c2105 SHA512 58cd2ea713961be9ee31e7e1d768997d3fb7386b46c8fba99b4b46acd45a2439c58d388f0982d414e5acb33a4465c808754deed68045e42842bb53198de63f1b
 MISC metadata.xml 311 BLAKE2B a76d9caedb7c1705259a0b1e462b017a72d6704d937134f3b412dfbab5edad0dd301c0099286616863e8c2ebfea4152702e708c6ce60b15dca195ddb4e1888bc SHA512 fbb904d6b4a2fe7e080c66b76934ca3ef6c1ef0da78fb198d54700e03c4cc1a47a2978d79210dd153b630666c154511742d580fe3e5b1d840b7ee0b24cf215d8
diff --git a/dev-ml/uucp/uucp-13.0.0-r2.ebuild b/dev-ml/uucp/uucp-13.0.0-r2.ebuild
index 2dd9913cbd8d..c962b6b160fe 100644
--- a/dev-ml/uucp/uucp-13.0.0-r2.ebuild
+++ b/dev-ml/uucp/uucp-13.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uucp/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-ml/topkg
diff --git a/dev-ml/uunf/Manifest b/dev-ml/uunf/Manifest
index 5aa5604c0e06..18622286313a 100644
--- a/dev-ml/uunf/Manifest
+++ b/dev-ml/uunf/Manifest
@@ -1,3 +1,3 @@
 DIST uunf-13.0.0.tbz 39387 BLAKE2B fa8c46f63e2f8cf44cffe0db8c0aea73a0ffb6449f4a3c7c59baf4750db8e2364686276e6e5f284b2a528a45f02400274669c4e081533fbb25cdd36c6eb8fcb0 SHA512 ade9815b1d620a055a63dd0f8c5d5c54544eacfdcf0c6059cd20f1004a1319287f71021018fbc7e652bde738a97fae7e9d0963d5b192a4b0bb6e5b95456012a8
-EBUILD uunf-13.0.0.ebuild 538 BLAKE2B 31690066e5ebd7248cda8e4cee728c32553c5052f8c578c6416de433111b40afd79d93b83a454dc1b8a156a3414c55d634d983652d4ba1e52a7ab08d74a04c0d SHA512 bd139f417820636daab3631b34cef922f39799ac6e1a2c68f90c795b111ec453effe76c4d8f19bd322a59968f10f16731eea73e6cb6f924f3816c16c69eb8ff6
+EBUILD uunf-13.0.0.ebuild 536 BLAKE2B 18e88fb8b2896c905c3b1b9e0989fdb7dece056f048c10e984496aaf21a1730be3d3ddc6c3ccd0632c8ff31d9e043673a2edbfddf37bfe7fd6e0ffff6b175c1c SHA512 a9e569e49b5504d970ff88a538daa1462fb0208051ab36ceab0287d6010fc1b84ad30a97e82193167db63920e8fe27bb19a3b54345627cb6b4474fa33c45f907
 MISC metadata.xml 311 BLAKE2B aac48b9d1bd548674249d1bf7e6bffde917939ee8a30a9975871db0ae1ac6b3649286ac2ac5f63f767d489b41894a4e02155ce77a890a06e4ad9b981edeb7af2 SHA512 acbee992f129174ff16ec565e878627096346afc0b99c4b2a2f56efb7932b069e8bbc7d8918c180ebe4753593848deb5f956a2cacdf54445529b6b68f7d238f1
diff --git a/dev-ml/uunf/uunf-13.0.0.ebuild b/dev-ml/uunf/uunf-13.0.0.ebuild
index 5c1c8bdaf9b8..d34bf31c1772 100644
--- a/dev-ml/uunf/uunf-13.0.0.ebuild
+++ b/dev-ml/uunf/uunf-13.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uunf/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-ml/topkg