summaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml')
-rw-r--r--dev-ml/Manifest.gzbin39807 -> 39804 bytes
-rw-r--r--dev-ml/camlidl/Manifest3
-rw-r--r--dev-ml/camlidl/files/camlidl-1.09.parallelMake.patch12
-rw-r--r--dev-ml/camlidl/files/includes.patch10
-rw-r--r--dev-ml/camlidl/files/tests.patch34
-rw-r--r--dev-ml/cmdliner/Manifest2
-rw-r--r--dev-ml/cmdliner/cmdliner-1.3.0.ebuild42
-rw-r--r--dev-ml/labltk/Manifest8
-rw-r--r--dev-ml/labltk/files/labltk-8.06.14-findlib.patch13
-rw-r--r--dev-ml/labltk/files/labltk-8.06.14-shuffle.patch31
-rw-r--r--dev-ml/labltk/labltk-8.06.12-r2.ebuild3
-rw-r--r--dev-ml/labltk/labltk-8.06.14.ebuild (renamed from dev-ml/labltk/labltk-8.06.9-r1.ebuild)16
-rw-r--r--dev-ml/ocamlbuild/Manifest1
-rw-r--r--dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch39
14 files changed, 103 insertions, 111 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index b5037bb1ff59..7845ac6a4ce3 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
Binary files differ
diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest
index e1d09e4e338e..14d09301fadd 100644
--- a/dev-ml/camlidl/Manifest
+++ b/dev-ml/camlidl/Manifest
@@ -1,9 +1,6 @@
AUX META.camlidl 123 BLAKE2B ac345245b30f6df1f4ada64526e0f27b68c02311d8b426bee6eb62f91de34df868dacce3a7ba755c1924d5846790c9f90f6a46500b71fb347eea7828749f9476 SHA512 196727adb64e11b4f486419147c2d711a0d278f4f340dcec61318cd76fb816deea78e85c814f6fd4f14dae168a843fe41b0ecca3086d42387475f196519cb850
-AUX camlidl-1.09.parallelMake.patch 445 BLAKE2B c0460aba8293311fe80f77bb1838cc7134e92d5de4046c798aabbeeedcd0f6560d4c1fb00b1722c09fe4dc187abf72b3c26ce54611a1f1893a0f93872c1e2c05 SHA512 7674d4b7bbe517e212ed2d3b7e881bbfb1b6308945caf6c9e7443e1f831da3310e4f4d5c7e5e1dd9f58eb5017e55c6a3c355f561647ce2c8ac3f51ea90f3236a
AUX camlidl-1.12-destdir.patch 1135 BLAKE2B 6636f3b94b2cf104fa4c8507ea210999aa0ae04a9cbecb3c0ac5dc833b8ad4004c35b5554ea07fce253a735a12f3dcce009401cba7c8cddb302f71bbe78ceb49 SHA512 1334c948f401ad55d9e3c750580936932b75b995871b6931a24225ef1f909149e71471edc3015b2054127f112154c4cc7ed1f9e17575e1594fe97d249598aed9
-AUX includes.patch 227 BLAKE2B 2ed714238126990a834808d8d7565e244bf942402188cc6ab93e05e1ba6e0c4de30304c7f2fb18ab52ac81aa00cd854938ebb8ca434af72c8ecdadf18b09248f SHA512 b8d27e7845706c16bcf07654b36ed17e452f4a9be0119741565977077085cf0fd43f5a69de84866b6b889dbd16432d46a34867f9b102e999d39ef438727f0cc1
AUX nowarn.patch 214 BLAKE2B 00b4b63daefaea0d8ceb9ef919037567c2ac8a0b0aac8c6634d9656c8b4d93ae4a22edeff45dd3bbc857168119301d0ff8d04901d44c42ddd130b31f8a840340 SHA512 94f4b57f485239715b9f0478025dc0af192e815e6a03d696b47f910e786cfdb583e6205da9bead57a2a7e33e2e6f5d433095774e0e31c10949664693370ee761
-AUX tests.patch 931 BLAKE2B 0f18d35a22067f0189c413c1d52e8b8823b38bdc0024e35105b3074ace352bf47c50fa0ed3834447f7de90c7049d0bf6692c643e113d4e00cca2b1fa95103448 SHA512 436b047d232e0a8f65f87dc3a3da4ddcc4b629dab3475d8097ee29f7bf5219d5bb964407cc11ac7a9df6c31efea9e94d22dc66c4a2ad45dc1cb26938c3fb7400
DIST camlidl111.tar.gz 182421 BLAKE2B 5bd4bf2e2eb73f632c5e99a271e13d6a1b4b815476f2a17aaa6a05a4ccf048f4c58b099219e46d36659711f0473dbf91d484d5dcb12ee2e08327afec92a66b66 SHA512 dfd99cb10ee96de4e8a9a2ee86834a33ce10ba362aea93a061c373336db872ddf4017f2601bc47d1662de2f5699e885166dc984a213ff1c4142d41d7c99d7a21
DIST camlidl112.tar.gz 182507 BLAKE2B 3a1e4f3f7341bb3e34397af995c660178850c9a774a44866f458cb7731e143e5e2252355c200c7d82f7d55d765749aa26105642027867623f0f6e3125f98c892 SHA512 b60b666c865bf923b1f2499238fd81232454a5d358960dd2038707bf71916d5dd7432044a01fa272e61cd2af6867aa23330f6f06398f213fd3e92072e1d784a1
EBUILD camlidl-1.11-r1.ebuild 1530 BLAKE2B ab9cd9cb3a9684b736106e5445557894b38b5d29f6600ad1e2367aea0a03a34641087b250115a79e9d1fdce77a5bac2a96955f16bf37d6074cd2f62286644202 SHA512 e1dfbbed6a47783015008f3d1e38f1c1d6991f044f49c7227f0b97864e0f7af96a20abcaffff9ac60d69f2ace3328580748a4025c38aae6c3134f99312f02767
diff --git a/dev-ml/camlidl/files/camlidl-1.09.parallelMake.patch b/dev-ml/camlidl/files/camlidl-1.09.parallelMake.patch
deleted file mode 100644
index 1a6df0f21f5e..000000000000
--- a/dev-ml/camlidl/files/camlidl-1.09.parallelMake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/tests/Makefile 2023-01-19 21:02:36.678227862 +0100
-+++ b/tests/Makefile 2023-01-19 21:03:01.140832955 +0100
-@@ -11,7 +11,8 @@
- COMLIBS=$(COMLIBS_$(OSTYPE))
- COMLIBS_win32=advapi32.lib ole32.lib oleaut32.lib
-
--all: ../caml/camlidlruntime.h $(TESTS:.idl=.$(OBJEXT)) testcomp
-+all: ../caml/camlidlruntime.h
-+ $(MAKE) $(TESTS:.idl=.$(OBJEXT)) testcomp
-
- $(TESTS:.idl=.$(OBJEXT)) component.$(OBJEXT): $(CAMLIDL) ../runtime/camlidlruntime.h
-
diff --git a/dev-ml/camlidl/files/includes.patch b/dev-ml/camlidl/files/includes.patch
deleted file mode 100644
index 077ba21d93da..000000000000
--- a/dev-ml/camlidl/files/includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/runtime/comerror.c
-+++ b/runtime/comerror.c
-@@ -22,6 +22,7 @@
- #include <caml/callback.h>
- #include <caml/fail.h>
- #include <caml/alloc.h>
-+#include <caml/printexc.h>
- #include "camlidlruntime.h"
- #include "comstuff.h"
-
diff --git a/dev-ml/camlidl/files/tests.patch b/dev-ml/camlidl/files/tests.patch
deleted file mode 100644
index f8c4595f9fbd..000000000000
--- a/dev-ml/camlidl/files/tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/tests/unix.idl
-+++ b/tests/unix.idl
-@@ -15,16 +15,16 @@ quote (C, "
-
- union process_status { int code; };
-
-- enum { WEXITED, WSIGNALED, WSTOPPED };
-+ enum { WEXITED2, WSIGNALED, WSTOPPED2 };
-
- static void decode_status(int status, int * kind, union process_status * p)
- {
- if (WIFEXITED(status)) {
-- *kind = WEXITED; p->code = WEXITSTATUS(status);
-+ *kind = WEXITED2; p->code = WEXITSTATUS(status);
- } else if (WIFSIGNALED(status)) {
- *kind = WSIGNALED; p->code = WTERMSIG(status);
- } else {
-- *kind = WSTOPPED; p->code = WSTOPSIG(status);
-+ *kind = WSTOPPED2; p->code = WSTOPSIG(status);
- }
- }
-
-@@ -59,9 +59,9 @@ int execve([in,string] char * path,
- int fork(void);
-
- union process_status {
-- case WEXITED: int code;
-+ case WEXITED2: int code;
- case WSIGNALED: int code;
-- case WSTOPPED: int code;
-+ case WSTOPPED2: int code;
- };
-
- int wait([out] int * kind,
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index d94a7a8eb4b1..39b24fcf84df 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -1,7 +1,9 @@
DIST cmdliner-1.0.4.tbz 49558 BLAKE2B 8ea922a22d08fc4cce6c0aff1adff9a2fcdaee8e13b7bdfad4a08b459e8a6557761fa70c9e34100bc8baaa4113e5729f2daf297fc1f618bd8c30b9323bb87ba2 SHA512 4cd1cc0932b8bbd607160cc9816b35c12a68a358a35ffcb6827f547052dc517e871a91ddbaed0447cb1fa5fdf510cdf5d760e8e5c1e4548f82e1d523e2b3ecb3
DIST cmdliner-1.1.1.tbz 58054 BLAKE2B 1c3d3c836d390490d0470cae1545a8ea6bd3ee2b10d33e02fbbad5c47cf5c1fb9104f05a32119580af57358e0cdd9b17fa319a7fe62a9de9f6b504d9f0300513 SHA512 5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e
DIST cmdliner-1.2.0.tbz 58504 BLAKE2B bc5be67fff2d83408b8537fbb7472c3811452df5cf89dd3d175fa052629339ac960d12e751cca3d8f750c6bd8bb43df645f976477597b9a5609577a73bbb00e0 SHA512 6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b
+DIST cmdliner-1.3.0.tbz 58515 BLAKE2B 297b8903e1446a94be5580557b2d94a686833997d9b5f688564f31f6c13bf1e6d1f589143b223a78b7dc6f259c5ca664529b3273e5bf29d5a503d9612ba65ef6 SHA512 4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283
EBUILD cmdliner-1.0.4.ebuild 1066 BLAKE2B 39c29fe18bdeb8851cce528f0cfb81dc29e9e02b6ac6b344617273659bab2d683195f48e70b29b1500c61c558c137a167afce8af2638014584a8758cba3b2dcb SHA512 f49b74f362cb8da22cbc7f869a4118458bc4cd4456c70c8496411bf047b76b5366bdeb4651cce1e1d5d1e6abc26900ca9548103efbec30595222a0367efb4026
EBUILD cmdliner-1.1.1.ebuild 1003 BLAKE2B 8984058ede56dab67f18322cf7a2de1afad381b1eefcefb13672204beaa623b6c02799f44819d9677354e8342a70b6a59396540d7a4e3989fcd3b5470aff9be3 SHA512 8fce94a0c82ec8ab75318df738bdb7ed8cacc3b1d64864d28a53c87492b3324ab3c6dc9b9afd48beec7ae586a2eb8196317c0dc59a4df764f75b56fcb918c990
EBUILD cmdliner-1.2.0.ebuild 1004 BLAKE2B d9fc98e01eecbd6638deaf5034358c892e28e7e2c27f5c09960ea23347dfdb996b7ac10c3636b2658a5f05083ec725cab5b204df492e124e101322c594076b17 SHA512 44a6c3351bc63f44592a0880ada314b1c222f33969b03ad332c6e239f03c2ce6c1aaed70a8598f20d3848d90d029ccf8a39efe504e88b7986ab4a06150ac5e29
+EBUILD cmdliner-1.3.0.ebuild 1008 BLAKE2B 0e2d0506d88fd07669344415d7eb43246032e9c29ba22c388cc5d017a4838e64b306122841b7d27a0c8705c01bd01b929b33af61b4d3e5e33f540dca64872631 SHA512 a7a21a6b3fe0129e262717f3ad4c7c87ade70a520523a32852984675ae2c17c66f82e257491cee1b933ce8be1a44b55c95eb3e66afaf3cc18ae35761d3fccf0b
MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/cmdliner/cmdliner-1.3.0.ebuild b/dev-ml/cmdliner/cmdliner-1.3.0.ebuild
new file mode 100644
index 000000000000..00a0f217c30a
--- /dev/null
+++ b/dev-ml/cmdliner/cmdliner-1.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib
+
+DESCRIPTION="Declarative definition of command line interfaces for OCaml"
+HOMEPAGE="http://erratique.ch/software/cmdliner"
+SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.08.00:=[ocamlopt?]
+ dev-ml/result:=
+ dev-ml/findlib:=
+"
+DEPEND="${RDEPEND}
+ dev-ml/topkg
+ dev-ml/ocamlbuild"
+
+src_compile() {
+ emake build-byte
+ if use ocamlopt ; then
+ emake build-native-dynlink
+ emake build-native
+ fi
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs=""
+ use ocamlopt && nativelibs="$(echo _build/cmdliner.cm{x,xa,xs} _build/cmdliner.a)"
+ ocamlfind install cmdliner pkg/META \
+ _build/cmdliner.mli _build/cmdliner.cm{a,i} ${nativelibs} || die
+ dodoc README.md CHANGES.md
+}
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 68231a838b43..0eb17be8ef90 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -3,17 +3,19 @@ AUX labltk-8.06.10-this-expression-has-type.patch 644 BLAKE2B 951ccdfa410298bb16
AUX labltk-8.06.12-c2x.patch 2004 BLAKE2B de15e8845f52c5afbe55a3073ff9de48eccc195b807bc5b3be3926be5be39d1e82d8104b3e20bb135b66b29d17255cef6da83fa87478cde855a5f6f9454f20ba SHA512 1244edf70dc5e42cc11bc7b92dbece31cbbe6bf2b86e9ed3f78543ddd7f3b8866abc8e0fe5929123635d6870d1b2e3bd79dc0d6a430a08614541fee69fe0723e
AUX labltk-8.06.12-c99.patch 545 BLAKE2B a54e5bdabfa14ee0f28d5ec2a4c3117d604a1933e5c0ccf6021158445154e9204670018696067b5f126d9cdcce91515565c4697ea5e7e4045c6d259c456502b9 SHA512 118ba1606dd510d34766fcb1d82011025f6b2fe78503ea34fa4d913e13c2402bab19f9c63f09bbe87c53845becaf8a59102492dc499e803598bd4f1c063b812e
AUX labltk-8.06.12-shuffle.patch 1731 BLAKE2B 22a6cb1c5dc372a4eda36fa25a2f658abcea2b0be82cea426c7fb5da54850b0c9c80cb892020e6387823692a7cd952347fe694191c9f738f4475e77cd18a3a5f SHA512 9c54b3d06b674955c16bbdd1de3e195bc5504a11c0771d29e53cd0190c397f623b3d58291e4c9435d120aba43d0273352b675822cf1b512e54fcd6f04db9f316
+AUX labltk-8.06.14-findlib.patch 441 BLAKE2B 21cdb08e0b976af8df03c7392f5201b8915a0ed7a95b05a9a843f1372c9f46d40c0143899425804215eaa19555e574d9dd6296dc62fb86e78342d596ebae343a SHA512 b3153cd49604cf98296c2b68b1ada5153c5b66a410b0a81f5dd88d4c560086e721e5b0c6a98a424f9cdcd9c61b7865d2b24618c5f7bbb96a6bb7b39cf8199f78
+AUX labltk-8.06.14-shuffle.patch 832 BLAKE2B fe966689c06695716ea3337de55c853a3b2e3302b3ac3f669170a27c3877c09934f279fe13ce46c76b06b9b4a671946611ab6a89060d38cba7bd5da3c2bdfc46 SHA512 e355150f712ea095b474ea8966baff66de662ad131493e8f91d68242fed55716b56ba53675537498683204a17b1ce8957924cdd2ce9d8567b0faa14f3ecd28d9
AUX labltk-8.06.7-configure.patch 680 BLAKE2B 4442a053aa034f92c923cc7672bb953cf61b3d9b8f402183dc9dd2fcf13d85988f659280d9509ea1a1e05eb0df2c0ec8aa32632ea7dd4974f95353e74378d572 SHA512 d5c28d21f365ea942b631643ea3d2328a63c96ff81b99586ea8a58e4d0e5a5f22da0cf7232c616e61d40da1a1773fb19dc1bc9ce4cfa5d8017673ffb4ad61547
AUX labltk-8.06.9-configure-clang16.patch 1461 BLAKE2B 0815daa22884930b9fe83e4b0cafabd86831e4f0a5a5f5355f658d8ac1bcc04ad68eaa5f6e85014613c01eebcdd323e73c3d8512cc2a6fefc35d3811b228a26e SHA512 3738dd7391ef557aa261887b9b3c8602ff5566125a386212405549560f319e33657ef4f23bea2784f5bdade7ad01536e3f1137ef60bae585a01bfcbdee2524e8
DIST labltk-8.06.10-warnings.patch.bz2 4194 BLAKE2B 106e70dac1601a831a46a21a4013f70d2b9e17f910b8c09fc2c976840cd2e4d29dbc9be50cd7efa469d50be984cae82b56783a4e8d9a0bfa308d1d4466e44039 SHA512 eeea791a4e901335f6e010983da85d72e0a6f9fe24ab84bff5c0e46af941a5bb39995ad4d475894855ecb75d5ce26c1280a74d059e845301b30f6a386b2338f8
DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e886a1233de77b9749be32b8efc845cac60244f9a8494241c8c77c7d6991786280c274becb70f5527ad891c3aac69 SHA512 ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8
DIST labltk-8.06.11.tar.gz 372194 BLAKE2B ea81662201f6166cd6fb46fe1681ffdab94703dd3e338244079ad2c67df421969618d7fb2ba2b9b5eadb732eeb927c3de03f19fb5b3621c1461924aeb2f347d5 SHA512 a4ad5fa31cbc89066445bc71a0c1c016f7e299b6bf88a5f77d559c805bc78d90651988658c8a300770ca41514ad73272691feaa84179637fcc695c96bbf25dd6
DIST labltk-8.06.12.tar.gz 372215 BLAKE2B 27718ad287954c11c0e77579239ad9ad53f4df308f3af3c482c40504e6426b4366d2c3de3acb36ca39e7fd404964fe5caa53a0b47702a0bc45ae1266765e90a0 SHA512 e1564ab2d8922276bd8ad586b37308d60ca2dd563bac3cdd992d8a6ba4de26e5499350a62a1d4cb2bbb9a5b7aff609b5187aad5fba118eb55d1b4c8355d2979a
+DIST labltk-8.06.14.tar.gz 384755 BLAKE2B f629a887353f78b388400e1e6e8c242f9d3d2f94ffc0bb2d4d0578bf79efee86426c6c3ee409aabded221d8ead0b7c52e4fcbc777381b3da8bdfd6174d42ffbc SHA512 7e2cfbdb44851e48e1cbde62dd185d6f6f6b7b83d9b835e77ca964b97d05daf07b1c4d2224b5e41deba21c4b4ae64f6de9b47694022c5ffe6a67eee51d943fc9
DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
-DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
EBUILD labltk-8.06.10-r1.ebuild 1384 BLAKE2B 2268c70f73d91e5c5ee8bccf1ac36693b60ea2bfb683ebf7c5547b6076a1b5b72e58a114ee735b93ef1387a4a0f934f580896fb7d3e3ba01f6e04878cb627435 SHA512 14ad6218a654ac2f617b73829213ec31f0630a8bfc485e1c872ed4ac569613e0e6754888945fd0518804b401183b30d851cbcb57ae07de136b0bcd619eaa6361
EBUILD labltk-8.06.11-r1.ebuild 1140 BLAKE2B de82a222c7bd37eca0bdfaff76ab13f13460fb229c54d713d84a1897e46fe4c92601c13f0f1c24a4e688f36eb5db3d9f407d78cd5dca7689cd9aebaaa65720dd SHA512 881a1a1a53dce9786fcd7742d66bc273d56b98b6b39409c968723af2772d866d720638fbc4cebc72784af52545173fca34190985ce5c34f5cc62cdf5c9724896
-EBUILD labltk-8.06.12-r2.ebuild 1274 BLAKE2B 33d269fbdabcc3519efa2eb614aa82cca2c74b79d2ad44e12d8302a9f6f26b7ffa6e6e8d39302a053c73e4f882e7323eeda243f9ddf4edba2aaf90d86bd6e86f SHA512 de81113d34ff38c347699257948584e19e921a423992ac1742cf2212ed6a875265265bf9885e555313b7a03a5bcf325f9b1fb9402d36efe8ebd7c945a814d31b
+EBUILD labltk-8.06.12-r2.ebuild 1293 BLAKE2B fe34d864a4232599c78b929794db5ce9ddfe0444fa2a2d1c7eb1d999517db747a2715467d18d06781855df0a1424d1518f29d7303fe17e182490da16ded17504 SHA512 b0786f51e8606f9f07dab7ef985350b8c07075027c80d83ce249a1a1dc64efab2eaa81bde142e467be17cbfbc2d89059625dfab818f2b4bb956d0d20e69ba36f
+EBUILD labltk-8.06.14.ebuild 1172 BLAKE2B 8dd5aa95ea11876f4c68b515444361e183a44feb11179bedad0365dcc897c4d4490f7eb0405e610462d64351938ccfded5cd3d8673d2fba44bf1b6ac6c7ff3b0 SHA512 eb49c1bd748fdb1f3d4c7a0075c1a2fb593718dc4602dbfc12c7e7abe32424dfecf854946442872784bba0d5b75bae09a2a2e9613857a9969a12b4d31d56fd52
EBUILD labltk-8.06.7-r1.ebuild 1211 BLAKE2B 370fc276c5df5f5a2ca902ee8c5d950b847cca5bde8e405c2cb8fd607784244cb9be4cc7bb779cb5b38cb2dd0c3425096c966a2aa4d1f2c7aa0c68a3cfa784cf SHA512 a5458fd08adee2cb8cf124a737b1092666a1ae600c440dcde5b21eff4209c00bc1ebe5f0f6355f20efb46d926e32a2aefdcbdaf36520ce5e47a5c44a8445d5b8
-EBUILD labltk-8.06.9-r1.ebuild 1162 BLAKE2B ed062706236f9c2c94ed039797cb38ea8faad702bb97b96b858c7e38c5c58f14557e32990086c797aa8d3ceff4ef674a79b0c704f8bf964a50db662392e69245 SHA512 c9920835e614cd2b30c4399591f5ec7c831a73698e0ebfd440baa2d99a8acb074a36b03f11e2cc34b627f4239a0e423fbc4c175b84c1745f7e9c9d8d1cfe6ddc
MISC metadata.xml 313 BLAKE2B aae3866559a63cabfc03f6e436564e5592f62c910cce24c44f5b217ef51f6f391ae9499167df4399491d5c89132ce857edcd50354bc6ac1a2bc6db9c829c639c SHA512 07873e6c2cadaa8ae45983cba98116688a436cf5071b0ce39c3b3472783ab5b3ab32052a58df81a9e2e26b155bff0c5907f82c7408962380b4d31d2d8dd04d09
diff --git a/dev-ml/labltk/files/labltk-8.06.14-findlib.patch b/dev-ml/labltk/files/labltk-8.06.14-findlib.patch
new file mode 100644
index 000000000000..2cc2b945a226
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.14-findlib.patch
@@ -0,0 +1,13 @@
+Index: labltk-8.06.0/lib/Makefile
+===================================================================
+--- labltk-8.06.0.orig/lib/Makefile
++++ labltk-8.06.0/lib/Makefile
+@@ -84,7 +84,7 @@ install-script: $(LIBNAME)
+ install-batch:
+ cp labltk.bat $(INSTALLBINDIR)
+
+-ifeq ($USE_FINDLIB,yes)
++ifeq ($(USE_FINDLIB),yes)
+ install:
+ ocamlfind install labltk -add $(LIBNAME).cma $(LIBNAME)top$(EXE)
+ chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE)
diff --git a/dev-ml/labltk/files/labltk-8.06.14-shuffle.patch b/dev-ml/labltk/files/labltk-8.06.14-shuffle.patch
new file mode 100644
index 000000000000..5cf4bc839d02
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.14-shuffle.patch
@@ -0,0 +1,31 @@
+--- a/compiler/Makefile 2023-01-21 22:23:29.676828969 +0100
++++ b/compiler/Makefile 2023-01-21 22:24:16.204141261 +0100
+@@ -73,6 +73,9 @@
+ .ml.cmo:
+ $(CAMLCOMP) $(COMPFLAGS) -I ../support $<
+
++maincompile.cmo: copyright.cmo
++maincompile.cmx: copyright.cmx
++
+ depend: parser.ml parser.mli lexer.ml pplex.ml ppyac.ml ppyac.mli
+ $(CAMLDEP) *.mli *.ml > .depend
+
+--- a/browser/Makefile 2023-01-25 22:29:40.784044151 +0100
++++ b/browser/Makefile 2023-01-25 22:29:56.579838693 +0100
+@@ -18,3 +18,6 @@
+
+ dummy.ml:
+ cp dummyUnix.ml dummy.ml
++
++shell.cmo : dummy.cmo
++shell.cmx : dummy.cmx
+--- a/browser/Makefile.shared 2024-06-05 10:08:38.886219581 +0200
++++ b/browser/Makefile.shared 2024-06-05 10:06:05.142920155 +0200
+@@ -71,4 +71,7 @@
+
+ shell.cmo: dummy.cmi
+
++dummy.cmi: dummy.ml
++ $(CAMLCOMP) $(INCLUDES) $<
++
+ include .depend
diff --git a/dev-ml/labltk/labltk-8.06.12-r2.ebuild b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
index 974b1280538d..4086f1f797c1 100644
--- a/dev-ml/labltk/labltk-8.06.12-r2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-
IUSE="+ocamlopt X"
RDEPEND="dev-lang/tk:=
- >=dev-lang/ocaml-4.14:=[ocamlopt?,X(+)?]"
+ >=dev-lang/ocaml-4.14:=[ocamlopt?,X(+)?]
+ <dev-lang/ocaml-5"
DEPEND="${RDEPEND}
dev-ml/findlib
"
diff --git a/dev-ml/labltk/labltk-8.06.9-r1.ebuild b/dev-ml/labltk/labltk-8.06.14.ebuild
index a0a9443fbf18..20f88b5c971b 100644
--- a/dev-ml/labltk/labltk-8.06.9-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit findlib toolchain-funcs
@@ -11,19 +11,18 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt X"
RDEPEND="dev-lang/tk:=
- <dev-lang/ocaml-4.12
- >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]"
+ >=dev-lang/ocaml-4.14:=[ocamlopt?,X(+)?]"
DEPEND="${RDEPEND}
dev-ml/findlib
"
PATCHES=(
- "${FILESDIR}/findlib.patch"
- "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
+ "${FILESDIR}"/${P}-findlib.patch
+ "${FILESDIR}"/${P}-shuffle.patch
)
src_prepare() {
@@ -39,7 +38,7 @@ src_configure() {
}
src_compile() {
- emake -j1
+ emake -j1 all
use ocamlopt && emake -j1 opt
}
@@ -49,6 +48,7 @@ src_install() {
emake \
INSTALLDIR="${D}/$(ocamlc -where)/labltk" \
INSTALLBINDIR="${ED}/usr/bin/" \
+ RANLIB=$(tc-getRANLIB) \
install
dodoc Changes README.mlTk
}
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index 88ed630bc346..5752409d7d52 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -1,4 +1,3 @@
-AUX ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch 1259 BLAKE2B d5ef0954e0a998b1ede15404fa2ed2e4aa8cbdb556aa22665e3193e179348274963303f384e984f73c808f5745ef347b5764f4408ca20110fe03383f0d92ffc7 SHA512 84671a1db5e4df6b4c21e313bb7b620e83016015ee32f508bbb14f791d7e09f138e83891b5c18a7a8ea2f9dd0d056bc9757152211e818275182df02c9701570e
DIST ocamlbuild-0.14.2.tar.gz 199293 BLAKE2B d81613878f93f27c6de41461e6b3cebe0744a5204297725263a608cb129a708aaf6f27b444b97d68f2bde844a760f8e78647641f10eed61e727ef3936562cdea SHA512 f568bf10431a1f701e8bd7554dc662400a0d978411038bbad93d44dceab02874490a8a5886a9b44e017347e7949997f13f5c3752f74e1eb5e273d2beb19a75fd
DIST ocamlbuild-0.14.3.tar.gz 199357 BLAKE2B b839d3757f4c2ce466291e00d2e5a87c51f81cc9e21f252ca7381fed9a4e8468e920d34946cb58c9297a1b98afe231b7eabc3960d68ba99f051891880742d7a6 SHA512 def8fa1d5488905fda31f72b7f6f0ebdccefa55a8e984a6ea4a7c1e0856e8ea1f7814410202e0f7f7d5e72aca7e8ae0d6623f7f2bade78b0dd82155de76ec4e5
EBUILD ocamlbuild-0.14.2-r1.ebuild 1381 BLAKE2B a295b397c90f84b55e3914a2bd7a85768cc00f19be3826070b09b746fca4240499a7e4d90fae93e44a8e7d8e6a43e219ff1c2f417c353583115ebe8b8043d629 SHA512 6dd8a6fa3672761c3d4b9d5fc5278d82e21b1824df1e2c3ddd7f2d8db933dedb549de105d0cdee00a6181eed82a8f94cb05f97fcbeb38697427951a2748fd658
diff --git a/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch b/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
deleted file mode 100644
index 991f13238c05..000000000000
--- a/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Fri, 2 Aug 2019 13:08:55 +0200
-Subject: Disable tests failing with OCaml 4.08.0
-
----
- testsuite/internal.ml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/testsuite/internal.ml b/testsuite/internal.ml
-index d3c2004..a87f5e2 100644
---- a/testsuite/internal.ml
-+++ b/testsuite/internal.ml
-@@ -200,7 +200,7 @@ let () =
- "]
- ~targets:("src/foo.cmxs",[]) ();;
-
--let () = test "StrictSequenceFlag"
-+let _ignored () = test "StrictSequenceFlag"
- ~options:[`no_ocamlfind; `quiet]
- ~description:"strict_sequence tag"
- ~tree:[T.f "hello.ml" ~content:"let () = 1; ()";
-@@ -219,7 +219,7 @@ Command exited with code 2."
- )
- ~targets:("hello.byte",[]) ();;
-
--let () = test "StrictFormatsFlag"
-+let _ignored () = test "StrictFormatsFlag"
- ~options:[`no_ocamlfind; `quiet]
- ~description:"strict_format tag"
- ~tree:[T.f "hello.ml" ~content:"let _ = Printf.printf \"%.10s\"";
-@@ -230,7 +230,7 @@ Error: invalid format \"%.10s\": at character number 0, \
- Command exited with code 2."
- ~targets:("hello.byte",[]) ();;
-
--let () = test "PrincipalFlag"
-+let _ignored () = test "PrincipalFlag"
- ~options:[`no_ocamlfind; `quiet]
- ~description:"-principal tag"
- ~tree:[T.f "hello.ml"