gentoo auto-resync : 15:10:2024 - 04:04:09

6 files changed, 60 insertions, 86 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 770bfab56697..3c04ac9c7a5a 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 1c1ab2be478b..9354bda2fb66 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -5,10 +5,12 @@ DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c55
 DIST camlp4-4.12.tar.gz 650428 BLAKE2B 4957d3db73ec82fbac58dd95fa13c48f9f8480a70cd6bded43a00df0a182f9b9e31a43acef8264f9d940776667d10b0a5c46bded59ebf4a645719264628428fc SHA512 0a19bb596e47076a28a6bea62007f1d3b59c4d688075f6b723abaa205c555707feb4ea0624259994a4ba5251fdea9dc61cdc936dc13611b36937e755a4bc9b7b
 DIST camlp4-4.13.tar.gz 650642 BLAKE2B 5bf70b21f47eefe4631227d0d30fdd08ab965020026d0183fc94b9dbfd1eee45626afbe62bf9507b1a887217cf9245901d40f25cce9430155eb9ec1ddc577554 SHA512 d3307bd11b813540d126719c0afe7e75a7740d0851b272be9bd1a28e8b1ab1ed9a7576109000c8d6cee7ece7f777122aa83917a48147d42ed8f4d72994397819
 DIST camlp4-4.14_p1.tar.gz 641790 BLAKE2B 3e1054a924956e9c23d43fb4ef00cf99fe09f6d2a5eb4216cb3d5079a439159d36703b6ae268789d73e51e87ed0329531b25c2e846df03c4ae99b1a6403b84c3 SHA512 1853ae0465a1366cf73d7aa9de56c037ef3d4bb5b341fe3eeb39677b5b08bda44316634b93d5d35d917a98dff8eb40da974937f714ab609818e7d25f716de811
+DIST camlp4-5.2_p1.tar.gz 653548 BLAKE2B 27002802bbf0d0a67d5c2c967fa54d72087c9b08020d290ec081545ef4d4c7bea794ab8ea74608d63ed4a51b58fe44a1ac921d4de9f66f754a7b3d931e5ed818 SHA512 7034cf32575b6a7dc0406fea3c354068598195aa84a75e8576ea1219c38e4bffdc048c936d440bab235aea76510972a174bffba13f4f94f531b80fb4d80ca4ad
 EBUILD camlp4-4.09_p1-r2.ebuild 1076 BLAKE2B 306e17e1e17969944c7404dd7fead2dd2a87ec9efcef9cd97cbe0d6e5f51168b07116f1eaa907676f35fda091bfa4249f503fc0d82c8d7a11af59972a29ac0da SHA512 8a6ec11e24d02d2c7deb5003f759fee41b2c807d6ea11fac1e66a650a90652df23b6a2e579c103b7c4abd50062a0374bc7f5e4684e83020dc6869ff15ac56d56
 EBUILD camlp4-4.10_p1-r3.ebuild 1091 BLAKE2B be2cd293ef5a0c57b42aae0d00ce9ae037b42ec79de2932b0ef52d083c8351507a712170cd4469d2e6329d651fc4c761f82421df5f3e3b28c842adbad6ec9ebd SHA512 0335c361e5c63cfaa3fba9f4b73696c83ada275ad77fb61049fd01098c28d5fbc2582933f61993328f92ef59f7821aa7d1980285dcb4278c25c46224ba293735
 EBUILD camlp4-4.11_p1-r3.ebuild 1086 BLAKE2B f538b994cd9755de93b8f8b78e7f9fcb48d90c04c5292f6599047dfe22b2c368e97df5ff65ffbb0e7aa5c67052e44c2d81b2a5c6f06885ae701dd064df06db2d SHA512 ece702be561c5f64a9da11ad9ec623f891b369838a1c79d11b5eeff999f3ddb560cad8fdf8463c0941e89a5b034a73a85cfa27b26ac8141722237c6676548787
 EBUILD camlp4-4.12-r2.ebuild 1091 BLAKE2B be2cd293ef5a0c57b42aae0d00ce9ae037b42ec79de2932b0ef52d083c8351507a712170cd4469d2e6329d651fc4c761f82421df5f3e3b28c842adbad6ec9ebd SHA512 0335c361e5c63cfaa3fba9f4b73696c83ada275ad77fb61049fd01098c28d5fbc2582933f61993328f92ef59f7821aa7d1980285dcb4278c25c46224ba293735
 EBUILD camlp4-4.13-r2.ebuild 1091 BLAKE2B be2cd293ef5a0c57b42aae0d00ce9ae037b42ec79de2932b0ef52d083c8351507a712170cd4469d2e6329d651fc4c761f82421df5f3e3b28c842adbad6ec9ebd SHA512 0335c361e5c63cfaa3fba9f4b73696c83ada275ad77fb61049fd01098c28d5fbc2582933f61993328f92ef59f7821aa7d1980285dcb4278c25c46224ba293735
 EBUILD camlp4-4.14_p1-r2.ebuild 1257 BLAKE2B 81e8a93f2b4920083c05a435ed76697ed70b774a0b5c533f97c8e953fb65b0f7deb7937016cfe3772fc2eb1626ab9ca7d204f880528446623a85d17d61c8a93c SHA512 0fe6f645b7ecfeaf8f0e5ccdde8a161119051e64b0a0a43b99c67440d13f5c74f14c2f47e091a48a3c257eb81b6467aa145c3597e443461557dff94761db0d26
