gentoo auto-resync : 23:11:2024 - 03:02:56

24 files changed, 62 insertions, 307 deletions

diff --git a/dev-ml/0install/0install-2.18.ebuild b/dev-ml/0install/0install-2.18-r1.ebuild
index b88424ef2d7c..6041f253e5a0 100644
--- a/dev-ml/0install/0install-2.18.ebuild
+++ b/dev-ml/0install/0install-2.18-r1.ebuild
@@ -17,10 +17,15 @@ IUSE="+ocamlopt"
 
 RDEPEND="
 	dev-ml/lwt:=[ocamlopt?]
+	dev-ml/ocaml-sha:=[ocamlopt?]
+	dev-ml/ocplib-endian:=[ocamlopt?]
 	dev-ml/ocurl:=[ocamlopt?]
-	dev-ml/yojson:=[ocamlopt?]
+	dev-ml/react:=
+	dev-ml/stdlib-shims:=[ocamlopt?]
 	dev-ml/xmlm:=
+	dev-ml/yojson:=[ocamlopt?]
 "
+BDEPEND="dev-ml/findlib"
 
 RESTRICT="test"
 
diff --git a/dev-ml/0install/Manifest b/dev-ml/0install/Manifest
index 925098c71aff..da25fad49e0b 100644
--- a/dev-ml/0install/Manifest
+++ b/dev-ml/0install/Manifest
@@ -1,3 +1,3 @@
 DIST 0install-2.18.tbz 452385 BLAKE2B 90b4ce4d508005fd3fc9303e4fbb86fe830568fccab2aa6cbbadd16b232b3b3d2446dcd830069e0d96011c500f2e484d7009fbeedf12b6f520e17042aa784605 SHA512 6d4734754951fad9caad5d876a1301e283bdd77a080d6601d57b21c540a30a616b18f664cbd4f86748c90de41cf3ef54f3a883fd75f638abbe3630a0320e4a7f
-EBUILD 0install-2.18.ebuild 600 BLAKE2B 81a38f3bdb85606de4b62fc7c3f955995c29fc37fb757c3f696b7aa3b0995a33a64be1f84ac4555d93bf5f65d1502dfe6e3570d284b5ea34b0ecac9eb11af6f7 SHA512 ee2e2f9910d3d06e8cb205119f97d16db52e7ef498943888dc939011a64ae8abcaf533effe2ff828644f0cb18a6f12a93526ef162bc2e19e4bb7e1a5d159e783
+EBUILD 0install-2.18-r1.ebuild 741 BLAKE2B 65bad29da613676aec0ecd2fd79650e4d2ed2132e7600117a3b774d7a28c781f4e195431ccb98790e5246893c312afa6640a941d5142a9bcee8b087a45e4a33a SHA512 080db5e73207f2648fc49df10a1214701d210a72b263703c088adca9dbeaa697d928ef903c74d420bb6472530fa1f19d10d9bbb56395b3bb77a688c118ca9515
 MISC metadata.xml 737 BLAKE2B 53ffbf43909744e16b98265d7742a95e7274ddb32741cc5ba055e1e7891fc77f377b758706d0fc08fa64aaa865dddf9de643556289db1cfcfca483b4e7d834cb SHA512 8a49e83b132b41803bc13c02d77ccdfaa422eef6a4a918502b1cfbb9d58e5b02e9887d06555e43169c776012bd2b4654860f724f451fb2d57ddd5d6e2ae43f37
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index fbb5baa82ae1..7080e22d2a22 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index 373776b2fd4a..d42a54352bb7 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,4 +1,3 @@
-AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
 DIST cudf-v0.10.tar.bz2 47664 BLAKE2B 6ecdfc4243d80f12f6904b334f93ff47beb94535b6ba84992c6a31d244a7c2dcb6072e67828d96b31d4628bb244022fd962efcdcae5299f5a57694f3aa6c95a8 SHA512 b36ecad224070d2c07d4123fb7e39160390ddec4196505e66aad9fbd982bd7ca320ff5f0e771e7996da49bff22fb87fc057060277695b75cd68de19e57cb3855
 EBUILD cudf-0.10-r1.ebuild 2216 BLAKE2B afc71be9bafefb590bba4fedc82d0cbd958d1bd7be0fe7709265c27e451d942affdfc12fa4946e6c3616a152edbda8f5ff3e09a7d126fa0bccd12654592ebe73 SHA512 d23507b36faca065bf4a7c5759ae72ed289554e89d4673485b2e1bb1e8261c2b1cd8c99ab46c1cf80d104274a376e728a1f0aea2a65ca913eca42cfbc2f23b01
 MISC metadata.xml 308 BLAKE2B 3ef59c1feb944f3cc9773629c5c4da487557829efb4764ce4b58f70c4a6c958bf675402ade39dde82b9f433c40d7933f4dcd372c529aec41a59a413287d43ee2 SHA512 4d7af5033b612da1fb1d2a80676c1e2a9818566c69c585c72554ac3fb827ea8bf216a59b9fb61ca0c2d74ea5745d6559d819e58512d100d482b9b53f5af3dd7d
