gentoo resync : 07.01.2022

9 files changed, 13 insertions, 11 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index b912a9791b51..7d74082c205b 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/batteries/Manifest b/dev-ml/batteries/Manifest
index 50fe02999c2b..a0569da2dc24 100644
--- a/dev-ml/batteries/Manifest
+++ b/dev-ml/batteries/Manifest
@@ -1,3 +1,3 @@
-DIST batteries-3.3.0.tar.gz 821749 BLAKE2B 2caf5076e1ad859075bfda6b846483e8d8d926f3dc4393cf83e59c15fd7e6bda5697a602fd8151f5438ab304b7ef2e4c313488561636cbacc13eede6924af2c5 SHA512 9e5f12d26b229a0d880d79695bbff32de5bc9ddf4faa3a421ebc5b0a20a9f3823f681200d9e7c03a22766d271e1e7ec4fa5721b91a3ed051ae9cf145829596f2
-EBUILD batteries-3.3.0.ebuild 611 BLAKE2B 16e9e7e6a93afceedd38063ee23c29cb23439cd74880f7087d50bfa2f997d86680f7049035bf87fe23cd40349e1c52581f9a0e6d07d985c0964c7db401b1d74d SHA512 e67a8bbab8d98d24f42f24e4ff5e0c3d7ecb9cd3c4f9d4da7b465b126e8925ee28d63bd107bcf8002df57f281dba81caf2efb45878c70ce8a5660a1bac926545
+DIST batteries-3.4.0.tar.gz 827778 BLAKE2B 569ce623ceb4272de784400540969a08d569a9b42e281f8001f046733a0fab6f50f4c195b8a8eec7f2e63209a1b882d6703843f76ec9adbfeb42d11e09b31f81 SHA512 e7a6e258430ec5bb97a1e83c7eb666c970db8bce82de4bf809797cf5e330ea987fe685008c4adb0ac4787c4cc6a1be06f6eae5a7ca856a1a0f83aa35716c23bd
+EBUILD batteries-3.4.0.ebuild 616 BLAKE2B e32aff29c535e0709d5753c599486560a817cd55d90929b3b3f1282621fba0870c8502582d44b74e82042ec37f9689047b4304bcdcea23b21cc29e46ea297f67 SHA512 ae94afdc30cfca552af14c5a2d082d5ef05f92052c403aa16d28957fbbc5c29e302364bcb3ba6b334c2103a5db7b213683a6bb9e8d934d2a6333b3ff6474a76a
 MISC metadata.xml 337 BLAKE2B 2cb7f9b54ec498c0b25f3f6cb2011046c38c0103341f22dea799e2fe501c46336950040fcfb8fe3fd4723aa5f499e00e6b0dae364a8fc06b84aa348ddebea0c2 SHA512 88a13f02eead4f3c06bdfa1850ee53ee6d309181d89a0625a89dfa3e421f3f7cb3d896cc2f69f4ddf6cef05f1bff932b6c2d79b791d69b65a21afed822637ded
diff --git a/dev-ml/batteries/batteries-3.3.0.ebuild b/dev-ml/batteries/batteries-3.4.0.ebuild
index c7cf1cfb3d3b..c2f48c5b9535 100644
--- a/dev-ml/batteries/batteries-3.3.0.ebuild
+++ b/dev-ml/batteries/batteries-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index ac6c906f593b..6d1317d46532 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,6 +1,6 @@
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
 DIST findlib-1.9.1.tar.gz 273012 BLAKE2B 8b51e3ca3dde04e77e225638f9d45166acf42fb1e3321aa5ce6e66fcddcfb978a301f2fa22a26172e1a8c2f8a879c5d1d10e8c984994d6b2879c21c4392955ce SHA512 83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84
