Merge updates from master

6 files changed, 84 insertions, 47 deletions

diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index 2544ddadcd36..d1d1ef4c062e 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -3,5 +3,4 @@ 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.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.4.tar.gz 833495 BLAKE2B 1969546d9cba34d33bdff221e7de0d974380c238a7b8671159c06ae55081e0ab0019d7dc27e9fefc908efc58a2f39f3b28ed11b68827743345ba721a2123ef5b SHA512 276fdbe4e114a0d23b9d4b7938d87bf39c06b4716fae601588da7d5d2d5d9b5c584855d96edfed2eb5ac8a36ee9431c4ea7d281c52acdab28b9a3bdcbf10ce57
 DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
diff --git a/dev-ml/opam-core/opam-core-2.1.4.ebuild b/dev-ml/opam-core/opam-core-2.1.4.ebuild
deleted file mode 100644
index 0d41c1a9eb72..000000000000
--- a/dev-ml/opam-core/opam-core-2.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-ml/ocamlgraph:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/cmdliner:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9)))
-		 (release
-		  (flags (:standard -warn-error -3-9))))
-	EOF
-
-	# HACK: Probably bug in Makefile? Magic. See: https://bugs.gentoo.org/933845
-	touch opam-installer.install || die
-}
-
-src_compile() {
-	emake -j1 opam-installer
-	emake -j1 ${PN}.install
-}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 4f87075e8b29..a004a07b0e44 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -3,3 +3,4 @@ DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B 6bf7a52835512b3de5bcf0de24f5ba3a322
 DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
 DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db SHA512 fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
 DIST opam-full-2.1.3.tar.gz 9618995 BLAKE2B 6f33e70c2e59be87b643840128b46441828d3d83888f5d321ac23d33b2fbc4d3163cb4303ac82a7f863abcc9300227bbc48bca3b8db5d6fbcebf0e6cf8869a5d SHA512 fe3a3c86335830944683a39a34a9eb385037476853ab3e2a82b8571a9e2021830cccf25cbd5bb891d239f6a47584c1b1d91aa445e6e2a814847346c5cc526ff1
+DIST opam-full-2.1.5.tar.gz 10801367 BLAKE2B 5e6b1140e279931dfb61f68d0c4888cb14d05ff610e2b151115efe6b6420d74e7079894b6f4360f377b155008530ba4ace9708bc9d1e1d8c13950c0a5be4de11 SHA512 e4e33fcee0a9f922f8b43c6b095554a946559a2c50341326d21cca0f24fc7105c0de01db204b408240b12b267c9929435e2c511adf140618c91873f10444ae90
diff --git a/dev-ml/opam-installer/opam-installer-2.1.5.ebuild b/dev-ml/opam-installer/opam-installer-2.1.5.ebuild
new file mode 100644
index 000000000000..58de5666dc7c
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.1.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit dune
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test" # sandbox not working
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3:=
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}:=
+	>=dev-ml/dose3-6:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+	dune-compile ${PN}
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index 13cb1b80d395..d1d1ef4c062e 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -3,3 +3,4 @@ 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.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
+DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
diff --git a/dev-ml/opam-repository/opam-repository-2.1.5.ebuild b/dev-ml/opam-repository/opam-repository-2.1.5.ebuild
new file mode 100644
index 000000000000..ac92c2b7ab83
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.1.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	~dev-ml/opam-format-${PV}:=[ocamlopt?]
+	dev-ml/re:=[ocamlopt?]
+	dev-ml/dose3:=[ocamlopt?]
+	dev-ml/opam-file-format:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+
+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
+}
+
+src_compile() {
+	dune-compile ${PN}
+}