diff --git a/dev-ml/cudf/files/ounit2.patch b/dev-ml/cudf/files/ounit2.patch
deleted file mode 100644
index 5fbedbf26edf..000000000000
--- a/dev-ml/cudf/files/ounit2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: cudf-0.9/_tags
-===================================================================
---- cudf-0.9.orig/_tags
-+++ cudf-0.9/_tags
-@@ -1,5 +1,5 @@
--<test.ml> or <tests.ml> : pkg_oUnit
--<test.byte> or <test.native> : pkg_oUnit
-+<test.ml> or <tests.ml> : pkg_ounit2
-+<test.byte> or <test.native> : pkg_ounit2
- 
- <*.ml> or <*.mli> : pkg_extlib
- <*.byte> or <*.native> : pkg_extlib
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 185eeb16a54d..bfb29d7c672f 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,6 +1,3 @@
-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.9.tar.gz 91092 BLAKE2B 6d5f0dc01813357fd9b3efcbe0e4c4308eb538deb924cbff2919bc6e24b72e3fc631b428c1e67f90ea32005b87c16147265c80d61d8feb97df0223bc9b14736b SHA512 859cf5b9743589037f9e1b5f00ea77ae2401657b3dfc6897d21c89d5f8a1d7e7ac901eb6eaa16722e6b6a0266fa634c40320d13fcf7bdfad2863512b5f79e591
 DIST extlib-1.8.0.tar.gz 90132 BLAKE2B e890a13f3d32c7c25a5fbe9dda9d85139e2d54f3275d1236f575aab88a615718a343bfcf6f0f3832d14855ac720f99c6a45a28a3aec84f2a4e27098eb648863e SHA512 f82892bcd9b3098a313c8f130c4926a093a5cbbb098f509f80d6c176c9ff3a7b345daa1c6298bd4d6da0b41b98c681aed50c68b066eba2de1fd5fc07f99dc487
 EBUILD extlib-1.7.9.ebuild 875 BLAKE2B 0008b03562cb470ab2c8ee5be87e43ead6cbe6bf6cb66d30eb207b2d3bfc9c02bce095173bb17a0321e66ea3d077ac111a37503d8b26ceafcd8cc24be1504685 SHA512 c977767b9027c19baec4a60e9081f5993eb251352ef33dc11900b6c9106a8c91e1e5a281a01cad56a5900413a19342df52075a9180976804e5eb0e99c86ac290
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
deleted file mode 100644
index 8a2d076f8224..000000000000
--- a/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 59a6843f3a15..000000000000
--- a/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
diff --git a/dev-ml/extlib/files/extlib-1.7.7-no-git.patch b/dev-ml/extlib/files/extlib-1.7.7-no-git.patch
deleted file mode 100644
index 058543455bce..000000000000
--- a/dev-ml/extlib/files/extlib-1.7.7-no-git.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- ocaml-extlib-1.7.7-orig/Makefile	2020-04-25 07:55:13.000000000 +1000
-+++ ocaml-extlib-1.7.7/Makefile	2020-09-26 07:17:42.141178856 +1000
-@@ -1,5 +1,5 @@
- 
--VERSION:=$(shell git --git-dir=.git describe --always --long)
-+VERSION:=1.7.7-0-gbd9f453
- RELEASE:=1.7.7
- 
- ifndef VERSION
diff --git a/dev-ml/jsonm/Manifest b/dev-ml/jsonm/Manifest
index b84a7696cfb4..f26f90b39940 100644
--- a/dev-ml/jsonm/Manifest
+++ b/dev-ml/jsonm/Manifest
@@ -1,3 +1,5 @@
 DIST jsonm-1.0.1.tbz 21608 BLAKE2B 4d3ce2a3430176df0876aeb6276a48bf23e51ebee2a1a46e5b25a370b26ba27c9ba09ff01365396123de4851d8f263c4c86c3176b13118910fd458ad3b23d80b SHA512 e86e225073b429f71063af14ad39b87498609db6a122b39e1a739c5b77fcde487bf6b17235b2f9742b7d22aca0f6d475fdba1b0bab2a6329cf7e681fe43d31a6
