gentoo auto-resync : 28:11:2024 - 02:00:16

5 files changed, 59 insertions, 2 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 0b348d8d684e..575f443cd7f0 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/ocaml_intrinsics/Manifest b/dev-ml/ocaml_intrinsics/Manifest
index 5837c0f85b20..3b176a6e90d1 100644
--- a/dev-ml/ocaml_intrinsics/Manifest
+++ b/dev-ml/ocaml_intrinsics/Manifest
@@ -6,4 +6,4 @@ EBUILD ocaml_intrinsics-0.15.1.ebuild 515 BLAKE2B 3d7d3bd127410d1f55bfa9f1e48a24
 EBUILD ocaml_intrinsics-0.15.2.ebuild 544 BLAKE2B 07dabc481cfc9fd3b367b7763d0fbb2a5d990d30cd9c89adf5bfa208de9f599ef516fcd5d582627dfbc2cde2a49f5e3ff35b843553441ca39dc08cee7a539f0a SHA512 7562bdd9f302706d466f143e7ec2847cb35c8694bad1f4488204e61d3fee4c368d2de17300fa8e35439bad13f35bbc0090d38c58a0a14b009920555eeacf5d33
 EBUILD ocaml_intrinsics-0.16.0.ebuild 544 BLAKE2B 1e383ffc5eb5b60c6a47193be2c533bd8ed565b8e710bcb12b8fb00744fd41c3bf5efe59b880564a9c51b8a42a28c0d17e1372d454adaa0c1f8e035b16b8e996 SHA512 8a8e17efa9992a84004c052be8053358cae679f60ac01fc1718a83e992007c4c139d5dcbb974c76e69e9776c76988ada703e49cbb9124e5b8d2f2763a1171567
 EBUILD ocaml_intrinsics-0.17.0.ebuild 632 BLAKE2B 0f7f01897d55f9e6c12d02d729998675616014afb19903987f52e27665fd09fdc0f4613d12cab339a207a882231c727a8b4ab198b6f351e39aa1853b731abfaf SHA512 8142b249d4181743ff9c57d7fcc3ff08c0c1cf1a9d6f3440e29ff299b88ccc1e48f2eb310dea041865bbe3598a077281a71716c05fbec5fcf3aef7fd9080144c
-MISC metadata.xml 326 BLAKE2B 737c6608b5b4282d53fb3e866199fbb672076c968f849b0f5b9a5da732c6db556b7b5f597e5d90e53a2a607cf02e7cbc01a5453e6e483721b47e2451cbe1285d SHA512 be860a17f734273b190dca122353092b24fbd0c37dfcf4121c28171227a412b29c92d063a21e6d767f4679bb3d92ac800fb621fec82f8d2fc45856252c19f5db
+MISC metadata.xml 325 BLAKE2B f9df26a1a280da42cabc9eafa921263b9d5fa73c5a236eea05563ec1f50ecb9dcd268db7e671d717834835eb9639e48c92419fca58b44bf168cf7a5f8cf2a6b3 SHA512 c7a4155f074479154b963a9589ee93627e9074a3252ef890764c9c2234ca06ec8acb33b0a66b4e80bace7b98d77978875358dd4f885711ea37a999eaf94a5815
diff --git a/dev-ml/ocaml_intrinsics/metadata.xml b/dev-ml/ocaml_intrinsics/metadata.xml
index fec13523d489..7d7dd19a84d5 100644
--- a/dev-ml/ocaml_intrinsics/metadata.xml
+++ b/dev-ml/ocaml_intrinsics/metadata.xml
@@ -6,6 +6,6 @@
 		<name>ML</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">janestreet/ocaml_instrinsics</remote-id>
+		<remote-id type="github">janestreet/ocaml_intrinsics</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 00d6a58a9828..8f72acdb48fd 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,3 +1,5 @@
 DIST opam-2.1.6.tar.gz 837526 BLAKE2B 1ee60691f4fcc1011f461505942f00ff5f5cc0f0bbfc97edb8e4c676d1e4cd28fed8b49ef341af51a750848be3110713cc97e93a9e63999e4b92e7c7f68d743e SHA512 f75d81b4eb19ef6603e7a2a18e1a281ea6f5eea47b820ae888593102db5b98ded5b593b176e70235611b63a07f4a406a57fe016386f4e921f51b55eb62b9864d
+DIST opam-2.2.1.tar.gz 1089671 BLAKE2B cd6a97c8c19d7866205b49f95bf4215d986b3ad8b5d1fe5c5fd52db9b8b9e0cff8559d478e18d99d89816bbf830910f182e4c1e80719ac29a3cd5c8299450a21 SHA512 17d7d83b9de118332c121b9d3aa2e48f62a6270ea23e730a536b0f4ff060df85238c7c4ab53a89bcc3b3193d52d14358831bd9bed30a4ac699e44e4c3003b8b0
 EBUILD opam-2.1.6.ebuild 1247 BLAKE2B b357646bc33c2203de2c7e5d37ae270a510e28837ec5b470da9ff6d2446a56f4a3cb43bf9f2d52df2c31cf7c87898e3f6dd75b4c6b1c9e4369d55c3376cc9f53 SHA512 1bdb058cb0747fa320b1d258125e5d4f2fee53f4e1512ec36ad97df3bd3507268b12520f65ba66b2069ec92527bd0c28da6e8741da19b12a1d53cf4ccc6d051e
+EBUILD opam-2.2.1.ebuild 1356 BLAKE2B 903e59a090461da0ab378927d0e459c89ab892eda34a41deed9872334e27e05a610956084b9c4d6a37ce99c906e3cf91f067803db18b4d712d8785c05a271f76 SHA512 518c179cfe1f7f661779ec920b545109e088ddfe0950283027b7acf4358b739f7fb5d29b331256c68ed69cd8291bbab37c21cbcdcb9cd8aa31d827c51f5e9ad9
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam/opam-2.2.1.ebuild b/dev-ml/opam/opam-2.2.1.ebuild
new file mode 100644
index 000000000000..41dc7badc426
--- /dev/null
+++ b/dev-ml/opam/opam-2.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DUNE_PKG_NAME="opam"
+inherit dune
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test" #see bugs 838658
+
+RDEPEND="
+	dev-ml/0install:=[ocamlopt?]
+	dev-ml/cmdliner:=[ocamlopt?]
+	dev-ml/cudf:=[ocamlopt?]
+	dev-ml/dose3:=[ocamlopt?]
+	dev-ml/extlib:=[ocamlopt?]
+	dev-ml/jsonm:=[ocamlopt?]
+	dev-ml/ocaml-base64:=[ocamlopt?]
+	dev-ml/ocamlgraph:=[ocamlopt?]
+	dev-ml/ocaml-sha:=[ocamlopt?]
+	dev-ml/opam-0install-cudf:=[ocamlopt?]
+	dev-ml/opam-common:=[ocamlopt?]
+	dev-ml/opam-file-format:=[ocamlopt?]
+	dev-ml/re:=[ocamlopt?]
+	dev-ml/spdx_licenses:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	dev-ml/swhid_core:=[ocamlopt?]
+	dev-ml/uchar:=[ocamlopt?]
+	dev-ml/uutf:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ml/findlib"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune-compile opam-solver opam-repository opam-state opam-client ${DUNE_PKG_NAME}
+}
+
+src_install() {
+	dune_src_install
+	mv "${ED}"/usr/share/doc/${PF}/${PN}/* \
+		"${ED}"/usr/share/doc/${PF} || die
+}