-EBUILD findlib-1.8.1-r2.ebuild 1670 BLAKE2B f64382277a45d1cbe278e6eb389cafd2fb255363694b36483b8eef0c33af4f08db95f2ab14b13a02f985c3e8b04940a39cb175616ad9e224893175342ff4be38 SHA512 9c51f008f2a9ee6189ee1a541f8187a149195dd114694ef35cd0c7774bdb128bf32df8a4f8f28dccec656eb8d5540590f24fb458aec84cadb1b04bbededd03fa
+EBUILD findlib-1.8.1-r2.ebuild 1692 BLAKE2B 4af0b9ccc104f3b650a642afe3c26620ee6f93534fac9f3cd03acb1b452717216d491b8bc85bf8482c56dd9d01d997ab511f36b2c830b3f3e7bcc675796047f4 SHA512 a6bfbaf068d33e9871d474999652e6f983c3b77eeb37161c777904b7d245205add1e6631e766f26fd5a8c464c8105428d88a4f8d4d5b3477fb71c7cb42abf28b
 EBUILD findlib-1.9.1.ebuild 1629 BLAKE2B be50bf81301e64b7eebefea1e7ee454f0ff42062bf54621d92f0dd427bcee2f031f743957fff86a1e7a9d5be9075488891a2c39884a60458de5e725edf81f1fc SHA512 e3d9d8083d36446a0ed05fa6cbaf844ccb5c8fec59ff396bca6f9f600a6408c038bdb6693d1b135b4e8ef125f5fcc9f9f0e44583bc768de09fb92b65e6f4ec03
 MISC metadata.xml 418 BLAKE2B 59a2e1618b3ebec5343c419a335c5cef124f844ee5beff5e8deb3d94b48aed5f1b9f85301f348f85a518d30516a40bab613f3750a8612e8b7a4baef2966dc15a SHA512 5451f3a709e9aa824bd3159dba3f50060e7df6d097ddbfe1cec93e933c34869b5eda66e5fc8b6cfb54940820fbb829ed8b3b1fc6555e06b117bc738f7ea7a1fe
diff --git a/dev-ml/findlib/findlib-1.8.1-r2.ebuild b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
index bcbb3f9c90c2..60e5737d4a7f 100644
--- a/dev-ml/findlib/findlib-1.8.1-r2.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-lin
 IUSE="doc +ocamlopt tk"
 
 DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+	<dev-lang/ocaml-4.13
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/luv/Manifest b/dev-ml/luv/Manifest
index 4ff62ff83739..c59f9ffbfd7f 100644
--- a/dev-ml/luv/Manifest
+++ b/dev-ml/luv/Manifest
@@ -1,3 +1,3 @@
 DIST luv-0.5.10.tar.gz 805333 BLAKE2B 23edd2bc870a2886e560d330d9a20b205a77ea7bc8ed631e00e43819474eeb75246b407113b59ed9c5f74462ad5f721338ac5a157a1fe0e443abf9ff88771089 SHA512 c50a0def366944b4ef6038503ecefe75d8e45f542311198531f01a355675c08b00370480141b455616429a883c3232d34628e6a67846db5864a1b0eabfe6311f
-EBUILD luv-0.5.10-r1.ebuild 565 BLAKE2B 9a2d6049ae875f05b0df5371459ad4529e713df331a3f8180ca3a51899957127d8f1effcbac42b34d77efc944392b472680500f8f2e5247e123687dac19a730a SHA512 1448ee4b892851965a40ef36e6019306dca3faf83c0fd08cc6835c25bb7bb6f815f8533618d40d4a44d60dbd5c2157448fd0a3a7ceac2602d3f44c2fd63c2550
+EBUILD luv-0.5.10-r2.ebuild 601 BLAKE2B 5e78af11122c6f843dbc6effdb3af270ec648ce4fd06cc789403fce806fdc125607173064daa8356bcbb402bbbb34b1e951d0b8f536f7eccc8dfa489224b035e SHA512 64ad9d467a4ae64d3563c128678883823ae89cdc1f39a27fdb0283f38e491d0bde7f1b875df2bed3ba0f131971ee4bbfab1cb4a606bef60a56a65d9bee30d0a1
 MISC metadata.xml 309 BLAKE2B 2571e139ee75123b88f05751d493805433dd5f22ac3f06e82adf97017f53fa54c1870ee947b4e98ed55d4f134b837e1850d86fb10e6db43f0c37f1d54a2a07db SHA512 a917d2ea07601ed6c8d9386ce92deb19dfa0a37e3cf42b7808cb9e6e47ad57b1a9495f4b5f43695bd13d1a09837e40ae265bcb1b6bac30e62fec39bee1728456