+DIST jsonm-1.0.2.tbz 22368 BLAKE2B b2f500796a21abb3d540064462dba7bd63459d9f1a3b47e419a8ea075b8cef24b744a128e4eb2c4a238de36db7c0eaaf60f85e137e3767836e23b5ec3cf89b98 SHA512 0072f5c31080202ed1cb996a8530d72c882723f26b597f784441033f59338ba8c0cbabf901794d5b1ae749a54af4d7ebf7b47987db43488c7f6ac7fe191a042f
 EBUILD jsonm-1.0.1.ebuild 969 BLAKE2B a000eca08f314c37271c4800acc6edc3e3adcca24004d2fb7d2048f1eb31f344ba3441de6c59dc8aa5495aefd84abc13b9754ceee828148a2630da6a6cb6b46c SHA512 6a98f40523340aa4437e12667184ff9adc6d3dc9d543d1b353ffd8966cc1a1c019b6a51c80fc19af354d62645ed43639dfdec8ad3eafb83bf6e6df0e7ddad9f8
+EBUILD jsonm-1.0.2.ebuild 936 BLAKE2B 2c2f07de5dcc2187bcf02e1f4dfe7853a3b9e0381caff79f90f9c59a0561a52c7d79d7f6299e7836196d9ad6475363bf67c0abc0179fd4c6f10306ebf9efebe0 SHA512 fed4c7bc5d31c124363dc969de9bf00027928b723ef661c6692055b77249db8de3b4a1678833c8acab67caa5f6216b304586afa94c0863ef62f1fee7facdab9e
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/jsonm/jsonm-1.0.2.ebuild b/dev-ml/jsonm/jsonm-1.0.2.ebuild
new file mode 100644
index 000000000000..64e58477661e
--- /dev/null
+++ b/dev-ml/jsonm/jsonm-1.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib
+
+DESCRIPTION="Non-blocking streaming JSON codec for OCaml"
+HOMEPAGE="https://erratique.ch/software/jsonm"
+SRC_URI="https://erratique.ch/software/jsonm/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-ml/uutf-1.0.0:=
+	dev-lang/ocaml:=
+	dev-ml/uchar:="
+DEPEND="${RDEPEND}
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib"
+
+src_compile() {
+	ocaml pkg/pkg.ml build || die
+}
+
+src_install() {
+	# Can't use opam-installer here as it is an opam dep...
+	findlib_src_preinst
+
+	local nativelibs="$(echo _build/src/${PN}.cm{x,xa,xs,ti} _build/src/${PN}.a)"
+	ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
+
+	newbin _build/test/jsontrip.native jsontrip
+	dodoc CHANGES.md TODO.md README.md
+}
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 906c208b97f2..b27c9e8ab097 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,7 +1,3 @@
-AUX lablgtk-2.18.10-cflags.patch 2859 BLAKE2B a0112d27ab9b3ad7fcc25cb037220d7d43c4e1737467369715ec5dddcc1aed7c88110f7d7bef2ba41d2edf997acc138b5bdfc0e98f151612da632c36046f2ff5 SHA512 8bfe243c3e6748172195840fefba37215547d57ffa356f63881d78f52323359ca387025a777e679c9638e652696af20bb574ac0a057b2e63b331568cbd65cb36
-AUX lablgtk-2.18.12-Makefile.patch 818 BLAKE2B 5d5e51b64b13eb5bb7d808a7dffeddaa4b151a5255317d6b2e585f5d389fbaeeea8696613f4053ff611839cf382a72061bb9ebafe52be3c6b55f0468d0293527 SHA512 0d806f51a80cd3595412e3d64bf2e9d5b167c7094d7de4181e793fca04e374eee154fca380ef194703edd90448d5544c5e2e7973737ffd1bfc1def23a3894987
-AUX lablgtk-2.18.12-cflags.patch 2105 BLAKE2B 5e72efba3b484142070aa38ea487eb8fe82018f7f8f2420a08d0acff25450c11184aa121df67447b79b4ac1146999535f34f5f794465a9cfac5f75bf8275db0e SHA512 684a905979372e18f63b68bcc418a8e8401c51931cca45440531ea58eaad583923fd37fb167709c8394f967f4987161d88ea00714f8406048269ac59c51313e8
-AUX lablgtk-2.18.12-depend.patch 578 BLAKE2B e03e04fb62b2a24a04f18bc21d1783d0f81567c54670bc62fc8e875c1a4a30920cc9052e4a2da143f862f0e5a3a4f954e97b302ab774c7a1741799debfc7d054 SHA512 24d9cfc776d0d42b1cb48f6b3704b2345b67e7e4fd918296c550a794717640cd51c105a90c4086c8932336823533946cc9cd00b0e4a2f290d3d0a12de1151e09
 DIST lablgtk-3.1.5.tar.gz 1045721 BLAKE2B 5f677d2ac1a39f23e5c3b66f6239540e369ec6916eb87f980543a7ea6c723b5126882fd4f9673f8a76171d0e83de236b98ae9068956f86a0a37cb836c353b9e5 SHA512 750f57ea2ccb0534123596aca04a4ba12bbf67bafb521a7978e6acc8027b2b3b822d373bf3fabb4018640c5e2d5bc3d5a336e91ceb8ff037b1f7a048440df03a
 EBUILD lablgtk-3.1.5-r1.ebuild 718 BLAKE2B a925e5b5c6e4354287c600f78a3f765a909ca1fe138bb228473f113b32e1a826e36e6a270031505aa33cb20050349d9cdddc26cfe9461a957e4f8dd440446e7b SHA512 312e7a1593bbf4df7c12086e043a318593b91064ae6ea745ac4bf724fea6303bf4f73d66c467f416abb3bb64943efbb516193be9a9fe538f7a08c5e9c810b015
 MISC metadata.xml 434 BLAKE2B 8f5982cb9c9bac7ff59b154061a61f4c39860306ba86ac84bcf1c58b5d6d0b5ea53370a4f6b7d0678f1b87a149c0af94efb84303d1474b2d0e1b1d48f9e7479a SHA512 d53fc304dedc36292e89fc577bd796abded1d1944a90f0421255a7161446d551316f16c61153e9be6e4d21e897f43a77e2b2f50afc0d875f42eafbf989596f81
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
deleted file mode 100644
index ca82491113b6..000000000000
--- a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/src/Makefile	2020-05-14 22:01:09.565870733 +0200
-+++ b/src/Makefile	2020-05-14 22:06:49.081621996 +0200
-@@ -18,6 +18,7 @@
- 
- include $(CONFIG)
- #GTKCFLAGS += -Werror -Wno-error=deprecated-declarations
-+CFLAGS=
- 
- TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
- 	$(THINITOBJS) build.ml
-@@ -44,15 +45,13 @@
- endif
- 
- ifdef DEBUG
--COMPILER += -warn-error A-52
--CFLAGS = -g $(GTKCFLAGS)
-+OCAMLCFLAGS = $(GTKCFLAGS)
- CUSTOM = -custom
- #MLLINK += -cclib -lcamlrund
- MLBYTEFLAGS = -g -dtypes
- else
--CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
-+OCAMLCFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
- ifneq ($(TOOLCHAIN),msvc)
--CFLAGS += -O
- endif
- endif
- 
-@@ -65,9 +65,9 @@
- THLINK = unix.cma threads.cma
- 
- ifdef USE_CC
--CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS)
-+CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(OCAMLCFLAGS) $(CFLAGS)
- else
--CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose
-+CCOMPILER = $(CAMLC) -c -ccopt '$(OCAMLCFLAGS) $(CFLAGS)' -verbose
- endif
- 
- ifdef USE_GL
-@@ -123,7 +123,7 @@
- CLIBS += liblablrsvg$(XA)
- RSVGMLOBJS = rsvg.cmo
- RSVGCOBJS = ml_rsvg$(XO)
--$(RSVGCOBJS) : CFLAGS+=$(HAVE_SVGZ)
-+$(RSVGCOBJS) : OCAMLCFLAGS+=$(HAVE_SVGZ)
- endif
- 
- ifdef USE_GTKSPELL
-@@ -140,7 +140,7 @@
- opt::  lablgtksourceview.cmxs
- endif
- 
--ml_gtksourceview.o: CFLAGS=$(GTKSOURCEVIEWCFLAGS)
-+ml_gtksourceview.o: OCAMLCFLAGS=$(GTKSOURCEVIEWCFLAGS)
- GTKSOURCEVIEWMLOBJS = gtkSourceView.cmo gSourceView.cmo
- GTKSOURCEVIEWCOBJS = ml_gtksourceview$(XO)
- ml_gtksourceview.c: pango_tags.h
-@@ -179,7 +179,7 @@
- endif
- 
- ifdef USE_GTKQUARTZ
--CFLAGS += -DHAS_GTKQUARTZ
-+OCAMLCFLAGS += -DHAS_GTKQUARTZ
- endif
- # Rules
- .SUFFIXES: .ml .mli .cmo .cmi .cmx .cmxs .cmxa .c $(XO) .d$(XO) .var .h .opt .def .ml4
-@@ -188,7 +188,7 @@
- .cpp$(XO):
- 	$(CCOMPILER) $<
- .c.d$(XO):
--	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(CFLAGS)' $<
-+	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(OCAMLCFLAGS) $(CFLAGS)' $<
- .ml.cmo:
- 	$(COMPILER) $(PRINCIPAL) $<
- .mli.cmi:
---- a/src/ml_gdk.h	2020-05-14 22:19:59.045394874 +0200
-+++ b/src/ml_gdk.h	2020-05-14 22:20:06.694277819 +0200
-@@ -102,7 +102,7 @@
- CAMLexport int OptFlags_GdkModifier_val (value);
- CAMLexport int Flags_GdkModifier_val (value);
- CAMLexport int Flags_Event_mask_val (value);
--CAMLexport lookup_info *ml_table_extension_events;
-+extern lookup_info *ml_table_extension_events;
- #define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key)
- 
- #define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val)
---- a/src/ml_gdk.c	2020-05-14 22:21:39.244861128 +0200
-+++ b/src/ml_gdk.c	2020-05-14 22:21:57.571580518 +0200
-@@ -55,6 +55,8 @@
- #define GDK_WINDOW_TYPE_HINT_DOCK GDK_WINDOW_TYPE_HINT_NORMAL
- #endif
- 
-+lookup_info *ml_table_extension_events;
-+
- CAMLprim void ml_raise_gdk (const char *errmsg)
- {
-   static const value * exn = NULL;
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
deleted file mode 100644
index eccbf30a3ea8..000000000000
--- a/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Makefile	2022-12-23 21:39:09.743150707 +0100
-+++ b/src/Makefile	2022-12-23 21:39:40.219667855 +0100
-@@ -23,7 +23,7 @@
- TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
- 	$(THINITOBJS) build.ml
- 
--all: dist byte
-+all: dist byte sourceView2Enums.ml
- world: dist byte $(CAMLBEST)
- install: findlib-install
- uninstall: findlib-uninstall
-@@ -617,7 +617,7 @@
- 			gtk_tags.h gdk_tags.h ml_gtktext.h sourceView_tags.h wrappers.h
- 
- $(GTKSOURCEVIEW2COBJS):  ml_glib.h ml_gdk.h ml_gtk.h ml_gobject.h ml_gdkpixbuf.h ml_pango.h \
--			gtk_tags.h gdk_tags.h ml_gtktext.h sourceView2_tags.h wrappers.h
-+			gtk_tags.h gdk_tags.h ml_gtktext.h pango_tags.h sourceView2_tags.h wrappers.h
- 
- ml_glib$(XO): glib_tags.h ml_glib.h wrappers.h
- ml_gobject$(XO): gobject_tags.h ml_gvaluecaml.h wrappers.h
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch
deleted file mode 100644
index aeef5c319a6d..000000000000
--- a/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ur lablgtk-2.18.12.orig/src/Makefile lablgtk-2.18.12/src/Makefile
---- lablgtk-2.18.12.orig/src/Makefile	2021-12-25 02:23:31.000000000 +0100
-+++ lablgtk-2.18.12/src/Makefile	2022-03-04 08:12:28.151812474 +0100
-@@ -18,6 +18,7 @@
- 
- include $(CONFIG)
- #GTKCFLAGS += -Werror -Wno-error=deprecated-declarations
-+CFLAGS=
- 
- TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
- 	$(THINITOBJS) build.ml
-@@ -45,14 +46,13 @@
- 
- ifdef DEBUG
- COMPILER += -warn-error A-52-6
--CFLAGS = -g $(GTKCFLAGS)
-+OCAMLCFLAGS = $(GTKCFLAGS)
- CUSTOM = -custom
- #MLLINK += -cclib -lcamlrund
- MLBYTEFLAGS = -g -dtypes
- else
--CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
-+OCAMLCFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
- ifneq ($(TOOLCHAIN),msvc)
--CFLAGS += -O
- endif
- endif
- 
-@@ -65,9 +65,9 @@
- THLINK = unix.cma threads.cma
- 
- ifdef USE_CC
--CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS)
-+CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(OCAMLCFLAGS) $(CFLAGS)
- else
--CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose
-+CCOMPILER = $(CAMLC) -c -ccopt '$(OCAMLCFLAGS) $(CFLAGS)' -verbose
- endif
- 
- ifdef USE_GL
-@@ -123,7 +123,7 @@
- CLIBS += liblablrsvg$(XA)
- RSVGMLOBJS = rsvg.cmo
- RSVGCOBJS = ml_rsvg$(XO)
--$(RSVGCOBJS) : CFLAGS+=$(HAVE_SVGZ)
-+$(RSVGCOBJS) : OCAMLCFLAGS+=$(HAVE_SVGZ)
- endif
- 
- ifdef USE_GTKSPELL
-@@ -140,7 +140,7 @@
- opt::  lablgtksourceview.cmxs
- endif
- 
--ml_gtksourceview.o: CFLAGS=$(GTKSOURCEVIEWCFLAGS)
-+ml_gtksourceview.o: OCAMLCFLAGS=$(GTKSOURCEVIEWCFLAGS)
- GTKSOURCEVIEWMLOBJS = gtkSourceView.cmo gSourceView.cmo
- GTKSOURCEVIEWCOBJS = ml_gtksourceview$(XO)
- ml_gtksourceview.c: pango_tags.h
-@@ -179,7 +179,7 @@
- endif
- 
- ifdef USE_GTKQUARTZ
--CFLAGS += -DHAS_GTKQUARTZ
-+OCAMLCFLAGS += -DHAS_GTKQUARTZ
- endif
- # Rules
- .SUFFIXES: .ml .mli .cmo .cmi .cmx .cmxs .cmxa .c $(XO) .d$(XO) .var .h .opt .def .ml4
-@@ -188,7 +188,7 @@
- .cpp$(XO):
- 	$(CCOMPILER) $<
- .c.d$(XO):
--	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(CFLAGS)' $<
-+	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(OCAMLCFLAGS) $(CFLAGS)' $<
- .ml.cmo:
- 	$(COMPILER) $(PRINCIPAL) $<
- .mli.cmi:
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch
deleted file mode 100644
index f707865ab293..000000000000
--- a/dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/.depend	2023-01-22 20:48:06.026147545 +0100
-+++ b/src/.depend	2023-01-22 20:49:11.170105871 +0100
-@@ -438,6 +438,8 @@
- ogtkBrokenProps.cmx : gtkSignal.cmx gtkBrokenProps.cmx gobject.cmx gData.cmx
- ogtkAssistantProps.cmo : gtkSignal.cmi gtkAssistantProps.cmo gobject.cmi
- ogtkAssistantProps.cmx : gtkSignal.cmx gtkAssistantProps.cmx gobject.cmx
-+gtkThInit.cmo : gtkThread.cmi
-+gtkThInit.cmx : gtkThread.cmx
- gtkThread.cmo : gtkSignal.cmi gtkMain.cmo glib.cmi gtkThread.cmi
- gtkThread.cmx : gtkSignal.cmx gtkMain.cmx glib.cmx gtkThread.cmi
- gtkThTop.cmo : gtkThread.cmi
diff --git a/dev-ml/ocaml-sha/Manifest b/dev-ml/ocaml-sha/Manifest
index e4803cef2421..787eae611518 100644
--- a/dev-ml/ocaml-sha/Manifest
+++ b/dev-ml/ocaml-sha/Manifest
@@ -3,5 +3,5 @@ DIST ocaml-sha-1.15.2.tar.gz 15700 BLAKE2B 7504d4302d54d94f6b8143efce6487dbc95c4
 DIST sha-1.15.4.tbz 17759 BLAKE2B 24ca05f6228aa3fce3bd4d0478115f7664569b6d1a3049298d4c4255b4e9ff0e91ac1d957236331fef275466744d539721251d9bfaf6790f55f438223e761581 SHA512 dbb31b523ba0bace023bc1b0558a8f572a0ec20fb3f19f783935be755cd161e09aba352eda2bcf7c4e5ab838c7f874cfbfaed9debf0813df25d9dbe7b9314fdf
 EBUILD ocaml-sha-1.15.1.ebuild 518 BLAKE2B ae29ba7ce2e8e29bfdc689eb099f2db08c5b52044a319813df1bba676b12fee193b422669eb554c9d5d4a499c6d75fa1934dd0fa63b4568fa22d42a5fecd5fbc SHA512 ec054f2cfa156b9b910bb45eb11d7db42a82ec01d9196c9eb35a39bab495b74cf926f1b184b6d440dcdfa89a4d26ec1a62abcaf27c4d13d889a023aba38ab325
 EBUILD ocaml-sha-1.15.2.ebuild 516 BLAKE2B b6f71cd2089ae943e05b547c270b389b96fb3322331945e7568d504d0fb2093ff7619ae98535849d93919ca81b01fac0102f5465dabe5cd09152015c91db729b SHA512 7c9a58c15620202754bab4659d2b7d10b5426306e5dca3445b5e1c3642908567a3157450c7b0e325803055d190b54c15b5327ffb6e1d16e1ee0b6e688c401086
