gentoo resync : 02.02.2022

3 files changed, 50 insertions, 2 deletions

diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index 1d427acbedca..d8cee9e6e559 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -4,9 +4,11 @@ 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-core-2.0.10.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 EBUILD opam-core-2.0.8-r1.ebuild 880 BLAKE2B 4cdae8b13b22234fc9628ba3816a5382940201bb6a416766dc0ed1bc096f79fa5ed3d4601547eb83a9655c183a5aa52703e5dc6b068558e0ab83492782c95f6a SHA512 9097d88ac2615449b25a39dde43ae0b61b67bada0f14b2e51071dee777e23b81c7db2872e814e06f44a625bc1d9dcbff27edac87b002f3496ce996dba37696a1
-EBUILD opam-core-2.0.9.ebuild 881 BLAKE2B 0fe3164b27a2ae0644bf5ee6c5a070fb1aa5fca64e25a4beea84c8ba34d69a5bef88b8cca9ec694e757f9b0ff6add76c6b1c16e772221f46d08ae7f29deefb34 SHA512 9e4bd6c3d1dca27b8c0f7781aae2fcdc42f44d3a5929b53f203f61dbebbe1d6c69af00601e816f025211172a67429adaa707d4b22110f907d4c8521f5c9c87c6
+EBUILD opam-core-2.0.9.ebuild 880 BLAKE2B 5f95e2b81a7c1738d4f5688efa9265bfc90816e5049642189bb4ca1a82a3dcc04f14967e5898cb0ebe60c4bd24b0ef7ec8163b1b12b43d1bdc6864eba06f2660 SHA512 522fa9c995195519485ef221b0162d5cee3fd8369920b27a2defaf155d4ee0b62b32618d4cad27e0b6a15980f98d8aa20b3fbdaef11dbca9a588d7fb0bd09b6b
 EBUILD opam-core-2.1.0.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 EBUILD opam-core-2.1.1.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
+EBUILD opam-core-2.1.2.ebuild 1008 BLAKE2B 71d30ed265d22b841c98e11b2d17fdc0dda769fb8ab0d5ed69113a4349ca3b7b0d87be78a876a93e970b18c37907f4ba7e2be63c705180b075ec0e2eba475fe4 SHA512 2c8c7c349d401b445aa16742743392a7bc3c3dfad9cfbfb14749746503c7bca1af8e9b39aa6bc04481a7be0e1a2f3164b4b9578582e8a6ac6a3f8ec1261fbd1a
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-core/opam-core-2.0.9.ebuild b/dev-ml/opam-core/opam-core-2.0.9.ebuild
index 1300667af70c..d53f98010bec 100644
--- a/dev-ml/opam-core/opam-core-2.0.9.ebuild
+++ b/dev-ml/opam-core/opam-core-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"
 
 RDEPEND="
 	dev-ml/ocamlgraph:=
diff --git a/dev-ml/opam-core/opam-core-2.1.2.ebuild b/dev-ml/opam-core/opam-core-2.1.2.ebuild
new file mode 100644
index 000000000000..fb6df20a60b1
--- /dev/null
+++ b/dev-ml/opam-core/opam-core-2.1.2.ebuild
@@ -0,0 +1,46 @@
+# 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 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 ~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
+}