gentoo resync : 08.10.2021

4 files changed, 47 insertions, 3 deletions

diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index 49b213df377f..92dc96ecbaa1 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -1,7 +1,10 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
-EBUILD opam-client-2.0.8-r1.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
-EBUILD opam-client-2.0.8.ebuild 798 BLAKE2B 4ee97d0154b58106d99c2a298dd52d254e13e18dd7104d8f4222cf2d7e3397036c22aa03b23b529a42712b6a5eb099eed7d9f4d9d444046f0c22cfbc82efd0d1 SHA512 e5f5a45fe8cd9b85e2369fee75760049ec06b2aaa712deae2952fada604efe462fa4c2135382f98249a19f716f51cf5116d828fd2b0d2783898df3f635590fb7
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
+DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
+EBUILD opam-client-2.0.8-r1.ebuild 954 BLAKE2B 4d721cbecd897c0c8f6cea1868c783b543184f2e5f339e6900f9d4a99fe87e1bab120ecf40d4f3656d29dd8412cc15e95f472f478f962efaed77d72e03860ded SHA512 f5311b956917468aba3dbb84b7ce736c6f2a6fc84da1d6f31da99a481c41456e143cbe6bbe7ab7727ab01a4bdd60344efe51aaa37f613943ed3006b225f4061f
+EBUILD opam-client-2.0.8.ebuild 820 BLAKE2B 7c899f93e3c1f5f52ea56506976ae5deeed672887983777c67624e5caf535aff241bb1e1615e4545cd5e2c194a92b7dc8348d4530ec2a0233836f3a4cb4913b3 SHA512 e7d1d9b430710f102c8b7df90befc6cbc915e8b92b8702f03d2903a6944e3c6eeb85288169add272bca90df197ecac0a856080fd1323e644d135e45a824ce370
 EBUILD opam-client-2.0.9.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
+EBUILD opam-client-2.1.0.ebuild 945 BLAKE2B e8932dd197dfd2ef3122a879898610f38c39417ed60bc23d54a65fdc013229056da482bdca95f11cbb7d3366e45b654edc5c91f203e10a72602e75b3a1341ea2 SHA512 8ef8778daaccdc3311caaca0602318292d6e02acb587b8d538f0b8c1349addb5c1a1ab6088a9442f6700102c284c998965503ce60219f07d7261aa7fec6b7b38
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
index 4b52fb7e1ef9..03972111ac0f 100644
--- a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-client/opam-client-2.0.8.ebuild b/dev-ml/opam-client/opam-client-2.0.8.ebuild
index cb9b0a4fcf42..3a2775f3db09 100644
--- a/dev-ml/opam-client/opam-client-2.0.8.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	dev-ml/cmdliner:=
 	~dev-ml/opam-repository-${PV}:=
 	~dev-ml/opam-state-${PV}:=
diff --git a/dev-ml/opam-client/opam-client-2.1.0.ebuild b/dev-ml/opam-client/opam-client-2.1.0.ebuild
new file mode 100644
index 000000000000..b03d1b117962
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~x86"
+IUSE="+ocamlopt"
+
+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}"
+
+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
+}