-EBUILD ocaml-sha-1.15.4.ebuild 572 BLAKE2B 71dd8fe9be29922f942dbaf2180871ce092ea9352dab6e2498545d440831584c774efaf976b32030833a1ed97bdc45d7676ed7fe9bbdf016d5da151b57c9b6bc SHA512 fa2464aaf2422ec3c06ffbc6a57084138621cbb2debeecd901654c95a1968b6edf07526407877c82bda52d9e4b68f1efe7bf0602b07a5660e9767efd44cb3ff6
+EBUILD ocaml-sha-1.15.4.ebuild 584 BLAKE2B 1d4c0a457c62a9275e9b9515dcf9269f274a5d05ed60328cc7d9df1eaee6566ee876c2a178df539673166faae3a9554f105aab3d3fbbbb83d57fbcd8c317564b SHA512 080a38e917d3699d3b0f6773aa52f0d06ebfd43a751fd035eb237276e2bb24bd187a8f0a7fc0b01c46faf29b2bb04d182d2f61ac2352dd06e7ecd232662b61d6
 MISC metadata.xml 649 BLAKE2B 9507a92760a7dda6fbbcfe8f4209f97c20590e73dc6b3d486339fe2650ce24c3f3acdf9aa9f03d551c9df153a35880fa37b5f9db29ae1add4eeadc1559b507e5 SHA512 c6fa82372d98c68a8c710fbcb185aa14ecbdc371d24f03ae370a51a98134b895b15a5119a54e2e01d97286ff021d3a35b0425b2b5a29a3e870432c2739098ed6
