gentoo auto-resync : 15:11:2024 - 03:02:36

3 files changed, 52 insertions, 38 deletions

diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
index 32662d2e97f6..2d040b70f8c9 100644
--- a/dev-ml/re/Manifest
+++ b/dev-ml/re/Manifest
@@ -1,11 +1,11 @@
 AUX ounit2.patch 345 BLAKE2B 9db15f913a961c6aec6025ecf9c7dbf37dfed084e57246cb7e52012b548199014c8b93e0d75c6baf5b32a4cc806584bf3a50d48a50a8fa81d08690dd43aff072 SHA512 c002d4e2343931b6954828226678ec2b1e878fc36bdd031cb0e9158222e375b3595b2e58ef7de3b9ff9613b44ffdb29d8e5fe4fb8284a7ad1815712893bf9cb1
 AUX re-1.13.0-noSeq.patch 261 BLAKE2B f099f3272b777b56f44205e6a182aa0bd38d0efca22c9ba83848b7dbf02fb13762a3c3f573edeb4e48435ac767778e7c849b26bd782a68c4b8eba2e6f4a9ea06 SHA512 c0870fd6106c8abb86ae09fc8091f3f1f95bd352973c786ff7d3a9fee1d2dd1f96b085c550ab576d8412198075fc0eb867d455eab4adb5722f046e2d7c4f183a
-DIST ocaml-re-1.10.4.tar.gz 90379 BLAKE2B 411786bd89c712db0a7fba071abd303895621f0353b52e33dffeba146994cf145ea7f5199435d5b4c4738eedafa5bb00b430c92fe072f13fe455bb30a0b29998 SHA512 1bef38154f856b48985a0dfa975dc8539f146d0308d7c2af01078f5e998683fd635c7ae4a888e95c1a4dc4df9539dcd5dc506a5ef8718386cf0073947507f91a
 DIST ocaml-re-1.11.0.tar.gz 93319 BLAKE2B ccfba746e39d379c862576372694b9ce27f365996cad6c041b14e0a39514663cfb9bf32319ec67207cc5c8a65cd6278d0e111d2f15508bda54f7e0d89d528e8d SHA512 92096672833defba1b92b23bc4ce78cffb2501a21aca0dee264da1c8f35b5995154108d5f47318b9e37933537144359a742dce7825734c68dbd7d3d8ad4bc5b1
 DIST ocaml-re-1.12.0.tar.gz 91945 BLAKE2B 2694ae75589484570d7eff17cf76e9cd6ac1869c4579964fa6a335d9d43dc3f5127141ea285661e9f16d706c8e8d5a861de566e9e0ae4e602de5c6fb29a3f4df SHA512 679a23d86e9ee21f2c451623b04e990beeedabdd5e6c460827292044804f7f7790c3c6a918c02cd6723a3885a7acf3c349b7529c6d4d7e03b9bc53767a3b7ae4
 DIST ocaml-re-1.13.0.tar.gz 98675 BLAKE2B dd5a2dabdb73d5c5079cc36b7d82ea829b25fcd19625098b14de6c78abe4e4e1832f35865b3ab76cc8d09c5d59ad697f5086bddc58b0963716c965d22d3cbcae SHA512 f6105787f318cfda72e4dedda085d44d6e95ca1ca98d2a3d0d4b877464c8aa50c816fd1592d9e23e7493b67734b7362748c17fe490cf31e2dba2c07381cd0b2a
