gentoo auto-resync : 04:03:2023 - 01:36:13

17 files changed, 360 insertions, 0 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index de434cde452f..c45db1f11a68 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index bb595d483e4e..64a0559c0f2c 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -3,7 +3,9 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e5797
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
+DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
 EBUILD opam-client-2.0.10.ebuild 958 BLAKE2B e8c4f4fdc66e25d04d054b51e11f20b27c470230df6c5c4326d9cdeadd685c5ed99ba4be3d3d22f596f789e1f5bbff425fa51f0f4efc6d8594c601a8aa4f8941 SHA512 a8c5c6983d9fb6d11c3be32776c3bf033de93ac1b34c40b81ab8781a13e255deaa398cde689b8ed755897f21ac965c1e77aa411e3495b5ff6abac2c461e077c2
 EBUILD opam-client-2.0.9.ebuild 1026 BLAKE2B 0a42c8dc6f43666139de6c41f2e17d9ea60af9578d240af6eb5732a6cdf020a32231c10befb77ad86f9788afe798d534a8823789b22681bb71f4de547417b17e SHA512 d85a87f097ceaaad5254796d9547ee916faa277419504ff58d77076696588435cb0ac7610297d6dd76edf9c23fe3c6ec29bdb80cb83535051ed33cac273433d8
 EBUILD opam-client-2.1.2.ebuild 1019 BLAKE2B 12b0b6f8cdfd3a0d083c64e0d65212229e342305c4cf202c7c8117dc0106ec44d4c76b39a1672e7d7cfa66437689e96ece2b8aeabbb314b5336ac5ac7446ab16 SHA512 79292ade60ec2985ec1cbcc3e788b3018a280ff4a30da096816da5170d6b0909c09554a8ffe46d3a176f0d26129af3aaa7a5190f0270d55717ef1508e39bd0ec
+EBUILD opam-client-2.1.3.ebuild 1035 BLAKE2B 2d8ebdee2a621e70e2a1d2c05fa826936b5a9ae2c1c2028c5bd9b69b645a21c3088a4e8a3be65b1c102e008ad0e13e2479a940472143ca2d7d82f7b440d90fd3 SHA512 f20ba9d1521186ec7aae4b9565c28a98d5fd42ee50f0b7ff897d4b983eaf3ee25b284736d605f340f3c101e66746e06d3ff7e900eec4b02e05f4018e13afe6cd
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-client/opam-client-2.1.3.ebuild b/dev-ml/opam-client/opam-client-2.1.3.ebuild
new file mode 100644
index 000000000000..13f1908ac7db
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="opam client libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="test" # sandbox not working
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	~dev-ml/opam-repository-${PV}:=
+	~dev-ml/opam-state-${PV}:=
+	~dev-ml/opam-solver-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( sys-apps/bubblewrap )"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index e40f2e7aaf8d..b9803db369e9 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -2,7 +2,9 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e5797
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
+DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
 EBUILD opam-core-2.0.10.ebuild 866 BLAKE2B e3a7e06d70b655453dcfe884ca88c543a553f4682d855def743829daa372df6f285cc787772dd32857d8b5251163ff33c4e4ed4de8d569b7ac5868db947e4a9c SHA512 9c0da82a43a859a96138ff8ddbefab2436bc0930994f7828233d1c1f456a1047916da344918540d3b949aed29211c176a9afdcad7c141f0fd9d1314cf03194ae
 EBUILD opam-core-2.0.9.ebuild 881 BLAKE2B 705dbb83da94bb76fe650492dd25bf517cf2bee4d36f2d3efba22c4d51b10e88a615d2bee910f2912723bfaf47d656bf01843ecb9105fac3c7af236f0b6a45b0 SHA512 bcfff9888dc8b4ec8f5b241603f3ba9a453b0a1e4a13bc945f1a91620271cfa81eb562421a795a4001680ed2095ffd3785f49590dafecc18ab9972a58688ab4f
 EBUILD opam-core-2.1.2.ebuild 1010 BLAKE2B 4164aaeb2c582578120abab3a2e4891715403766932740b72a2aff08ef6627ec65a5357bf44f960e49efb6a9e8635bfa1de6aa514655d97a213b1c3efe9d65da SHA512 b87643fc55b9201c69b2d0f858aa7124ee314828b7e41a0da8970d8f7f131b084cc5ec05f231001297706d21dbdf7bf75b9a0e1d51fd469e646bb72ec72ad699
