gentoo auto-resync : 31:01:2023 - 21:02:55

7 files changed, 132 insertions, 3 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index b2d74b709f43..ac5b11732c70 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index da36eee10e4b..65cfe5dc6011 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,6 +1,6 @@
 AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
 DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
 DIST cudf-v0.10.tar.bz2 47664 BLAKE2B 6ecdfc4243d80f12f6904b334f93ff47beb94535b6ba84992c6a31d244a7c2dcb6072e67828d96b31d4628bb244022fd962efcdcae5299f5a57694f3aa6c95a8 SHA512 b36ecad224070d2c07d4123fb7e39160390ddec4196505e66aad9fbd982bd7ca320ff5f0e771e7996da49bff22fb87fc057060277695b75cd68de19e57cb3855
-EBUILD cudf-0.10.ebuild 1595 BLAKE2B bd96044c0a0d88e17f6dcbe94b269c57ead12236179e7ba7c270a6b1c47cff7b3a633bc6054213dbf46238c2cc7fd8393879cf4bf6474ded9d201066efffdba5 SHA512 79ca2ea61e6405f9ef2b535574f4bee197db772b75a2e46c28ab5069c405612b7350ef6027c57c8eac317b24271cd8988cf46386d0665e6700226e40331fd7ba
+EBUILD cudf-0.10.ebuild 1715 BLAKE2B e3f10c89374fb72de73ff796b881d580a01f7cf6dbfc0b6ebf782f64c2629efc2a120d2bcf9cde11ec6baa736d12ed1cd7a534c5201b7ca0bd09a101e24d7689 SHA512 260355e3ffb77a590a4d80a28ae4765ae0e53a1b045d63e5f56702f6699a3ecb8dbe66bf3d774c69660bda47ea2a9e97ced68826b3f97449d5ccaf442ffab14f
 EBUILD cudf-0.9-r2.ebuild 1842 BLAKE2B d8461a2af2d7e06d2f58ec11d87de3b1a4e24cbd7bb902b7d9ece589230313d1bb06b7ab7c729011b66188b14024ebb961f12c9689719c36b7a2f4dc396ee77d SHA512 b28fcb640bbb14d80c1dd45eb1a3c5c71a7412ae0eb6243095d1388d7e01d27e2a11ed00806a6562d82d192fdf05477ff5fcdfa6c467780ddc5ec1da6ddefebb
 MISC metadata.xml 413 BLAKE2B f0065b78cfbaafa5376ea7395b35a9e1611ac094455d0ea28c84de8d076b8bbd1abc33167d58a37802d815e78b7f9363e706d118d8629564cf4feab4ae2c9db2 SHA512 53d4c2b11de9d79823bce6e4d683820fc08577ec7fdf238f21d37ffffe80b9f4017b25f521839bb63a606bad6f4be36542f3dc422fd6f4fbc83b170268d38e78
