gentoo resync : 02.02.2022

3 files changed, 57 insertions, 2 deletions

diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index b121bdcb1284..9cc131bc884d 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/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-format-2.0.10.ebuild 1070 BLAKE2B 776112648930bfe3aef94f0d9a21229797d0493a22ab8872cfc34767e7e50fc17445498c3f587d866eed41ebbbaa71a067bed56c854968bfa1c6bf588abedd96 SHA512 acd72a194f3183f5b0396b6324ce3a892f222ed3f282f8b38392eca2c6d3c63bda14e65ac9578b01432c1ed8279a8619bbbbc1f63ef4fc9446ca5b060718db50
 EBUILD opam-format-2.0.8-r2.ebuild 925 BLAKE2B c436e2a97dedfc183dbf7811b29a6b959a5d9a1e42f7d4cb753e24c3d43bbb1b8730509801103136248fec02ba76ce8bb86d612da6360c7f8d841d4a295cc5d8 SHA512 8170e23cd46a1c7cc1a61d07920c62f60e566d306865b62a09f171c830dde541ae3b9671457603e8c24bdbc58b9bb45ad8b8ba762aeea47c9a3ddf8dcb4d4ff4
 EBUILD opam-format-2.0.8-r3.ebuild 1064 BLAKE2B 01eb973cac448932c60293fae53445365803ca7b5005a9c2691f22c0300ed5ae36268f2628517b17bbc1de0638602eeb75ba1ec11ffa2d57af224fe3fbb97c02 SHA512 d42e9e8690af3c403d4b962e418414fcc872f9a468f2d5ebaabff96570c95421bce058375adf0914a6e626557b826f91feed8b474b0ef59b9e762a0ff348a559
-EBUILD opam-format-2.0.9.ebuild 1065 BLAKE2B 8b9bd1d140fa3674c1f119a04f3747882a0e316dc9143bc30209d17ee2f460ff25b3c4ec7a090acec769fa9a697804523a023c58a939add15797b4f1d45417a6 SHA512 e3d9d5c0a129924fbab9bf29af6eac11caf0acc5cab110fa65c983930e898909e379bd58bd645b4bb6a525cb2fff7767224d8fdd642d79cd786545b405412a17
+EBUILD opam-format-2.0.9.ebuild 1064 BLAKE2B 01eb973cac448932c60293fae53445365803ca7b5005a9c2691f22c0300ed5ae36268f2628517b17bbc1de0638602eeb75ba1ec11ffa2d57af224fe3fbb97c02 SHA512 d42e9e8690af3c403d4b962e418414fcc872f9a468f2d5ebaabff96570c95421bce058375adf0914a6e626557b826f91feed8b474b0ef59b9e762a0ff348a559
 EBUILD opam-format-2.1.0.ebuild 1216 BLAKE2B 0e755181807e1baf84eec4417116a966c337f8604ba97387c85685abdd1c228f2618f726e82f6270620fc3d04271b3a0ca12d86b3adbed53e83b738963f9f640 SHA512 229d65c3d644d0d91a9d61b87cee0191e71d474412ee7ab9b5864391a6fd8f5c3eb3bd8c9a75013535647cd7c6fa21e361ebc3af189c8a68dcad24e5e8e1603c
 EBUILD opam-format-2.1.1.ebuild 1216 BLAKE2B 0e755181807e1baf84eec4417116a966c337f8604ba97387c85685abdd1c228f2618f726e82f6270620fc3d04271b3a0ca12d86b3adbed53e83b738963f9f640 SHA512 229d65c3d644d0d91a9d61b87cee0191e71d474412ee7ab9b5864391a6fd8f5c3eb3bd8c9a75013535647cd7c6fa21e361ebc3af189c8a68dcad24e5e8e1603c
+EBUILD opam-format-2.1.2.ebuild 1216 BLAKE2B 0e755181807e1baf84eec4417116a966c337f8604ba97387c85685abdd1c228f2618f726e82f6270620fc3d04271b3a0ca12d86b3adbed53e83b738963f9f640 SHA512 229d65c3d644d0d91a9d61b87cee0191e71d474412ee7ab9b5864391a6fd8f5c3eb3bd8c9a75013535647cd7c6fa21e361ebc3af189c8a68dcad24e5e8e1603c
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild
index db8f781018d3..6de06692f9c1 100644
--- a/dev-ml/opam-format/opam-format-2.0.9.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 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-format/opam-format-2.1.2.ebuild b/dev-ml/opam-format/opam-format-2.1.2.ebuild
new file mode 100644
index 000000000000..4c2a08d6886d
--- /dev/null
+++ b/dev-ml/opam-format/opam-format-2.1.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~dev-ml/opam-core-${PV}:=
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	>=dev-ml/dose3-6.0:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+BDEPEND="test? (
+	sys-apps/bubblewrap
+	dev-ml/mccs
+)"
+
+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
+}