diff --git a/dev-ml/ocaml-sha/ocaml-sha-1.15.4.ebuild b/dev-ml/ocaml-sha/ocaml-sha-1.15.4.ebuild
index 4beee3554732..17aade8400a7 100644
--- a/dev-ml/ocaml-sha/ocaml-sha-1.15.4.ebuild
+++ b/dev-ml/ocaml-sha/ocaml-sha-1.15.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/djs55/${PN}/releases/download/v${PV}/${MYP}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-0install-cudf/Manifest b/dev-ml/opam-0install-cudf/Manifest
index 9a590d984307..fb07b16e8ceb 100644
--- a/dev-ml/opam-0install-cudf/Manifest
+++ b/dev-ml/opam-0install-cudf/Manifest
@@ -1,3 +1,3 @@
 DIST opam-0install-cudf-0.5.0.tar.gz 9327 BLAKE2B 705e0bcdd8311e5c330f37e5b05ccb02fa73e42603d0c574480c54101fb746a5d5b61176811dff9eaf09bac370f064dfb8a9ada8f4912586a79e7fccefd122ad SHA512 83c0372168d612ef80548ab7fb021a92cdc39e13a77d87c5af5fd21eb515389b624d09c24d500e9ac33b3fc10d17c9869f160f8771f9c8f545b0453b9a0fd4df
