gentoo auto-resync : 26:01:2023 - 01:54:54

8 files changed, 76 insertions, 4 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d16d282d150d..086e12eedb73 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index a33b32cfb31d..64283b5080bf 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -1,6 +1,7 @@
 AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591973b6a2c3843fe254fb0001ce627ec831df5d4c6885d01de679f3d7b74e6538692de08a1fcf608 SHA512 4f5172bc7d603375bda331d40708ad14e7e9e7374f97cbd11da56473ca704421f7c801559dbcc753fe8004a809b80142158974a1c5c469eb2894580121cc9442
 AUX labltk-8.06.10-this-expression-has-type.patch 644 BLAKE2B 951ccdfa410298bb166f784e43ec85f5d9c60baba4d1c7b3bf9b745c57c57887ebe3b3864e18c9daa32351d37c98de50a0cbfe138e9c8c6391c3096ca91916e2 SHA512 6776041f27b7cacf4a62b6f0fa5929672efdd4147401d7a8b7536b33ddef9db8ec923c999e5ae8c39ef634526f4316517606c546f5c3b588d2f0c9c4415f96c2
-AUX labltk-8.06.12-shuffle.patch 363 BLAKE2B 3396b7b1b9d447526430c73c8cc254e126084addb69572627943f687760c46658a2cd6e368c506d6c760f990949e81c570c5e71d36c5b964d721fd65039cc8e9 SHA512 af022e5bb9416a19e418de23ded134f332aaab222acde7a6fd60eb3be01b3f2281646fe1a8e766cf52f29c38a3acd4eb8db01793fcbfb3f074018bc606b53ec7
+AUX labltk-8.06.12-c2x.patch 2004 BLAKE2B de15e8845f52c5afbe55a3073ff9de48eccc195b807bc5b3be3926be5be39d1e82d8104b3e20bb135b66b29d17255cef6da83fa87478cde855a5f6f9454f20ba SHA512 1244edf70dc5e42cc11bc7b92dbece31cbbe6bf2b86e9ed3f78543ddd7f3b8866abc8e0fe5929123635d6870d1b2e3bd79dc0d6a430a08614541fee69fe0723e
+AUX labltk-8.06.12-shuffle.patch 587 BLAKE2B b9b551b7f1a70f6c0fb60445d81ebaf6b8721d2f7e04954cd926c255e2b7c769c8b5b1567af217acab266b06fb445e5ea40d02cebd89b6121f6d367f18c484b2 SHA512 b340d530142a97ed22a0fd5d89a25741d989fb8de495dab33104758f47060b5f4c9aa5a250d0aef449c1a1c246067a2298dd6249488537f18531da6ee932c05d
 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
@@ -11,7 +12,7 @@ DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837ee
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
 EBUILD labltk-8.06.10-r1.ebuild 1391 BLAKE2B f1a12da78acc418b122343caa6dce3e21da6e067fd0502a93c6c56374c78e57b155f90320faba217b196e57ae36e1ad2fb5f2eb7b1f491e1dd9e0bbbe3fb2ad8 SHA512 266af5da88e77df05c961d409090e85862faa4477cfffd8e7f424772c59957234e8c2e677bbdcca85011ab5085ddae7efb75da9e0cc8b2d0eb0818c39e8911b9
 EBUILD labltk-8.06.11-r1.ebuild 1147 BLAKE2B f4886127a95f6a3ba84412f749f34305915d584cf249411d3a3c099eb1654f0cfa10b34c49c4527ba024074dfee23c989d5f92a7f80d7e7889dcf54fad7f2198 SHA512 fbd4817c378d47278752587562eb2dc72bb007637249c413105aa2abd13bf3f5365a4bd8536597c5cdc2b88781f388e16bfedcfe568824ae0f2c0530e51fcbfc
