gentoo resync : 02.02.2022

3 files changed, 46 insertions, 2 deletions

diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index 49d3f36d449a..4045caf6c2ce 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -5,10 +5,12 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 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
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
+DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 EBUILD opam-client-2.0.10.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
 EBUILD opam-client-2.0.8-r1.ebuild 1025 BLAKE2B c39e02346e5c4384c2133532304f42c5fc8612522c82c5949707e76ae6fc76dcbe048625279086565022198cd64aa6ba2501a81da76eca2721215a24f42936bd SHA512 df0dea8f6648c064ac35704edf9852613eb15dcab11f4f665b5f34ac0a8d323642f49305fea515d4dfd6907436c7f5ab9b95dc73938ca1c6dc718df96a70cbca
 EBUILD opam-client-2.0.8.ebuild 892 BLAKE2B bacff86941659742837fd933560dc746643a11093dc1dfa26dc3e487daa723159e4e4a6beab91304541d1b6551644aed3686664ae39c8ea308890dc0fe3bab78 SHA512 599a5818166b215fc8acb0856ef79e335cf6a350d762b2ad5fb43ebf51e83d338ab4b78e2b1444906ffed16c0ee55a56fdb5734f3d3edc736691e58235f7a6a6
-EBUILD opam-client-2.0.9.ebuild 1026 BLAKE2B 9ce3f8ae2b0311a4fb8719126b06befc51cf76892614b5704b6d6ca73894a9e594f287f9b93d55e2ca706efba5805943c5a014494e4045250e8b21c5a6f7108b SHA512 33edf608bebbad13f76acb70be072f8ee386b85e860819f8cbdffd2067010045156c90fd5043e95c78aeb31b39a8405390819b678715083a77fc3facb82d6199
+EBUILD opam-client-2.0.9.ebuild 1025 BLAKE2B c39e02346e5c4384c2133532304f42c5fc8612522c82c5949707e76ae6fc76dcbe048625279086565022198cd64aa6ba2501a81da76eca2721215a24f42936bd SHA512 df0dea8f6648c064ac35704edf9852613eb15dcab11f4f665b5f34ac0a8d323642f49305fea515d4dfd6907436c7f5ab9b95dc73938ca1c6dc718df96a70cbca
 EBUILD opam-client-2.1.0.ebuild 1017 BLAKE2B 5bdf29c53f616cd61f05ae492292b769e32410f3958801ff3999dda29a78e6a37d23c9295af22166fd6d75058bebb9756e17904b17e83b52b698c491a6fbd8ab SHA512 e4218a25b093bdd7ef05eb69365ec852ddde889734c322df39c53b9c84392539c90b97dad5efbc56dd637f12fe821d3b7a66bcbec5a7c356598936eef15f8fb7
 EBUILD opam-client-2.1.1.ebuild 1017 BLAKE2B 5bdf29c53f616cd61f05ae492292b769e32410f3958801ff3999dda29a78e6a37d23c9295af22166fd6d75058bebb9756e17904b17e83b52b698c491a6fbd8ab SHA512 e4218a25b093bdd7ef05eb69365ec852ddde889734c322df39c53b9c84392539c90b97dad5efbc56dd637f12fe821d3b7a66bcbec5a7c356598936eef15f8fb7
+EBUILD opam-client-2.1.2.ebuild 1017 BLAKE2B 5bdf29c53f616cd61f05ae492292b769e32410f3958801ff3999dda29a78e6a37d23c9295af22166fd6d75058bebb9756e17904b17e83b52b698c491a6fbd8ab SHA512 e4218a25b093bdd7ef05eb69365ec852ddde889734c322df39c53b9c84392539c90b97dad5efbc56dd637f12fe821d3b7a66bcbec5a7c356598936eef15f8fb7
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-client/opam-client-2.0.9.ebuild b/dev-ml/opam-client/opam-client-2.0.9.ebuild
index 78a0dd5cda78..512c9e00182b 100644
--- a/dev-ml/opam-client/opam-client-2.0.9.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.9.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 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-client/opam-client-2.1.2.ebuild b/dev-ml/opam-client/opam-client-2.1.2.ebuild
new file mode 100644
index 000000000000..e27961dead03
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.1.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 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 test"
+RESTRICT="!test? ( test )"
+
+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
+}