-EBUILD opam-0install-cudf-0.5.0.ebuild 423 BLAKE2B af71c5b62af5a3bd79d4a38c5f818fae730b53d2acb95bed90bfe0e3b6dbed44787f2e3aaa02723aa847d7b2026ba0fb8199c532c6ab1d665ead7c4fdefaee1a SHA512 bd59535f652dd111cf9e382c3542141a9f6f815b8a4b75d21f9e967464d808f15c08683917c6fe136dddffe843ce97384b6f07adb91bbef9a7cd8aea08bc8cb3
+EBUILD opam-0install-cudf-0.5.0-r2.ebuild 588 BLAKE2B 521db737866d74f436455f1ff5ce314d191bed516d267a27d54c319e77654201129548ce195448d61245a3f0fa27a2d6a29924740e07978a9fdcc2093485b16f SHA512 402b6b961113586ad43335582f01a69a3275eb4dea10f7348f27455bf03c73317036d818375e98f10a5be253779345fe39f3c518f9c7533a5bdcc8fe09a0f08d
 MISC metadata.xml 953 BLAKE2B 2ca4d579e427e6e776cc59d700f918731565074bacabc6ab7dd11d81f7b40303b12aa58598f0ee2db84d87c4afeefb9da798d94a900463c1e19e898e441a3246 SHA512 b1d7791c6c88ee0f630bd544060c59fb8f5778b0bd9cd65fe0fe1bc48fc41e4cfa51c7a7cfc728ab6c7abcef274eb83a421214f617bf2f406abe74d20f4c9ba1