+EBUILD opam-core-2.1.3.ebuild 1015 BLAKE2B 734e77eaa169742c4c7394fab35540efbded4ee000fb48b44cdf88cbd99e7b5142d6d21dc5f850524bef4ee15142c12609b8b6450d7e9939fcfa3d47e58f3224 SHA512 4774f5c9abc092627e31cfa261b269527360e6e3468db054ed33de6a8b492249d4e913b243431134b2aa06764514bb24647bdc9aa4c796bd8c9f0230841570fd
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-core/opam-core-2.1.3.ebuild b/dev-ml/opam-core/opam-core-2.1.3.ebuild
new file mode 100644
index 000000000000..4074055d42a2
--- /dev/null
+++ b/dev-ml/opam-core/opam-core-2.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+inherit opam
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-ml/ocamlgraph:=
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	dev-ml/cmdliner:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9)))
+		 (release
+		  (flags (:standard -warn-error -3-9))))
+	EOF
+}
+
+src_compile() {
+	emake -j1 opam-installer
+	emake -j1 ${PN}.install
+}
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 8d057e239d6e..3f18bac29026 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -3,7 +3,9 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e5797
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
+DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
 EBUILD opam-format-2.0.10.ebuild 1069 BLAKE2B beb846dc8138471e6f143a8c52410ce75fecea99b862d68492c86ad16e465a267f6b283c648b1cae420a5ff96ddcc160e6aed508afda091067813856e18660a0 SHA512 5137b36b49eee5b85b5cf2fa046ff1f8f567454c3741559bc8454341ad6f1b2f9af2c739871d27d8d041de3287068fa9e924d451ef3ef76848b7adfdbf9287f5
 EBUILD opam-format-2.0.9.ebuild 1065 BLAKE2B 55af5160782551247fb58afb43ef6408de421baa017e33fd4aec31a7bd959245c8b6da5d557901095d2a30acc92259de485c5d075c7be9252f3d2334e9c21296 SHA512 38c93e93fea82728fc34ddd3b4d38accc34630277ffdba99317c7a78d0df4d755b18fe9114dac161bcd384d59d9172113a48f99cadf3d779b98a60d129c47e11
 EBUILD opam-format-2.1.2-r1.ebuild 1220 BLAKE2B 69460ea9e2d477f0a45455c7a01ff6fcd89afc12ccbfe7d3bdaa6b6030e313d296dce01f20a0869d96ce46a4ece03af70abccca6fa7285f57f9d88cf1151cf1e SHA512 ac4d3e0030fa005cab8d5659ed3d605b516a97001ad8b4b5f742d85791cc1d676f3e153f91bbdb1f1bcbac0da8093048d1a48035ba8864f7e59b69f158999ca4
+EBUILD opam-format-2.1.3.ebuild 1235 BLAKE2B 8940cf8c610bc435c7b7ec94e31421f9a288760a6fa89166c64c4bb79b2df8aaba622aedc5fd08e8be6779ad9530917f6bf1e8e19d35090447b2f17c9bc3e626 SHA512 be3d16ad0d9c36f80c5fb674445c139b7ec6838c045e3babb10755a6450bd8a8c3595fd412ee3425061d07e009c70626cb5c1c0f1dd701811791385fd29f67f9
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-format/opam-format-2.1.3.ebuild b/dev-ml/opam-format/opam-format-2.1.3.ebuild
new file mode 100644
index 000000000000..2c8236e84329
--- /dev/null
+++ b/dev-ml/opam-format/opam-format-2.1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+inherit dune
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="test" #sandbox not working
+
+RDEPEND="
+	~dev-ml/opam-core-${PV}:=
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/mccs:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+)"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+	sed -i \
+		-e '/wrap-build-commands/d' \
+		-e '/wrap-install-commands/d' \
+		-e '/wrap-remove-commands/d' \
+		tests/reftests/opamroot-versions.test \
+		|| die
+}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index a605627e3042..a48ef9704805 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -3,7 +3,9 @@ DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c67
 DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B 6bf7a52835512b3de5bcf0de24f5ba3a322f718e6b590902add5ca162e449e40fa3c27cff7b042240441c031303b24cf6b1a100d7f7c3c0cc275d47e60c0bce1 SHA512 05c6bd7e08f131c910871867590a6eb95b488d943ebbb0f93212f2101f09f54dcffd5d6492c9e2edf0485e3ee681815c6353d43ef185bc934fc8afb84d02cf5f
 DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
 DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db SHA512 fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