+EBUILD camlp4-5.2_p1.ebuild 1293 BLAKE2B 859fcccad24f4626d627f3321de92006f136fc22047130f614533c6d56220c55286ac5629b342ba21c53d62b10ef921ce42161b8fd215cf59703513614a83543 SHA512 6a11c71a846e241d1527335d004b95fe1fc5d3d8260592a23d2390944c14744f973657e76ac3949cb49a5b29ad51bb8fe752c81d474f078d5bc68c7b116ccac9
 MISC metadata.xml 311 BLAKE2B df7b6782aa51573cacb68804c03a7041d38121431bf08768497e9dafb904c3aef215665fff86c636a6040d0e6bea4912153f5e7adce8b5e5b55084dd740e158a SHA512 27e477a667e95796be69cb2648c09d364236b3962338754e3f27d9ca8c64612e4e24a519dc62c4da65881efd751db229f1cfbee6ca89446a4997e13241d448a9
diff --git a/dev-ml/camlp4/camlp4-5.2_p1.ebuild b/dev-ml/camlp4/camlp4-5.2_p1.ebuild
new file mode 100644
index 000000000000..e7445e57932a
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-5.2_p1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+inherit edo
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${P/_p/-}
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	=dev-lang/ocaml-5.2*:=[ocamlopt?]
+	dev-ml/camlp-streams:=[ocamlopt?]
+"
+DEPEND="
+	${RDEPEND}
+	dev-ml/ocamlbuild[ocamlopt?]
+	dev-ml/findlib:=
+"
+
+QA_FLAGS_IGNORED='.*'
+
+PATCHES=( "${FILESDIR}/reload.patch" )
+
+src_configure() {
+	edo ./configure                             \
+		--bindir="${EPREFIX}/usr/bin"           \
+		--libdir="$(ocamlc -where)"             \
+		--pkgdir="$(ocamlc -where)"
+}
+
+src_compile() {
+	# Increase stack limit to 11GiB to avoid stack overflow error.
+	ulimit -s 11530000
+
+	emake byte
+	use ocamlopt && emake native
+}
+
+src_install() {
+	# OCaml generates textrels on 32-bit arches
+	if use arm || use ppc || use x86 ; then
+		export QA_TEXTRELS='.*'
+	fi
+	emake DESTDIR="${D}" install install-META
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 95e6c4b18062..117f70ed70a7 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,8 +1,3 @@
-DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
-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.6.tar.gz 11704198 BLAKE2B 20e74551760cadf1d911e72c34502e1e7e62003f8ebc83f3b9cb46c712e13fb5f85f41421cc74b051c2e348e0c0a17f4ea34bf655f7ec48cfcdab1e0d8a57a11 SHA512 2bb24db05dc39d6e8294c10b5a6bb2dd8f675a4d56e1dc9a2e9bc576f54d14a1709005219c25586df9382897ab7ba5ea0636765410f01c06958ec59be9f14b4c
-EBUILD opam-installer-2.1.2-r1.ebuild 1033 BLAKE2B c368b2cae6a3b3ae2b4f19ecd498243066b019752b6c8ed812fde3deb8d6de30328c46c0aa839434a56330fc10b08feb4e22d163fbb40b23876a37091098dfe2 SHA512 ade9467d022b3650745efffa22fd6c4eca879878c951f89d1e7fd2e8ed4a237402535e1b7e8382dfeacbffa7bb75c8c0e63f95eb24de90bb7d082ff87a21fc7b
-EBUILD opam-installer-2.1.3.ebuild 1075 BLAKE2B 8c6eebaf2033a0418bde752c99ba35276d7a089b2773c8eba45c99ed78ca15b635029711bd44d5325fe5b2392563a91acd0ce5d038f287624e35c47599aaea46 SHA512 26a298278a703cfbe8e9267c6bcba2a17a22333aff459bd9abfbeddb1a929d571dbc7d6487d58c8d11ac92cb2b58448a694170001abd8134d7830d371f4a2224
 EBUILD opam-installer-2.1.6.ebuild 964 BLAKE2B 824236ef82b27f3ec9bbb7343ecbea19ccac0e4b8fd828fe9f1e51d397381d882fcca3e7033198dcd025ed77b8d60a669661bbf89dc83cf954695bac8365ca3e SHA512 76e0a7f3e9402a9cf2434e13d6a75e932ca9ee84b16fc84878aad5af54d3fd469f692d93d0b97e8bd37a723fababb5e3e2eaddd8374267eb10f93357393d0fce
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
deleted file mode 100644
index 5010cdd1712d..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 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"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-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"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-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"
-}
diff --git a/dev-ml/opam-installer/opam-installer-2.1.3.ebuild b/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
deleted file mode 100644
index e580796a2e99..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 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"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-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
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-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"
-}