diff --git a/dev-ml/luv/luv-0.5.10-r1.ebuild b/dev-ml/luv/luv-0.5.10-r2.ebuild
index a50ac52098a3..01d679ae6917 100644
--- a/dev-ml/luv/luv-0.5.10-r1.ebuild
+++ b/dev-ml/luv/luv-0.5.10-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit dune
 
@@ -16,6 +16,7 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	<=dev-lang/ocaml-4.13:=[ocamlopt?]
 	dev-libs/libuv:=
 	dev-ml/ocaml-ctypes:=
 	dev-ml/result:=
diff --git a/dev-ml/num/Manifest b/dev-ml/num/Manifest
index d834f46b6e14..93d379406008 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -2,5 +2,5 @@ AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a5
 DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
 DIST num-1.4.tar.gz 66327 BLAKE2B 59eae642e19f452dd911ef6c32b89978f2034a5fcaece4a358f3da447c8d6cb2b2581c39d032eb117edaf7ecf942583281eb6e31716b06960e768c2a985e099e SHA512 0cc9be8ad95704bb683b4bf6698bada1ee9a40dc05924b72adc7b969685c33eeb68ccf174cc09f6a228c48c18fe94af06f28bebc086a24973a066da620db8e6f
 EBUILD num-1.3-r1.ebuild 781 BLAKE2B 00e2a293bd75493d356699c154a45c4bbc82b9f35fd5167896a9ed581ac2d10405db1c60a3acd5634c02774ab3695cea2931adcc636c71fbb7c29e9a8ccef32e SHA512 83d3167348b0beb3699362207258ce9f12a4b9b9229f1f2c9c4590104f5d854f86db2b4b1dc6e137797513436e46afb2d581dc6027c8809a39ceee9daf6a5b38
-EBUILD num-1.4-r3.ebuild 936 BLAKE2B 8c40799f3a26483bd862bcec5015cd778fd750cabc909f26d521a605b28dcfac36f1b663c829272dec7c97dff50a43ca01bb239f376aadd2ba312a5b152dd257 SHA512 faf3ae651490e82bc7e4ee2fb31ca5059d6c03a21172514cf7285e6d33fb51acc5d7cd0263291bb3aa1d1adda6ae8607eea1bfc295a52ddc4970b25dbfcfe16b
+EBUILD num-1.4-r3.ebuild 977 BLAKE2B 54d2e6a119bd65bd06a6536764bc9cb566cbd4770b3c197fa2ec827b0b76c1fcd6bce29b2a4e4bb7ef6a43bd8b37187bf19d4a5f60625c0cda5e897e5f0c8df3 SHA512 64a0e82280529de9f3b79229ffc18ef1997a022c6879c010a875c972041609cff230e8c52f6a58dbfb645b4c5372ae9613266dfb06eb78d2b19b43f73c42e956
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/num/num-1.4-r3.ebuild b/dev-ml/num/num-1.4-r3.ebuild
index 70fe28fb9f8c..4b0101e0e90f 100644
--- a/dev-ml/num/num-1.4-r3.ebuild
+++ b/dev-ml/num/num-1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ src_test() {
 }
 
 src_install() {
-	findlib_src_install
+	findlib_src_install NATDYNLINK="$(usex ocamlopt true false)"
 
 	if has_version ">=dev-ml/findlib-1.9" ; then
 		# See bug #803275