summaryrefslogtreecommitdiff
path: root/dev-ml/labltk
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml/labltk')
-rw-r--r--dev-ml/labltk/Manifest17
-rw-r--r--dev-ml/labltk/files/labltk-8.06.12-c99.patch11
-rw-r--r--dev-ml/labltk/files/labltk-8.06.12-shuffle.patch10
-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.10-r1.ebuild4
-rw-r--r--dev-ml/labltk/labltk-8.06.11-r1.ebuild4
-rw-r--r--dev-ml/labltk/labltk-8.06.12-r2.ebuild8
-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/labltk/labltk-8.06.7-r1.ebuild4
10 files changed, 94 insertions, 24 deletions
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 2f1e450a585b..ba8c8ce7e8d5 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -1,18 +1,21 @@
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-c2x.patch 2004 BLAKE2B de15e8845f52c5afbe55a3073ff9de48eccc195b807bc5b3be3926be5be39d1e82d8104b3e20bb135b66b29d17255cef6da83fa87478cde855a5f6f9454f20ba SHA512 1244edf70dc5e42cc11bc7b92dbece31cbbe6bf2b86e9ed3f78543ddd7f3b8866abc8e0fe5929123635d6870d1b2e3bd79dc0d6a430a08614541fee69fe0723e
-AUX labltk-8.06.12-shuffle.patch 1486 BLAKE2B f463d68056f9a8b4e691b4d6c20080a95407e8cdeb57b95bd7cefdb01df1920af7a8f24aae7842447c02a98339fc691568c60254e64b5ad2db996225276e28c2 SHA512 4e50f27c3030a0b70efa49fc6367cc75117054f3956ba8adab2834bc5d08738154b324b7434abbff574272055fedd2bf3b30bf675645d7bd84e3dc82d4ae17f5
+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 1244 BLAKE2B 476700376f0a3a240e260da46ed166a4a6f0d7ac804f54ea225b1deccac0661c0276454f975d5ec3c52444716037a616ef3babba76dfd5ae6488fcf4ba8dfbfc SHA512 dff095f011e1f615b9b5acc9d5d61555a7435fd590b4b0fe1e43eee2cea903108522e516f1c148be693751ef716e1ef76e1c5205ac2c8f0cf5a976a94395b1f3
-EBUILD labltk-8.06.7-r1.ebuild 1211 BLAKE2B 370fc276c5df5f5a2ca902ee8c5d950b847cca5bde8e405c2cb8fd607784244cb9be4cc7bb779cb5b38cb2dd0c3425096c966a2aa4d1f2c7aa0c68a3cfa784cf SHA512 a5458fd08adee2cb8cf124a737b1092666a1ae600c440dcde5b21eff4209c00bc1ebe5f0f6355f20efb46d926e32a2aefdcbdaf36520ce5e47a5c44a8445d5b8
-EBUILD labltk-8.06.9-r1.ebuild 1162 BLAKE2B ed062706236f9c2c94ed039797cb38ea8faad702bb97b96b858c7e38c5c58f14557e32990086c797aa8d3ceff4ef674a79b0c704f8bf964a50db662392e69245 SHA512 c9920835e614cd2b30c4399591f5ec7c831a73698e0ebfd440baa2d99a8acb074a36b03f11e2cc34b627f4239a0e423fbc4c175b84c1745f7e9c9d8d1cfe6ddc
+EBUILD labltk-8.06.10-r1.ebuild 1372 BLAKE2B dd521be235ff71b82f0d2c76ebdcc50a0fc5d556b8731bf711f6ce339d89071519053b5daa4f09b81fea8a8aa596c025b8ad4cd11de7cae93bf9fb7bb6ef0757 SHA512 e49f3bd544487ed90c911aba17956bbe10c1e91661ade9ab9f44770a0e3519cd6700d57ec715694aaa79a6c133694305cc820ddfe335c897a4ac5c7831694e91
+EBUILD labltk-8.06.11-r1.ebuild 1128 BLAKE2B eb528e076a6587cff0ee14f36f1f9bb6d8800f636816ae9055239b17e98e3ea0c151de89c29fc3b5252a9dc2eaed8ee193d9226e87e4a4c264602a199975ac58 SHA512 2c8e79aa5047b8ca4ef6f4600d1604ca04c45cf11e3ae756673d46bb8a2e711c4b2eb2c6c4626939f9c9370a44fcba12ba2e52efc45314cba4cfaaa7272b72fb
+EBUILD labltk-8.06.12-r2.ebuild 1281 BLAKE2B 9c7de24adf1eef9e307755e2a9ea866b4cd47873c6e94b278b391c2d4f83ee63f61d328d86bd5a98f2b6af388e2323dcc675d25fdf3cbcb741ebd75c25867880 SHA512 65ba246c43435355f2b2f8a47f65afed60a9db7bd4a713485e1e34dd96ff26930c9e080603d6778776f7b084c7baf8399771e0f5f2ac52a2b3f83e78b3bb6fc3
+EBUILD labltk-8.06.14.ebuild 1157 BLAKE2B 2127d8fe48c010e2ac59a57eb2d2983445ee3b759ef4f7670d6d80e3686facb3ad54fe04a61d43cbee497de08a201f5263837cec7633a44dbe2d35ff401974e9 SHA512 616826e064d52db1e959a2b50937ceb15e9002e8644b6e7de75509818827ad880288b64e17732acb10745d2479c3a6d701e3855bef69cc4e67e9c5eaf507f377
+EBUILD labltk-8.06.7-r1.ebuild 1199 BLAKE2B 510820fd6c7a40303b84bcbbe06f7c4d7abc3795b7751bcbf420adab3bb36e2f39e442231ea659bae7a0e9bf44aaefcebbef92869cd4a5e2e1c0ce357916a8e7 SHA512 f216d1d90ba4f5905d4328d6e770ca7b8f2fc828d8604b061d8244911a437413e846366fe6e6dd5d66c17d68b7e4be4642010c83a54b71d2f2634af5cb9bbe82
MISC metadata.xml 313 BLAKE2B aae3866559a63cabfc03f6e436564e5592f62c910cce24c44f5b217ef51f6f391ae9499167df4399491d5c89132ce857edcd50354bc6ac1a2bc6db9c829c639c SHA512 07873e6c2cadaa8ae45983cba98116688a436cf5071b0ce39c3b3472783ab5b3ab32052a58df81a9e2e26b155bff0c5907f82c7408962380b4d31d2d8dd04d09
diff --git a/dev-ml/labltk/files/labltk-8.06.12-c99.patch b/dev-ml/labltk/files/labltk-8.06.12-c99.patch
new file mode 100644
index 000000000000..1761f478bd76
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.12-c99.patch
@@ -0,0 +1,11 @@
+--- a/support/cltkVar.c 2024-06-04 20:18:35.940518270 +0200
++++ b/support/cltkVar.c 2024-06-04 20:18:49.456367424 +0200
+@@ -75,7 +75,7 @@
+ Tcl_Interp *interp, char *part1, char *part2, int flags));
+ */
+ static char * tracevar(ClientData clientdata, Tcl_Interp *interp,
+- char *name1, char *name2, int flags)
++ const char *name1, const char *name2, int flags)
+ /* interp -> Interpreter containing variable. */
+ /* name1 -> Name of variable. */
+ /* name2 -> Second part of variable name. */
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 482b18370ad6..62fd8997f212 100644
--- a/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
+++ b/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
@@ -34,3 +34,13 @@
jg_menu.cmx jg_memo.cmx fileselect.cmx ../support/fileevent.cmx shell.cmi
typecheck.cmo : ../labltk/tk.cmo ../labltk/text.cmi mytypes.cmi jg_tk.cmo \
jg_text.cmi jg_message.cmi typecheck.cmi
+--- 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/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.10-r1.ebuild b/dev-ml/labltk/labltk-8.06.10-r1.ebuild
index e6d19e54776b..df02654b0011 100644
--- a/dev-ml/labltk/labltk-8.06.10-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-warnings
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 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt X"
RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/labltk/labltk-8.06.11-r1.ebuild b/dev-ml/labltk/labltk-8.06.11-r1.ebuild
index 12f8405e4461..59c59df0ecee 100644
--- a/dev-ml/labltk/labltk-8.06.11-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt X"
RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/labltk/labltk-8.06.12-r2.ebuild b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
index 8842a41bed31..afa9197af4d6 100644
--- a/dev-ml/labltk/labltk-8.06.12-r2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,11 +11,12 @@ 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"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
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
"
@@ -25,6 +26,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
"${FILESDIR}"/${P}-shuffle.patch
"${FILESDIR}"/${P}-c2x.patch
+ "${FILESDIR}"/${P}-c99.patch
)
src_prepare() {
diff --git a/dev-ml/labltk/labltk-8.06.9-r1.ebuild b/dev-ml/labltk/labltk-8.06.14.ebuild
index a0a9443fbf18..5a4f7d3574ab 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 ~loong ~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-5:=[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/labltk/labltk-8.06.7-r1.ebuild b/dev-ml/labltk/labltk-8.06.7-r1.ebuild
index 58a37bddca04..56f6ff5cfec9 100644
--- a/dev-ml/labltk/labltk-8.06.7-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ 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 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt X"
RDEPEND=">=dev-lang/tk-8.0.3:=