gentoo auto-resync : 27:12:2023 - 07:43:26

5 files changed, 48 insertions, 54 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index fb45708de744..20df95ee4459 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
index 88db338c5e32..6c80d11b4e6c 100644
--- a/dev-ml/re/Manifest
+++ b/dev-ml/re/Manifest
@@ -1,8 +1,6 @@
 AUX ounit2.patch 345 BLAKE2B 9db15f913a961c6aec6025ecf9c7dbf37dfed084e57246cb7e52012b548199014c8b93e0d75c6baf5b32a4cc806584bf3a50d48a50a8fa81d08690dd43aff072 SHA512 c002d4e2343931b6954828226678ec2b1e878fc36bdd031cb0e9158222e375b3595b2e58ef7de3b9ff9613b44ffdb29d8e5fe4fb8284a7ad1815712893bf9cb1
-DIST ocaml-re-1.10.3.tar.gz 90155 BLAKE2B 44f7779e2004c8ac24f6bf476edaea5f6469fd64319c681df1917d571e5f4175559516e5f19bcf5eee19687eb3ad0c93b672b97cfdc54f29803180b3b9a229d7 SHA512 c86bc375d52ba4d0363d56636dd389c29ce3fc430f569fd5c3af3265023bb80462d94ea9fce97387fdebc8731d33166871ac2f9162327674c2b97bdbde423bbd
 DIST ocaml-re-1.10.4.tar.gz 90379 BLAKE2B 411786bd89c712db0a7fba071abd303895621f0353b52e33dffeba146994cf145ea7f5199435d5b4c4738eedafa5bb00b430c92fe072f13fe455bb30a0b29998 SHA512 1bef38154f856b48985a0dfa975dc8539f146d0308d7c2af01078f5e998683fd635c7ae4a888e95c1a4dc4df9539dcd5dc506a5ef8718386cf0073947507f91a
-DIST ocaml-re-1.9.0.tar.gz 83642 BLAKE2B abcabb80ffef241fc7e8ea075f49365cc64f8749db1d1f7eb654eeb52f5be8e96756f98ae7903391a26d8537f82e105878a38a15923d7f93c61abd5c08d3ff98 SHA512 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
-EBUILD re-1.10.3.ebuild 622 BLAKE2B e6a938fc279d0e8c4f0a8935bdc01feb72f33cba5ef6830c656f01404acd782d09c56e6fca0fcd0878946598856b0825061e0f05c3a85b6f64a5905ace70260a SHA512 e056c146492c066d9daf8cc77b84e72e656070cd28f12121a30ca00d51134b9b835999b6d52bb616dd498aadb571b9ebd8b99e9fedbb86fdd5ce77d0ad59dc9f
+DIST ocaml-re-1.11.0.tar.gz 93319 BLAKE2B ccfba746e39d379c862576372694b9ce27f365996cad6c041b14e0a39514663cfb9bf32319ec67207cc5c8a65cd6278d0e111d2f15508bda54f7e0d89d528e8d SHA512 92096672833defba1b92b23bc4ce78cffb2501a21aca0dee264da1c8f35b5995154108d5f47318b9e37933537144359a742dce7825734c68dbd7d3d8ad4bc5b1
 EBUILD re-1.10.4-r2.ebuild 744 BLAKE2B 795176d9e8b128b1bfe04a6e5898e9570e88ccb760a9f754663fe63b9108ccded768c0c1ae9393c6cdd84f0e7214e5e08634eff9db576f4ac69f747cab673b72 SHA512 84109767c0da41109a876ca989c763ae7b2562980fea0e09b0faba1ad78ad3546b564ea88dc0e034aa3859f35a01a5e9928a0c4b4ad5e86eed35e7291e135169
-EBUILD re-1.9.0.ebuild 610 BLAKE2B 27f97cbc040e5d8d5fb40a945124e757cf89d88599ccb5890f5bfb15d3261fef42314b924e7be64394ef5b8f92a43728a8cff29fd5462e68acbe580fd63d6f6a SHA512 9348d9961e5eeb67f5aa9261a1fea41185f77b135d419bd8fcf0dc508842b4fd244d63f5494ad06ce92ff07b458852ec108e09ca5520ff1cd9d71a1b7f05e268
+EBUILD re-1.11.0.ebuild 864 BLAKE2B b63a33bcd18a31b5116a483c21b70b01f90f68d7bfc90cdbdfd8e6bfdfb880c05c343c93be6f2859ee933316e240f51b0e327385c6d0356f17c1d6a3e7197363 SHA512 f165674e3485db6ad3687f95195e535ed424af967339164c42ed0b14e44dc3127826a68543b2f88aaf0c1fdaee4527797e8dcf00b8e27be3c780530eaca82dc6
 MISC metadata.xml 417 BLAKE2B f430469be32b652c280b3044cc455f267f494c8b92778971ca7e497996b9149cfa75e01829552cc5fca41734e8e3d17e7773f7a2484121b1b99a4632a20a075c SHA512 c19dce40e6ed1a36fd00a52ca0b9c85767d01fd7f48181b908b7c205da33032b65da4576f5e6829e925596e0ecca7b49555545aacf0744c3e151c4174a4d086a
diff --git a/dev-ml/re/re-1.10.3.ebuild b/dev-ml/re/re-1.10.3.ebuild
deleted file mode 100644
index 8eecc1dfb562..000000000000
--- a/dev-ml/re/re-1.10.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit2 )"
-
-PATCHES=( "${FILESDIR}/ounit2.patch" )
diff --git a/dev-ml/re/re-1.11.0.ebuild b/dev-ml/re/re-1.11.0.ebuild
new file mode 100644
index 000000000000..d47b8882c4b2
--- /dev/null
+++ b/dev-ml/re/re-1.11.0.ebuild
@@ -0,0 +1,46 @@
+# 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"
+
+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}.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-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 lib/dune -e "/(libraries seq)/d" || die
+}
diff --git a/dev-ml/re/re-1.9.0.ebuild b/dev-ml/re/re-1.9.0.ebuild
deleted file mode 100644
index d92eeed9e843..000000000000
--- a/dev-ml/re/re-1.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-ml/ocaml-re
-	dev-ml/seq:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit2 )"
-
-PATCHES=( "${FILESDIR}/ounit2.patch" )