+DIST opam-full-2.1.3.tar.gz 9618995 BLAKE2B 6f33e70c2e59be87b643840128b46441828d3d83888f5d321ac23d33b2fbc4d3163cb4303ac82a7f863abcc9300227bbc48bca3b8db5d6fbcebf0e6cf8869a5d SHA512 fe3a3c86335830944683a39a34a9eb385037476853ab3e2a82b8571a9e2021830cccf25cbd5bb891d239f6a47584c1b1d91aa445e6e2a814847346c5cc526ff1
 EBUILD opam-installer-2.0.10-r1.ebuild 1198 BLAKE2B 7c41b6c05fb724b68be01bbe277264bcf397e2b35d3c975e0f8ffe51ffa4ab890c280ba6d94c8a4c68016668a96a1a7ed35cd8469ebda3bc5cbe6ec7c36e7739 SHA512 07063e010bfc56662356ef42a6845dbe1ebce11e987eccd0d7ab9fca8bdb56bf9f558862a1e3c1ae2899a69a17f3e0c4f56739cd5c44c9fdef6097f867e20cbd
 EBUILD opam-installer-2.0.9-r1.ebuild 1194 BLAKE2B 7fd57adbf8d1f8d9d9b5bef83fe48a1fe40a844a3cd7f54027dd5d7e70e03ff109120a294b3e1f8c0430bbb9f6ca643be864b4aa2664baee5a4ade261b6333dc SHA512 76fc6ce77d0da8ba6773ad5f4dc21b11c7e655a8dae1c56feb630559a29043ecdca9293da3fdad6dd686675196c2293f94b49ed753a8f5b070036d99a88e88d1
 EBUILD opam-installer-2.1.2-r1.ebuild 1038 BLAKE2B 63f726695b49d87862a4aee6bb91b294791c9ec7f9df0377789cdc30af2410ab0012d36b0f71bbdaaac2ea4383dc87799430ff615496a733b1f3cafea7ec7289 SHA512 ee0d0e933264ad38d88ac99b2f16c3caaf25849fb743baa0eba05a78923bb08cf47d23bd0a7ca28cb6a6b61718ebb71487d64b07bfd3631be058a142012220af
+EBUILD opam-installer-2.1.3.ebuild 1076 BLAKE2B e0b782ba8d03a5b65e435d547f8a13e6efac0bb6597f52098253c930c9957587f82739f0142a90d48dbd4ed11f1c00fc12161ca5bb22190eab2a5705e391185f SHA512 09f99625b632a4f2528292283b4763690d688c9d9a10bffc2e984f21e01366eaa6bfc2f7198020cb280dc9201c5504d303e9ff520e89f33560198fec1b574407
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-installer/opam-installer-2.1.3.ebuild b/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
new file mode 100644
index 000000000000..f50ec263a8d2
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit dune
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test" # sandbox not working
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3:=
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}:=
+	>=dev-ml/dose3-6:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index f0d452f00d9d..b56713b49108 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -3,7 +3,9 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e5797
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
+DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
 EBUILD opam-repository-2.0.10.ebuild 920 BLAKE2B f16372c5ab25659de8cb479fa3544d51aa8c87fda981fcf1c0eb38a1abf2825126684b4802c4d9706ad8beda9385ea7926a01dcc18dcd52d994f4ebe4ecdc177 SHA512 190e442a0e478fa1a1adb4852da314d559665593f0badfe332c14f1c8961a64b50c78ff227560fdb23d44ee10fa23ad70339b30d807cf7f9d2d29c2316c1c56a
 EBUILD opam-repository-2.0.9.ebuild 916 BLAKE2B 17608649a756ac8f0bb0503eab8f612e4465f4cee3d2b26a4edf65d7e5d521931bbc43970944e4ee00c98d526fea360bc35438bc317924fff4cdd66b82cb7e3c SHA512 a4f78eacafa63f350a16b00bd4fcf5b4ba5318541e01f75400c10c262bc6fcd1e4df3156ed2da602142a5230799f8f852b7710f5fd25f734f89e158f6157d163
 EBUILD opam-repository-2.1.2.ebuild 909 BLAKE2B a168662ad969499964910f0b94f2fd98e6db767c27217a8ccf32470e756d285d52136cdc816c053597dfdd3a46f861e036dcce3356b780438c825a309be67cb3 SHA512 9842b22570bec6cc8da2cdaa3c9f9ea92eb169c13d941aa529e97620bc31440ed87578984c831c80d88e004d93ad17357218681cedba9f95a51ddfa9aa200aff