diff --git a/dev-ml/cudf/cudf-0.10.ebuild b/dev-ml/cudf/cudf-0.10.ebuild
index 4f7747d11caf..3f445d97a5b3 100644
--- a/dev-ml/cudf/cudf-0.10.ebuild
+++ b/dev-ml/cudf/cudf-0.10.ebuild
@@ -71,6 +71,9 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-	dodoc BUGS ChangeLog README TODO
+	dune_src_install
+	mv "${ED}"/usr/share/doc/${PF}/{cudf/README,} || die
+	rmdir "${ED}"/usr/share/doc/${PF}/cudf || die
+	emake DESTDIR="${ED}" -C c-lib/ LIBDIR="/usr/$(get_libdir)" -e install
+	dodoc BUGS ChangeLog
 }
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 2b22266c54bc..79c6823b5978 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,7 +1,10 @@
+AUX 0001-Add-support-for-OCaml-4.12.patch 608 BLAKE2B 93017ae1ae11a799a32cead5b59bae37ed5c738838270bc5ef3c7ee722b85dfdac9529512fc0bf3323d025c783ac83306683475889eebb5e20433fde62524e34 SHA512 67faa8c25b4a9209d08312d7285a870bf3ba43301aee62b98f81f0a03617103c6ee2d4079cf7649a781250f593e970814dd86cb300cecaa7bdb5688e08b25965
+AUX 0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch 1130 BLAKE2B 3158eaa45511b3a2f9bae082f3dbe39cf295564475d685bda312ad77f9eae831d25649d88686f8a635649a0f8c14149ec6cc87c5ad9b34aff005349be951bb1b SHA512 94456b133d3a51844f14c798942461875fcd81d38fef15cff1d5d8b957c2589a178e1be77e43e2d3890c9ad31b4143b54e028144ac4b48d329201aa1908986ff
 AUX extlib-1.7.7-no-git.patch 283 BLAKE2B 2cfc23016472905c9dfb28615bce04d607a70b99da69f1ed198c8cfdd677c1dd3d8b8a6756328bf35dbd59f81c7be143a5f5864110adca56cbc2dce8384d597d SHA512 b0b04d0fb6af94d7f54751fd00ab48101fb45d47e2230358edc956fd4d6fe04ce59b8aa6857fc1b07bb544fdade01eca6213de064c7d54b59f02e8265aebfb05
 DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5
 DIST extlib-1.7.8.tar.gz 90213 BLAKE2B cf78d819c542e84825bea3422d1b9afb46a3f72274ac40c704ae872a5889cbe0793f1e27f2dd8f38dee118590300d3bc6a336bfd29a16dfad00008a63ceeb17c SHA512 4a0d5d82da068c34286a1547e173f2634372d01c201823edfda2b8f72d3ff58fa26da29dde9a8b2fda28989cdb655d5a9cfd71310660e5c593026a75a833e6c6
 DIST extlib-1.7.9.tar.gz 91092 BLAKE2B 6d5f0dc01813357fd9b3efcbe0e4c4308eb538deb924cbff2919bc6e24b72e3fc631b428c1e67f90ea32005b87c16147265c80d61d8feb97df0223bc9b14736b SHA512 859cf5b9743589037f9e1b5f00ea77ae2401657b3dfc6897d21c89d5f8a1d7e7ac901eb6eaa16722e6b6a0266fa634c40320d13fcf7bdfad2863512b5f79e591
+EBUILD extlib-1.7.7-r1.ebuild 1109 BLAKE2B 735dedadcd0979e296f7b5d89afb79fdb7e849ba650b2f257f43816461d7caf5cc7dd8a125e3faf07d0f576a7cbf0d0aaad6d8c7532957d13917b432daeaaf1e SHA512 ad5522a67d98a5effd10de4cabe459471832afe6f10e529f484e775834e2ebc3dbf300db966bcd5ad71337df49008d13c74ff32dc736cc0e100434bf2c8b487e
 EBUILD extlib-1.7.7.ebuild 972 BLAKE2B ef3c881ba1cea4fbf695c54bb6d61ab7ae2afcc6afa26d29fdc6f8063530bf40bb53e8feaf75f6a47df7b152d0a0a7b58afecb15f03955e7f751edb9a5fd91b9 SHA512 821e4e25e12539e4f039183b1e102dfd899a46b55fe31b12e61368f2af33b2ec9190f2a2690fd7feb4f10515e6368f6749cc834ba281db88067504d7c5cffbfd
 EBUILD extlib-1.7.8.ebuild 925 BLAKE2B b4110605476d37d43eb112abb874ba78f0a6b054a45952bb671f1de7f9f6c46e7fc17d80a769b4cb982bdffbb30e072fc37e5423503cb194dba1b346de9ca7da SHA512 eb042316448e7f41f2c68672e0a09270a91bd788e775fd04909d513b72d7a7ce7ed8c9e7cfb892b750cebe97e0884045186d9e76f538ba7f771de5a11dbbad88
 EBUILD extlib-1.7.9.ebuild 880 BLAKE2B b11b3907414d95327a21893fdee2cd5484bd540345bd03c4d35566b7631bd2c11ed63eaf098d5784117c5296351bb256933c4e7a57edf6acdde50942c9e1b0d6 SHA512 dd1b5a5b6796abaaa9e0790e975d4dfb51f65a660d4dd4f929524a3d107c93beee29d1c08d58bab2a24f458b089e2c59e8d5b9d861e9f55bbef2463eb9401f74