-EBUILD labltk-8.06.12-r1.ebuild 1199 BLAKE2B 34321ab6fb194201f7e90f307016f7560df076cf8f8cc591589e48b48d66f013403f17e207bfc281c47381f0fb6b1fcfa9a3f3067bd0b561a19bf8a93bb8aa5c SHA512 9d549b078cb90e193a540c4903a0bde113dd845ace9fe045244787b454864d69ed9caabb9561eda75da25fa378a03f7898e308d028539b7ba3847b6b1172801b
+EBUILD labltk-8.06.12-r1.ebuild 1229 BLAKE2B 76819e8894f09c891dbfac8e21c4e0879b5506634c656f33d463a28449e0268ec54f5e3920da32afba913ef1c48eab01381832b5b5a79b9a07851b198fed61f7 SHA512 1e89844e904f7eee8ecdf30c3f4dfbf339b09507de9e9a31911512e5b9a5fa578057435e7b9dc39fb79e7754ed897b6122e62e5791be2517d1677989c238540b
 EBUILD labltk-8.06.7-r1.ebuild 1218 BLAKE2B f8c4d3d118ee1ea8b44608ae200498cb14aafe33daad2100b6a96335b0a73066a84fb9f898d044631d92b4d9883a00133feea0d2cc625c140ef99ed4db03dd16 SHA512 07df495e60bd777e21773b02dddc4ea5c8ca35c34e44f9f5cc6670c4bcd1228a0535392aad896616e028733d78c6a093c1f856f7c67d172961f8122f3d717f53
 EBUILD labltk-8.06.9-r1.ebuild 1169 BLAKE2B 769d73c2e228940bd78984b2f851c40c772d83786944f03420d1e05903027a799fd0012f2b1fc3ac0e6b2e022fc3d43e26a61fdcc3ac1262c52e8fd81ffd531b SHA512 d463783f67c4b8601dbc93cc44fa38f7707d03b0f9dc0709879b501631d20a6bd8a526baaefcc512609d30bcbf80f5017ca9e64ca6c244a3c050b4cdaeb35530
 MISC metadata.xml 313 BLAKE2B aae3866559a63cabfc03f6e436564e5592f62c910cce24c44f5b217ef51f6f391ae9499167df4399491d5c89132ce857edcd50354bc6ac1a2bc6db9c829c639c SHA512 07873e6c2cadaa8ae45983cba98116688a436cf5071b0ce39c3b3472783ab5b3ab32052a58df81a9e2e26b155bff0c5907f82c7408962380b4d31d2d8dd04d09