-EBUILD re-1.10.4-r2.ebuild 744 BLAKE2B 795176d9e8b128b1bfe04a6e5898e9570e88ccb760a9f754663fe63b9108ccded768c0c1ae9393c6cdd84f0e7214e5e08634eff9db576f4ac69f747cab673b72 SHA512 84109767c0da41109a876ca989c763ae7b2562980fea0e09b0faba1ad78ad3546b564ea88dc0e034aa3859f35a01a5e9928a0c4b4ad5e86eed35e7291e135169
+DIST ocaml-re-1.13.3.gh.tar.gz 98392 BLAKE2B 931ed420b211f69411969ac920815390a5f8f6ed1a190cf33adff3a7c942af303b47ee0e8b82f80e175b3812c395aa85a585d0026e9341279adc9fe9640d35ab SHA512 868960c89d3ab9264c883b9e2dac911ad6c3625df0b18e240dd2467051a5477de40abce691a0c76af91c7cda39ecf1e6275e58f2271657092b039d3ad3d066e0
 EBUILD re-1.11.0.ebuild 859 BLAKE2B e5e01cd65ae5c1f59101b2e5add7f20a70b67a3e52626c0896b7d95ba9f06ff90f58d1b169fec37074d6a397f25c3fc689ca0dd9bc1a9ac2460527ce68342670 SHA512 641c5ac54fd0a964fe7b9b265dda8a2d773800c44d6386255399d7ea7a15117fb7dce73f301f2cf019a3877d1dcf4b8bdbfb8775873029a2bb15ba8289b3b39e
 EBUILD re-1.12.0.ebuild 806 BLAKE2B 9649dde022039e5fad8b9c75bd6b0d28830066ceb7da3d79b0d5b3c380015c536f8c875431cf7dd5d917d69257e035323d68052d9a7b92626575619da9fcd1e8 SHA512 12f76545a4e1795908fc22f3e8420d8d67b594730c9200f4245704efaf3483de0066b7b57006dc81c119884b0a137809af91ca11c49b6d7646e38b6c900ac461
 EBUILD re-1.13.0.ebuild 832 BLAKE2B f3e7edb6a22cf80d0092dd3c6d109ea3718a57dfb7605d91b0eae56ce25ad596c01b62197d3852dcf4519a329087bc78e0941ebac4d25bcea0bbcc7437ec072f SHA512 31f29f0f13e18c7fa03c6621905f5d4fe926ab2b572792288a32a9da375b6ead62eccb1bb131bf8e59ba7c6391367052ba80c7a6d7fdbb17f8733d37b91067ed
+EBUILD re-1.13.3.ebuild 922 BLAKE2B 6b3c957ab790901a2ce49a751eafb093ddfa6dac56e26bc0e986d28d4f42948e96316df8562cc2b9a21258c791ee03f729e1fb595dd6ee3c6594eeec3ae4aeb2 SHA512 bf0591fe45afe50b968f1835d3c32c223fef5f0091a5d707d3b180f939e0ea587323138ccb1e18f6bef0ffa4cb2c3670d50ae46fd3629ab576a8d9c3744353ee
 MISC metadata.xml 312 BLAKE2B 1bff09bbce8c58c0eea6b7831688673e74cecdfce1abe70df28d4d6f4c7bc12e200e9556a82a5246f2811ff6b91b96b9915feb7a4463f83f49fb306cbedf0cbb SHA512 009249da19f97167f6d60815915d746fe2a51ec8af1b1503fa4bd95979c0629843a96c31182ea8bc179a725fd68896c43aac0c78aa3e6ba8e91fc7d5206c8f43
diff --git a/dev-ml/re/re-1.10.4-r2.ebuild b/dev-ml/re/re-1.10.4-r2.ebuild
deleted file mode 100644
index 1d08e69eb270..000000000000
--- a/dev-ml/re/re-1.10.4-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Regular expression library for OCaml"
-HOMEPAGE="https://github.com/ocaml/ocaml-re"
-SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz
-	-> ocaml-${P}.tar.gz"
-S="${WORKDIR}"/ocaml-${P}
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-ml/ocaml-re
-	!<dev-ml/seq-0.3
-	>=dev-lang/ocaml-4.09
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-ml/ounit2 )"
-
-PATCHES=( "${FILESDIR}"/ounit2.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/(libraries seq)/d" \
-		lib/dune \
-		|| die
-}
diff --git a/dev-ml/re/re-1.13.3.ebuild b/dev-ml/re/re-1.13.3.ebuild
new file mode 100644
index 000000000000..a1b11945e0ef
--- /dev/null
+++ b/dev-ml/re/re-1.13.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Regular expression library for OCaml"
+HOMEPAGE="https://github.com/ocaml/ocaml-re/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ocaml/ocaml-re.git"
+else
+	SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz
+		-> ocaml-${P}.gh.tar.gz"
+	S="${WORKDIR}/ocaml-${P}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.12
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	test? (
+		dev-ml/ounit2
+		dev-ml/ppx_expect
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.13.0-noSeq.patch" )
+
+src_prepare() {
+	default
+
+	sed -i lib/dune -e "/(libraries seq)/d" || die
+
+	# "expect" tests fail.
+	rm -r lib_test/expect || die
+}