From 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 Mar 2021 14:27:17 +0000 Subject: gentoo resync : 20.03.2021 --- dev-ml/labltk/Manifest | 3 - dev-ml/labltk/files/ocaml405.patch | 382 ------------------------------------- dev-ml/labltk/labltk-8.06.2.ebuild | 44 ----- 3 files changed, 429 deletions(-) delete mode 100644 dev-ml/labltk/files/ocaml405.patch delete mode 100644 dev-ml/labltk/labltk-8.06.2.ebuild (limited to 'dev-ml/labltk') diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest index a5f299e03ba9..47cbf1dda79e 100644 --- a/dev-ml/labltk/Manifest +++ b/dev-ml/labltk/Manifest @@ -1,9 +1,6 @@ AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591973b6a2c3843fe254fb0001ce627ec831df5d4c6885d01de679f3d7b74e6538692de08a1fcf608 SHA512 4f5172bc7d603375bda331d40708ad14e7e9e7374f97cbd11da56473ca704421f7c801559dbcc753fe8004a809b80142158974a1c5c469eb2894580121cc9442 -AUX ocaml405.patch 13731 BLAKE2B 36ce4825b8e004720d966d7a7c1a769c84e4e3b044c07ce8112ee456acd819315a21625acb33a8423ad317d026bb03ddffa2b3dcba63dec1549254815c14d7e7 SHA512 a246af35b932e773e0c58b745d3885f98162892945f359dc4781489d76715c0564efa2ea985a43808e431fb8fd4225d4ad7b6a753abd54a8f12dc65ae43cfa9d -DIST labltk-8.06.2.tar.gz 369508 BLAKE2B df0a5fb1cf352c52bf3177e83be2cadde961c2a7ba0496f45dc515141931d13715b4c253f74e5f280f9a6c310488236e6bc598c0ceffc408028ef5f524f2bcf2 SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6 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.2.ebuild 1093 BLAKE2B 529cef5576a7ba07ab56ef4c29a5cdebd03f058ddefc26e2d3d484585d1b0d8dc1a6930d1cda915cb012e5c6351e87443993282aa8ed64daef46e4e0f4eed0c1 SHA512 dcfe8dc6542034ca114fe5267b1eed116e48a3018e88938e13c8cc3c4da458a345a47b9c2f536ac2bb74f9b0c57b0a39f0726bf55b0042a7233fb9f333a07e9e EBUILD labltk-8.06.7.ebuild 998 BLAKE2B c31a2f9eb29f5d63a22a998c8dd9e143798f74d17e0d04bfef4c6995e9a003cbe897a5b157d6044f450fd3177c024cc768db785ab90577101651cbfa3f5d8cce SHA512 c4fc20f8b97e23cb0caf8e3b478d34c60c13a00617fb41dad005c811f9746f1c42c508796af24ca306b7d29bc065bdf6ebbb8b4ca377ba785ae24106620d7758 EBUILD labltk-8.06.9.ebuild 986 BLAKE2B acfde3021a3cae9b4ced6ba8e79c04034b5eaca4d3b54b45c4c2823c838ebf7887192a5396c91b8a748bfc5c2c154ae6839a35936445d607d5bffdaec0dfe244 SHA512 12877671736a842ee5a21caee37015a963163d66efcc95d2c05de8fbb58868c21258513f26bb26920e93abfadd4b74c02b9695132558a45c9131ac9e1e4040c8 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-ml/labltk/files/ocaml405.patch b/dev-ml/labltk/files/ocaml405.patch deleted file mode 100644 index 8503646f71ec..000000000000 --- a/dev-ml/labltk/files/ocaml405.patch +++ /dev/null @@ -1,382 +0,0 @@ -Index: labltk-8.06.2/support/cltkCaml.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkCaml.c -+++ labltk-8.06.2/support/cltkCaml.c -@@ -39,7 +39,7 @@ int CamlCBCmd(ClientData clientdata, Tcl - int id; - if (Tcl_GetInt(interp, argv[1], &id) != TCL_OK) - return TCL_ERROR; -- callback2(*handler_code,Val_int(id), -+ caml_callback2(*handler_code,Val_int(id), - copy_string_list(argc - 2,(char **)&argv[2])); - /* Never fails (OCaml would have raised an exception) */ - /* but result may have been set by callback */ -@@ -65,7 +65,7 @@ CAMLprim value camltk_return (value v) - /* Note: raise_with_string WILL copy the error message */ - CAMLprim void tk_error(const char *errmsg) - { -- raise_with_string(*tkerror_exn, errmsg); -+ caml_raise_with_string(*tkerror_exn, errmsg); - } - - -Index: labltk-8.06.2/support/cltkDMain.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkDMain.c -+++ labltk-8.06.2/support/cltkDMain.c -@@ -56,7 +56,7 @@ void invoke_pending_caml_signals (client - /* Rearm timer */ - Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL); - signal_events = 1; -- leave_blocking_section(); -+ caml_leave_blocking_section(); - } - /* The following is taken from byterun/startup.c */ - header_t atom_table[256]; -@@ -222,10 +222,10 @@ int Caml_Init(interp) - strcat(f, RCNAME); - if (0 == access(f,R_OK)) - if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) { -- stat_free(f); -+ caml_stat_free(f); - tk_error(Tcl_GetStringResult(cltclinterp)); - }; -- stat_free(f); -+ caml_stat_free(f); - } - } - -Index: labltk-8.06.2/support/cltkEval.c -=================================================================== ---- labltk-8.06.2.orig/support/cltkEval.c -+++ labltk-8.06.2/support/cltkEval.c -@@ -45,7 +45,7 @@ value copy_string_list(int argc, char ** - for (i = argc-1; i >= 0; i--) { - oldres = res; - str = tcl_string_to_caml(argv[i]); -- res = alloc(2, 0); -+ res = caml_alloc(2, 0); - Field(res, 0) = str; - Field(res, 1) = oldres; - } -@@ -71,7 +71,7 @@ CAMLprim value camltk_tcl_eval(value str - Tcl_ResetResult(cltclinterp); - cmd = caml_string_to_tcl(str); - code = Tcl_Eval(cltclinterp, cmd); -- stat_free(cmd); -+ caml_stat_free(cmd); - - switch (code) { - case TCL_OK: -@@ -143,8 +143,8 @@ int fill_args (char **argv, int where, v - fill_args(tmpargv,0,Field(v,0)); - tmpargv[size] = NULL; - merged = Tcl_Merge(size,(const char *const*)tmpargv); -- for(i = 0; iwin, VisibilityChangeMask, - WaitVisibilityProc, clientData); - -- stat_free((char *)vis); -- callback2(*handler_code,cbid,Val_int(0)); -+ caml_stat_free((char *)vis); -+ caml_callback2(*handler_code,cbid,Val_int(0)); - } - - /* Sets up a callback upon Visibility of a window */ -@@ -65,7 +65,7 @@ CAMLprim value camltk_wait_vis(value win - (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData)); - vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow); - if (vis -> win == NULL) { -- stat_free((char *)vis); -+ caml_stat_free((char *)vis); - tk_error(Tcl_GetStringResult(cltclinterp)); - }; - vis->cbid = Int_val(cbid); -@@ -79,9 +79,9 @@ static void WaitWindowProc(ClientData cl - if (eventPtr->type == DestroyNotify) { - struct WinCBData *vis = clientData; - value cbid = Val_int(vis->cbid); -- stat_free((char *)clientData); -+ caml_stat_free((char *)clientData); - /* The handler is destroyed by Tk itself */ -- callback2(*handler_code,cbid,Val_int(0)); -+ caml_callback2(*handler_code,cbid,Val_int(0)); - } - } - -@@ -92,7 +92,7 @@ CAMLprim value camltk_wait_des(value win - (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData)); - vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow); - if (vis -> win == NULL) { -- stat_free((char *)vis); -+ caml_stat_free((char *)vis); - tk_error(Tcl_GetStringResult(cltclinterp)); - }; - vis->cbid = Int_val(cbid); -Index: labltk-8.06.2/browser/searchpos.ml -=================================================================== ---- labltk-8.06.2.orig/browser/searchpos.ml -+++ labltk-8.06.2/browser/searchpos.ml -@@ -782,7 +782,7 @@ and search_pos_expr ~pos exp = - search_pos_expr exp' ~pos - end; - search_pos_expr exp ~pos -- | Texp_function (_, l, _) -> -+ | Texp_function { arg_label = _; param = _ ; cases = l; partial = _; } -> - List.iter l ~f:(search_case ~pos) - | Texp_apply (exp, l) -> - List.iter l ~f:(fun (_, x) -> Misc.may (search_pos_expr ~pos) x); -Index: labltk-8.06.2/jpf/fileselect.ml -=================================================================== ---- labltk-8.06.2.orig/jpf/fileselect.ml -+++ labltk-8.06.2/jpf/fileselect.ml -@@ -55,7 +55,7 @@ let myentry_create p ~variable = - let subshell cmd = - let r,w = pipe () in - match fork () with -- 0 -> close r; dup2 ~src:w ~dst:stdout; -+ 0 -> close r; dup2 ~cloexec:false ~src:w ~dst:stdout; - execv ~prog:"/bin/sh" ~args:[| "/bin/sh"; "-c"; cmd |] - | id -> - close w; diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild deleted file mode 100644 index c598fa167907..000000000000 --- a/dev-ml/labltk/labltk-8.06.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit findlib eutils - -DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" -HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/" -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1628/${P}.tar.gz" - -LICENSE="QPL-1.0 LGPL-2" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+ocamlopt X" - -RDEPEND=">=dev-lang/tk-8.0.3:= - >=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]" -DEPEND="${RDEPEND} - >=dev-ml/findlib-1.5.5-r1" - -src_prepare() { - epatch "${FILESDIR}/findlib.patch" - has_version '>=dev-lang/ocaml-4.05.0_beta' && epatch "${FILESDIR}/ocaml405.patch" -} - -src_configure() { - ./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!" -} - -src_compile() { - emake -j1 - use ocamlopt && emake -j1 opt -} - -src_install() { - findlib_src_preinst - dodir /usr/bin - emake \ - INSTALLDIR="${D}$(ocamlc -where)/labltk" \ - INSTALLBINDIR="${ED}/usr/bin/" \ - install - dodoc Changes README.mlTk -} -- cgit v1.2.3