From bff543bb632933380da922cbfc07c67157d72d42 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 23 Jun 2024 00:11:31 +0100
Subject: gentoo auto-resync : 23:06:2024 - 00:11:30

---
 dev-ml/labltk/Manifest                           |  8 ++--
 dev-ml/labltk/files/labltk-8.06.14-findlib.patch | 13 ++++++
 dev-ml/labltk/files/labltk-8.06.14-shuffle.patch | 31 ++++++++++++++
 dev-ml/labltk/labltk-8.06.12-r2.ebuild           |  3 +-
 dev-ml/labltk/labltk-8.06.14.ebuild              | 54 ++++++++++++++++++++++++
 dev-ml/labltk/labltk-8.06.9-r1.ebuild            | 54 ------------------------
 6 files changed, 105 insertions(+), 58 deletions(-)
 create mode 100644 dev-ml/labltk/files/labltk-8.06.14-findlib.patch
 create mode 100644 dev-ml/labltk/files/labltk-8.06.14-shuffle.patch
 create mode 100644 dev-ml/labltk/labltk-8.06.14.ebuild
 delete mode 100644 dev-ml/labltk/labltk-8.06.9-r1.ebuild

(limited to 'dev-ml/labltk')

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.14.ebuild b/dev-ml/labltk/labltk-8.06.14.ebuild
new file mode 100644
index 000000000000..20f88b5c971b
--- /dev/null
+++ b/dev-ml/labltk/labltk-8.06.14.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib toolchain-funcs
+
+DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
+HOMEPAGE="https://garrigue.github.io/labltk/"
+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 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt X"
+
+RDEPEND="dev-lang/tk:=
+	>=dev-lang/ocaml-4.14:=[ocamlopt?,X(+)?]"
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-findlib.patch
+	"${FILESDIR}"/${P}-shuffle.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e "s|ranlib|$(tc-getRANLIB)|" \
+		frx/Makefile \
+		|| die
+	default
+}
+
+src_configure() {
+	./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!"
+}
+
+src_compile() {
+	emake -j1 all
+	use ocamlopt && emake -j1 opt
+}
+
+src_install() {
+	findlib_src_preinst
+	dodir /usr/bin
+	emake \
+		INSTALLDIR="${D}/$(ocamlc -where)/labltk" \
+		INSTALLBINDIR="${ED}/usr/bin/" \
+		RANLIB=$(tc-getRANLIB) \
+		install
+	dodoc Changes README.mlTk
+}
diff --git a/dev-ml/labltk/labltk-8.06.9-r1.ebuild b/dev-ml/labltk/labltk-8.06.9-r1.ebuild
deleted file mode 100644
index a0a9443fbf18..000000000000
--- a/dev-ml/labltk/labltk-8.06.9-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib toolchain-funcs
-
-DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
-HOMEPAGE="https://garrigue.github.io/labltk/"
-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"
-IUSE="+ocamlopt X"
-
-RDEPEND="dev-lang/tk:=
-	<dev-lang/ocaml-4.12
-	>=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-"
-
-PATCHES=(
-	"${FILESDIR}/findlib.patch"
-	"${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
-)
-
-src_prepare() {
-	sed -i \
-		-e "s|ranlib|$(tc-getRANLIB)|" \
-		frx/Makefile \
-		|| die
-	default
-}
-
-src_configure() {
-	./configure --use-findlib --verbose $(usex X "--tk-x11" "--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