gentoo resync : 06.04.2022

3 files changed, 56 insertions, 2 deletions

diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 26f868715e49..67f1326ce586 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -3,10 +3,12 @@ AUX labltk-8.06.10-this-expression-has-type.patch 644 BLAKE2B 951ccdfa410298bb16
 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.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.ebuild 1339 BLAKE2B 9ae5c912462a3f555d2418c1ee0e57251ee5af61e626ce4492eec9a5626e8c70644c72210ea6441b63f90666444e0f2d6e86fd39400c0d0578b329542ace3413 SHA512 d302f57b231ec392ea44f2b4442e8181568fedb67f3bd2f7c0a1536002b709c1ae629e7610fe9c2bf45ce92c4cdbbb5cd1f6ac4eab42d5a36c9e88d67651daa1
-EBUILD labltk-8.06.11.ebuild 1095 BLAKE2B f3ef1e81e344f485ac128aa049030a2e9adb9e09455c860e809902e3e84ac60a6c06d40a6a8ed2a136e9c8fa7defee03af1928b742b6f6d366766138e6e88451 SHA512 617e8236c3f85933fdf207557b0a43a7b4ee4bf3c6d992d16fc202c87a978b646e9f3d053d654724b8d2a73b0f3a952ff5afbd30e9d9bd6646c80a7ede41a621
+EBUILD labltk-8.06.11.ebuild 1095 BLAKE2B bcb5b1df6459c8e07d37b71c65527f8d9e03a23bca1f10d2d0ddcc97b43b98b99ff26da494dcd90bf2039d1b79a2a436cddf00898e0ec4ed5bf8b3f0bf2e3b11 SHA512 740242687275fa067852e368faad6cbcaad04c995231669504cb8982d85b28ac604ba532f6c0a84cfe30660364a48d597f1d7c2d2136c8832cd0ae6dc10f8b52
+EBUILD labltk-8.06.12.ebuild 1095 BLAKE2B d856da267543e1f573717dcd19adf828ee0c11c33e30c5c9a712f7a7974ebeec39c8b40714c5527f2e4512c4614938d776e7a6f8ff181b61112271d568bcf1e5 SHA512 8e05156a98079d7e5c5d5d384d41e2d201d720e37879abda1c042559099efaa7db207a54d87fc9b4ab601f7921b7943e7f428fb91bc633cba9dd3603af60ebbd
 EBUILD labltk-8.06.7.ebuild 1130 BLAKE2B 39326a01bb1bd9e98fedf9e44012bcbd46f80899c61be6b6d1325ffa203849969f94dbc6b48955f3d4b787a3dc48c5490d56b67ae3bea18857d79e15be36850c SHA512 ff7b60d0427ea3532e8433678d205235a1d6c1fc85f432bf29dc06253f441b1be0677f3e3ad9bb992c02a4291b143ea023b2e6a111bfe264df198a6456da4460
 EBUILD labltk-8.06.9.ebuild 1117 BLAKE2B 345ab28cda2854f072ce33bc299fd7cb19991594739fe8776d28718b278db7a546c9f789e00476845ea86aeaffa8449092cfca028dfbc47c9aca6cea74b14713 SHA512 d7aa31a1742fb77cc5bbc93f4aedba7c09eec6b7c2e220912f62a616a8c0a6e0db2daa74fe9bf1e053659b449b90d57a61504b2e7bce1b0049d9feea35f35557
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/labltk/labltk-8.06.11.ebuild b/dev-ml/labltk/labltk-8.06.11.ebuild
index ecf7d249b8f1..150ac43273e3 100644
--- a/dev-ml/labltk/labltk-8.06.11.ebuild
+++ b/dev-ml/labltk/labltk-8.06.11.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-li
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
-	>=dev-lang/ocaml-4.13:=[ocamlopt?,X(+)?]"
+	=dev-lang/ocaml-4.13*:=[ocamlopt?,X(+)?]"
 DEPEND="${RDEPEND}
 	dev-ml/findlib
 "
diff --git a/dev-ml/labltk/labltk-8.06.12.ebuild b/dev-ml/labltk/labltk-8.06.12.ebuild
new file mode 100644
index 000000000000..0e4568b8da5d
--- /dev/null
+++ b/dev-ml/labltk/labltk-8.06.12.ebuild
@@ -0,0 +1,52 @@
+# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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}/findlib.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
+}