diff --git a/dev-ml/extlib/extlib-1.7.7-r1.ebuild b/dev-ml/extlib/extlib-1.7.7-r1.ebuild
new file mode 100644
index 000000000000..b21b2aaa3217
--- /dev/null
+++ b/dev-ml/extlib/extlib-1.7.7-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib vcs-clean
+
+DESCRIPTION="Standard library extensions for O'Caml"
+HOMEPAGE="https://github.com/ygrek/ocaml-extlib"
+SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt"
+
+# See bug #704146
+BDEPEND=">=dev-ml/cppo-1.6.6"
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.7-no-git.patch
+	"${FILESDIR}"/0001-Add-support-for-OCaml-4.12.patch
+	"${FILESDIR}"/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch
+)
+
+S="${WORKDIR}/ocaml-${P}"
+
+src_prepare() {
+	default
+	egit_clean
+}
+
+src_compile() {
+	cd src || die
+	emake -j1 all
+	if use ocamlopt; then
+		emake opt cmxs
+	fi
+
+	if use doc; then
+		emake doc
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+
+	# install documentation
+	dodoc README.md
+
+	if use doc; then
+		dodoc -r src/doc/
+	fi
+}
diff --git a/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch b/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch
new file mode 100644
index 000000000000..8a2d076f8224
--- /dev/null
+++ b/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch
@@ -0,0 +1,25 @@
+From 3b2073701aed50cd768e0a4cd3c776c7a3a54d7e Mon Sep 17 00:00:00 2001
+From: Kate <kit.ty.kate@disroot.org>
+Date: Thu, 5 Nov 2020 22:17:24 +0000
+Subject: [PATCH 1/2] Add support for OCaml 4.12
+
+---
+ src/extList.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/extList.ml b/src/extList.ml
+index 4f0057f..a1435ee 100644
+--- a/src/extList.ml
++++ b/src/extList.ml
+@@ -380,7 +380,7 @@ let combine l1 l2 =
+   loop dummy l1 l2;
+   dummy.tl
+ 
+-let sort ?(cmp=compare) = List.sort cmp
++let sort ?(cmp=Pervasives.compare) = List.sort cmp
+ 
+ #if OCAML < 406
+ let rec init size f =
+-- 
+2.30.0
+
diff --git a/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch b/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch
new file mode 100644
index 000000000000..59a6843f3a15
--- /dev/null
+++ b/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch
@@ -0,0 +1,38 @@
+From 574e8eae2d358b6db62c2d062b194a7aa06ac02c Mon Sep 17 00:00:00 2001
+From: Kate <kit.ty.kate@disroot.org>
+Date: Fri, 6 Nov 2020 14:10:26 +0000
+Subject: [PATCH 2/2] caml_hash_univ_param was removed for OCaml (pre-4.00
+ function)
+
+---
+ src/extHashtbl.ml | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/extHashtbl.ml b/src/extHashtbl.ml
+index 140e9c2..3c69df4 100644
+--- a/src/extHashtbl.ml
++++ b/src/extHashtbl.ml
+@@ -22,7 +22,7 @@
+ module Hashtbl =
+   struct
+ 
+-#if OCAML >= 400
++#if OCAML >= 400 && OCAML < 412
+   external old_hash_param :
+     int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
+ #endif
+@@ -114,7 +114,11 @@ module Hashtbl =
+     (* compatibility with old hash tables *)
+     if Obj.size (Obj.repr h) >= 3
+     then (seeded_hash_param 10 100 (h_conv h).seed key) land (Array.length (h_conv h).data - 1)
++  #if OCAML >= 412
++    else failwith "Old hash function not supported anymore"
++  #else
+     else (old_hash_param 10 100 key) mod (Array.length (h_conv h).data)
++  #endif
+ #else
+   let key_index h key = (hash key) mod (Array.length (h_conv h).data)
+ #endif
+-- 
+2.30.0
+