+EBUILD opam-repository-2.1.3.ebuild 914 BLAKE2B 275b4c0b2622ef8840a1fb519f7f47944323ad102350680f647e8cdb673c1745b210476f3afd843a3808aea9fdf026736a8502079d4cf77df2166fb03a88c1d6 SHA512 d08cde264836812ca34276dc51711695ab29a776b9cca021ee627b6d90e5a30edd2c48b16ec1d6fa5f5f16b6ceb99e4f2c9ff064872c6dd40c6c9c88abc9a648
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-repository/opam-repository-2.1.3.ebuild b/dev-ml/opam-repository/opam-repository-2.1.3.ebuild
new file mode 100644
index 000000000000..9fa56fc3a719
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="opam repository libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/re:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index d54f6daf763c..4982a3e9117e 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -3,7 +3,9 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e5797
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
+DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
 EBUILD opam-solver-2.0.10.ebuild 990 BLAKE2B 31e6b97d745a0c81005db8b060cac58ee486980b595af1c5b1fd261c50e320476fb88f0491d225bffe35e3dbc234dd867e893acbfacfcef122f884d79d348a8a SHA512 6f72578cf7c96f77d1aba64ab477f588c5795b9732dc93c1845906805a2245e74b47d22b9da4122dfce8243e5a40d648b4c2b57d95a679ecbafdd6b9b821c69c
 EBUILD opam-solver-2.0.9.ebuild 986 BLAKE2B 57c598370564e05ec39ba314a2f8254e7d884fde07460c9e00053424ae8e20096e1c802757463b0c9453945fc26fa783647ad2f67d5b68a48a1c83912f382a33 SHA512 da509b77f479f4eb06364e0408595eb4555f1aaa5519ef72d0fcf656493a725cbb683a4eb4e8777ccd88cc138521e2b03e87b17aca678a8746ce6dbcfd5ffff6
 EBUILD opam-solver-2.1.2.ebuild 979 BLAKE2B 14be2073691add350e7d4e9a2c2d00ccf4d533efeeb55bc5d98cf3f1f634efd450db9971a2ee26db2d50262d217a89f4def4162538b5367335ab17c5ee2ab102 SHA512 0b8ff4b9a509c8d6f7d7be1bcaceed8d7490b8437b9b082c59dc4e4165bbbaa5baeed86b2ab72f87bfa126e833d044a0607401b6e2080e7395e80836957dcf49
+EBUILD opam-solver-2.1.3.ebuild 995 BLAKE2B 1dcae2046c05485c35c209f8c15df90d106a49c5228aba77b2b6191f46d8ba60ae1ebd82d0eb1f794a0cf81fafe9d0ef174733a4a3ed1f138f92a25efa2a6553 SHA512 731e99007dc4636807eb46b5f3475d3a2e9dd0e9624e7dd72435cd86dfd27f87afcd21a670108e31093a21d169939a4397cf7864b23cef1a5e0e119cfff1c620
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-solver/opam-solver-2.1.3.ebuild b/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
new file mode 100644
index 000000000000..7a95cf1d6938
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="test" # sandbox not working
+
+RDEPEND="
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
+	>=dev-ml/mccs-1.1.4:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/opam-client )"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index 7b31ef4520f7..03bfd7d57108 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -3,7 +3,9 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e5797
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
+DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
 EBUILD opam-state-2.0.10.ebuild 897 BLAKE2B 5cc85d01060e6720fab0278ea125dfe52c80e2e921cdb76ed96e735ba45d4c0909547157a268e0d68b268bf038fa4b7237466bb846998390546bcf500d940c9a SHA512 54dd552a522d11046cabd78b61b41a9ad8eab44ad0432463bcafd42516df3feda88fce726403f7dc7506dbc7e48b49c54b29e30be01f884f7cacb4bd2b58cdea
 EBUILD opam-state-2.0.9.ebuild 893 BLAKE2B 8e1760f7eea15b611247e19cb438fbc411333402ffb6c28d2be301b7e5aa2befb3b45853ea556c30554fa1da8f6657c489ed0d818abb03dd8d8715f637599090 SHA512 717ec35c51b7298f8a6520a68cd46e4c74da1d5a2743a904fba5778fa4e8e77f38aae86424a84bb9b5cd5e5d6f72c44430c561557829bcf4972179b486989363
 EBUILD opam-state-2.1.2.ebuild 886 BLAKE2B edc9fdb776256415d9735e06296bf57bdebd3217ddfd8d229fbb9905dc4714371ecd220c879558e34ca73b6d20f78265d071f461825a0567e7a8e6ddd4b67a9e SHA512 795325ec954ec0e7227923e6839a7bc156a3b6380bb5e39d84956ddaa16e63952b025726e99e55bfe1d03166ef841b11e7fc135c92e2f11bdeb769549618f591
