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

4 files changed, 126 insertions, 0 deletions

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
+