diff --git a/dev-ml/opam-0install-cudf/opam-0install-cudf-0.5.0.ebuild b/dev-ml/opam-0install-cudf/opam-0install-cudf-0.5.0-r2.ebuild
index 9db05d077373..6b7398671247 100644
--- a/dev-ml/opam-0install-cudf/opam-0install-cudf-0.5.0.ebuild
+++ b/dev-ml/opam-0install-cudf/opam-0install-cudf-0.5.0-r2.ebuild
@@ -13,7 +13,15 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/0install:=[ocamlopt?]
+	dev-ml/cudf:=[ocamlopt?]
+	dev-ml/extlib:=[ocamlopt?]
+"
+BDEPEND="test? ( dev-ml/alcotest )"
 
 src_configure() {
 	:
diff --git a/dev-ml/opam-common/Manifest b/dev-ml/opam-common/Manifest
index eccca19d5ac1..b01d6bc5dbda 100644
--- a/dev-ml/opam-common/Manifest
+++ b/dev-ml/opam-common/Manifest
@@ -1,3 +1,3 @@
 DIST opam-2.2.1.tar.gz 1089671 BLAKE2B cd6a97c8c19d7866205b49f95bf4215d986b3ad8b5d1fe5c5fd52db9b8b9e0cff8559d478e18d99d89816bbf830910f182e4c1e80719ac29a3cd5c8299450a21 SHA512 17d7d83b9de118332c121b9d3aa2e48f62a6270ea23e730a536b0f4ff060df85238c7c4ab53a89bcc3b3193d52d14358831bd9bed30a4ac699e44e4c3003b8b0
-EBUILD opam-common-2.2.1.ebuild 950 BLAKE2B 583cf850fbf808601f83042ad15d1c280d452c677371d641cea4ae3e5f27d79d0cd20ac92df25c825edaead187bcf661b7df26dbd6a6021edea38fa2a45ec208 SHA512 0a04abd4aac2fcab432c17d3f47118c250b31e21d46505942a5b9e63d4b415ee495cd655e8dfced642b5743931b09019619e70c2ade13eb96ba1e11847671a7e
+EBUILD opam-common-2.2.1.ebuild 962 BLAKE2B b5b9c1aa8b8a110ef71e98be7ea92bd7ae6dbea3fd53190c43c61ce838d7b4758133c7ffcb9329076244962cc0df2875ff1accc98a0e6db9036028c9c8276f01 SHA512 ac442340122a8e0e47b402edc491fa5ea9423678b01f8f6b7d19127a3ec5a18b71fc612fd8a679bd8f3fa10bf14b69293fb4b84b1a6d95d7c2ccb9d004c03342
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-common/opam-common-2.2.1.ebuild b/dev-ml/opam-common/opam-common-2.2.1.ebuild
index 8b8c1ceaac3c..e18aac0b18a9 100644
--- a/dev-ml/opam-common/opam-common-2.2.1.ebuild
+++ b/dev-ml/opam-common/opam-common-2.2.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
 IUSE="+ocamlopt"
 RESTRICT="test" #sandbox not working
 
diff --git a/dev-ml/swhid_core/Manifest b/dev-ml/swhid_core/Manifest
index c9c87c9aa427..46f5abe2f5a0 100644
--- a/dev-ml/swhid_core/Manifest
+++ b/dev-ml/swhid_core/Manifest
@@ -1,3 +1,3 @@
 DIST swhid_core-0.1.tar.gz 46118 BLAKE2B 3594b9cd8c71bf4fa9f05e63a45d17af7c3c0d7e6339c357c0f79a7e2a6b558b068478038de9ef4b370c5935489a1ad9f21824a56f0e971a0a1e0a00412368e1 SHA512 ec72cc946c662dc8230f4ef8c85bb41df56c3f46bc49276feca434199cd482f11901be902fc5c243244866d4a167474f18245f83ad0b0cf46eb35406ad1f1b5c
-EBUILD swhid_core-0.1.ebuild 389 BLAKE2B 1c09a1959bb58ec479da9950a490fee690f73aa7b9409785301a1f4a5ef58936e0ff82036bed03fc4dad79c027516d28775c9fed4772681878b5ea43c99d2c31 SHA512 3e7c927ac6db4668bd6cfade686cf612fc6192755f0ec6dec2667dd18e9cb71938bd88a8f7f1a35848dcf0dfc38ae114419c46408ade9fa1b8964b19c94aca3d
+EBUILD swhid_core-0.1.ebuild 401 BLAKE2B 67d9b41c76faf6de3c7cc662968bd40a8a633d32cc6bf18cfd89eb21cb74a46efd9dcea18521b3418212c9991c781790fe01d2d9d4c36adb3dd21983afda46c4 SHA512 6eb93f0e6790f72412968b42d440cbb597fad0b2b3774737c89a0518270d9b952a172aee1e21e9b68343c602648fe1d5192150789d40bce92ce85483595a33e2
 MISC metadata.xml 465 BLAKE2B 3e06bc4c8b2b8376e3412078cb5bc798b71191246e96aef8bc5e420e38e2adee778df0b8d479795fe6826aa4d97f4cc286a6c7922951103aee9e8e99b3f3e4c5 SHA512 1165b6b9ff50742ec2465747328fdb58f6fd5135bd78153b3bc6af0b129b252460f51bb2b7a7c0c04147f042dff430ae43e734084f726edfc09a2c70e8404c1c
diff --git a/dev-ml/swhid_core/swhid_core-0.1.ebuild b/dev-ml/swhid_core/swhid_core-0.1.ebuild
index b85dcb301ab6..db062308a3a0 100644
--- a/dev-ml/swhid_core/swhid_core-0.1.ebuild
+++ b/dev-ml/swhid_core/swhid_core-0.1.ebuild
@@ -11,6 +11,6 @@ SRC_URI="https://github.com/OCamlPro/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
 
 IUSE="+ocamlopt"