diff --git a/dev-ml/labltk/files/labltk-8.06.12-c2x.patch b/dev-ml/labltk/files/labltk-8.06.12-c2x.patch
new file mode 100644
index 000000000000..f495e532d590
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.12-c2x.patch
@@ -0,0 +1,47 @@
+--- a/support/cltkWait.c	2023-01-25 19:38:41.920494229 +0100
++++ b/support/cltkWait.c	2023-01-25 19:39:51.246347410 +0100
+@@ -44,9 +44,7 @@
+   Tk_Window win;
+ };
+ 
+-static void WaitVisibilityProc(clientData, eventPtr)
+-    ClientData clientData;
+-    XEvent *eventPtr;           /* Information about event (not used). */
++static void WaitVisibilityProc(ClientData clientData, XEvent *eventPtr)
+ {
+   struct WinCBData *vis = clientData;
+   value cbid = Val_int(vis->cbid);
+--- a/support/cltkImg.c	2023-01-25 19:42:03.647173018 +0100
++++ b/support/cltkImg.c	2023-01-25 19:42:49.290423395 +0100
+@@ -111,9 +111,7 @@
+   return Val_int(0);
+ }
+ 
+-CAMLprim value camltk_setimgdata_bytecode(argv,argn)
+-     value *argv;
+-     int argn;
++CAMLprim value camltk_setimgdata_bytecode(value *argv, int argn)
+ {
+   return camltk_setimgdata_native(argv[0], argv[1], argv[2], argv[3],
+                                   argv[4], argv[5]);
+--- a/support/cltkVar.c	2023-01-25 19:44:11.880066940 +0100
++++ b/support/cltkVar.c	2023-01-25 19:46:16.580018764 +0100
+@@ -74,12 +74,12 @@
+ typedef char *(Tcl_VarTraceProc) _ANSI_ARGS_((ClientData clientData,
+         Tcl_Interp *interp, char *part1, char *part2, int flags));
+  */
+-static char * tracevar(clientdata, interp, name1, name2, flags)
+-     ClientData clientdata;
+-     Tcl_Interp *interp;        /* Interpreter containing variable. */
+-     char *name1;               /* Name of variable. */
+-     char *name2;               /* Second part of variable name. */
+-     int flags;                 /* Information about what happened. */
++static char * tracevar(ClientData clientdata, Tcl_Interp *interp,
++                char *name1, char *name2, int flags)
++     /* interp -> Interpreter containing variable. */
++     /* name1  -> Name of variable. */
++     /* name2  -> Second part of variable name. */
++     /* flags  -> Information about what happened. */
+ {
+   Tcl_UntraceVar2(interp, name1, name2,
+                 TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
diff --git a/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch b/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
index 7d5c94356c5c..005c7264a8b4 100644
--- a/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
+++ b/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
@@ -10,3 +10,12 @@
  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
diff --git a/dev-ml/labltk/labltk-8.06.12-r1.ebuild b/dev-ml/labltk/labltk-8.06.12-r1.ebuild
index a85ce87f404c..6ec61653cabe 100644
--- a/dev-ml/labltk/labltk-8.06.12-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r1.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}/findlib.patch"
 	"${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
 	"${FILESDIR}"/${P}-shuffle.patch
+	"${FILESDIR}"/${P}-c2x.patch
 )
 
 src_prepare() {
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index efb86a11d61e..12d972459321 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1,3 +1,4 @@
+AUX zarith-1.12-shuffle.patch 308 BLAKE2B 7c725c7ef19483a153f7404c3c91f268faf24b949042f05a7f79640d4fabd7d47722df3453b4bf705e3c1fea08784bd13b082cdea69d4932283b302dbf49db85 SHA512 851dac84670cdf2f58f59b9decf28f0a40368098422c3f90da04580f4a64e2c3527beb318ff68bcfa94a60ac99a26c2b54f3e33b4bd82c7d3cb9f23072b32614
 DIST zarith-1.12.tar.gz 93695 BLAKE2B b9622e2f397887d08fb8a8520419cf459e99906c05a897af91258b17d92d3fbbd2314a0a4be8a56a07074dcb0a0d04c896b3b5e69526a6c81a8a07b657d1bfec SHA512 8075573ae65579a2606b37dd1b213032a07d220d28c733f9288ae80d36f8a2cc4d91632806df2503c130ea9658dc207ee3a64347c21aa53969050a208f5b2bb4
-EBUILD zarith-1.12.ebuild 1383 BLAKE2B 68d06334c42e8e36cc32ac40b59f26ba9c4db058a2564e8f7af3d23ffbc8f5403865c23fd21ecdf082459e5771bbcc98b69d2c18d38639b5a697163d73229025 SHA512 a052037886238028ee487ce4477debb9694c7356adc9dd6af60e584ce45a9891fc5c7f7fe694fe746ddc890d922fbb166bc744ab37e453a2d320af059066c28a
+EBUILD zarith-1.12.ebuild 1429 BLAKE2B 015c4587939d5d7511d1b3e0437377b712da40c677db7069fde9f9f563475f3fc0deb16b1e3e4c4fbe74c97c1e9dc21b21de58a190be03c851d3cb55db97b43a SHA512 b3f000982657bab9e22e86b922e1ac2ac63281efa01f94ad46fdb6d68cede9c6d6ee7c51e0f2d09ddee834c776f5a01ba6a15a80ba3c97b53a0fc7b3fe179e4a
 MISC metadata.xml 385 BLAKE2B b88400ffa45f84bd5bcfab6a7299ae7f961453f12a55f14dd329831a2273ded4ef2b21dcb25b2611d8590dac2850f84a0221a561d40fa65ce9d62a6ef9a75e57 SHA512 cab52bdbd8b49498a14001cef333073aab9e9496c4caef217cc37738e607a35b23d8e25c41394e976be98f822aca806a8da30773f142a70c69d2de7c8d87531c
diff --git a/dev-ml/zarith/files/zarith-1.12-shuffle.patch b/dev-ml/zarith/files/zarith-1.12-shuffle.patch
new file mode 100644
index 000000000000..4ddff37d6b04
--- /dev/null
+++ b/dev-ml/zarith/files/zarith-1.12-shuffle.patch
@@ -0,0 +1,11 @@
+--- a/project.mak	2023-01-25 22:56:39.079292147 +0100
++++ b/project.mak	2023-01-25 22:56:57.865057118 +0100
+@@ -145,7 +145,7 @@
+ 	make -C tests clean
+ 
+ depend: $(AUTOGEN)
+-	$(OCAMLDEP) -native $(OCAMLINC) $(MLSRC) $(MLISRC) > depend
++	$(OCAMLDEP) $(OCAMLINC) $(MLSRC) $(MLISRC) > depend
+ 
+ include depend
+ 
diff --git a/dev-ml/zarith/zarith-1.12.ebuild b/dev-ml/zarith/zarith-1.12.ebuild
index f816228c6ad3..275b33c37e47 100644
--- a/dev-ml/zarith/zarith-1.12.ebuild
+++ b/dev-ml/zarith/zarith-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,8 @@ RDEPEND="
 DEPEND="${RDEPEND} dev-lang/perl"
 DOCS=( README.md Changes )
 
+PATCHES=( "${FILESDIR}"/${P}-shuffle.patch )
+
 S="${WORKDIR}/Zarith-release-${PV}"
 
 src_configure() {