gentoo resync : 02.02.2022

3 files changed, 43 insertions, 2 deletions

diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index af0edf7fefa6..492b1376dc54 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/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-repository-2.0.10.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
 EBUILD opam-repository-2.0.8-r1.ebuild 915 BLAKE2B d4be9123a2e53a35e33d698fc8ba3b15b609609065515607170aa8f4a2c245cf6d83006e533b914165c65991618fddeb37c822b49516cdef9261dbcf6a692d09 SHA512 f861fa6d9bf66a8d393ecb9cd39fd81b65b3b0ba051c26e4863e1fea4563a403a605f171eb14d6b1bc1b4c83c6bf5726f05b189f5bf83391b3da26fcf4b513e7
 EBUILD opam-repository-2.0.8.ebuild 776 BLAKE2B 4d63d9ee36f06e82b59510c92c3d5923a17ecb9626427681358d340780e98e1490b1e87366120f9c5429f75a1943aa47aeffbed9a50abed72cd3e76fe12c816a SHA512 1bbfe111bc3e9682205f549dcb7b298ccebd92e268ebb585aa68f98255b87b01ac2aa25535e04d0220b16fd6955dfdfa1d4fc0f17d9a60ab361348e92942a7b6
-EBUILD opam-repository-2.0.9.ebuild 916 BLAKE2B ad81efd107547afd9e6555322b4531c0b1bba19fb04c3f9a467a371c241faa42aaf0b6ec0c80dc3510b50dbb53d6cfa66875423709ea97f06bb43dd7db7d1121 SHA512 da8014aed15e002626990538e6122cdfa41982b03ae7333ececb841ae93a4e2ccbadb25254ac0fc24b1517aa414f17b9e7ea9fb9b8d140dc44e9044fe7155d0a
+EBUILD opam-repository-2.0.9.ebuild 915 BLAKE2B 10ade40fe38b6521791b12dddcb90ecaecae291434044426a920bdf3eaaa2587f985d37c026be937dbd782f4159d80e70206390d3d8d39547abb1e1767dbcebe SHA512 320aee094d0e04390707b84bc7a56687d0ec7d4d03fc63b8fcaaf2a4719ba8cb0de2e64028f8ff28fdd65c712dfb95f43df05bf279d57fefbd503649e1d22434
 EBUILD opam-repository-2.1.0.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
 EBUILD opam-repository-2.1.1.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
+EBUILD opam-repository-2.1.2.ebuild 907 BLAKE2B 7f5f3540bc327c97ba26bf3c98d6426eb399733b64843ef08ae7a3b0aa2a493e3feca15ed23ca2d6810124ef26541e58daa082af0ab03835415de6581e291f82 SHA512 2becb305b4f917d94e20e556a6ed26f8ee0b7193559de9c8fcf25c8a59cc80edfe10b83c0774821d942c46ed347b319e45ad18ee8b98aa0c4f413d9d0fdb6d9b
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
index 0b9bf91626f0..d9288d80034f 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
+++ b/dev-ml/opam-repository/opam-repository-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"
 RESTRICT="test"
 
diff --git a/dev-ml/opam-repository/opam-repository-2.1.2.ebuild b/dev-ml/opam-repository/opam-repository-2.1.2.ebuild
new file mode 100644
index 000000000000..0aad5fc5074b
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~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
+}