+EBUILD opam-state-2.1.3.ebuild 891 BLAKE2B 5a4ccd4b089b7951ded851347e31af05256bd432b13bf0ac90759a242a474703f5759ddc989941a70e0e128e9b64a9b1f51be4ff10af3cc0b5f3b165a9c9b9b5 SHA512 762570056caec79511c6061cfab6ef662881a5052f998e292d2237806007644761e4acbc424e6377cdbeec74b0bb7c8ad8379e736070568bc4aa0033daf21825
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-state/opam-state-2.1.3.ebuild b/dev-ml/opam-state/opam-state-2.1.3.ebuild
new file mode 100644
index 000000000000..eb10369fb102
--- /dev/null
+++ b/dev-ml/opam-state/opam-state-2.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="opam state libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	~dev-ml/opam-repository-${PV}:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 49e507fef5e6..530540d8b852 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -3,7 +3,9 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e5797
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
+DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
 EBUILD opam-2.0.10-r1.ebuild 983 BLAKE2B 909493ae54bf1b3f61ced15485fe8d4adfb38332c67e69a885ea29afda09678c8d24545773ea4387417873de8e5160bfebc2cc7141c55c98011287934177936b SHA512 486a7b630af59d30e165569bcad18ea4f4b5c0d3a3031888e07a7dab6da2a2a28a06260335f715cbdd388c5922cabb0ea0b6ee8c6b0b0d31ebacc75a4d71448c
 EBUILD opam-2.0.9.ebuild 979 BLAKE2B 2b1958809b66044de2df0ab0756e6ef99894a41a6f5228a7a176b38668b4fe0a039b25b3de9ddc9c9cce60b6f152cb5c90f340f2437d1a01b8e668a8c61fdbbf SHA512 77e418c673875c912f4551bf510f538079100f6840332e675847ec7cec2bac28667e1366ab3ac0a46a314376072fd3cec74e218ef2d626e0d2623acabd2c5026
 EBUILD opam-2.1.2-r1.ebuild 1005 BLAKE2B a38a88b5c6d78f214e0abc150da2e7d8f122860cef46355c38379ce2a286cef44eae88b4f33beee0c4ff07e58f123b25c5031d27af0e05054c08087c0ed01bea SHA512 8e3dfc0c0869528d82e5477ce8b9af33c06c63266f96306fc4c04d6ca5e19e30fa19456e015e8c7cd926eb7baf314c6bf61596f0b850172191424f90cc71eb54
+EBUILD opam-2.1.3.ebuild 1010 BLAKE2B cfec5e4fa9444f0445130f5959e4bcccc829bf6bad12f201aca9686699f6519de8f915a492894b5acb868e151e8defe76ab3aec0f48aa2d8a33347e974ebaa1f SHA512 94257683ae593d54b30c4d076a4df91f55afe02056c7a928b8528075470ef4f437babd10f474fe8fe57c9addfc2b45ef909fd9fd80dddcef0e5151bd04787634
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam/opam-2.1.3.ebuild b/dev-ml/opam/opam-2.1.3.ebuild
new file mode 100644
index 000000000000..d937414f4775
--- /dev/null
+++ b/dev-ml/opam/opam-2.1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test" #see bugs 838658
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	dev-ml/cudf:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/extlib:=
+	~dev-ml/opam-client-${PV}:=
+	dev-ml/opam-file-format:=
+	sys-apps/bubblewrap
+	dev-ml/re:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+src_prepare() {
+	default
+
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}