gentoo auto-resync : 16:06:2024 - 00:09:44

4 files changed, 13 insertions, 67 deletions

diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index d418a368bd89..88ed630bc346 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -1,8 +1,6 @@
 AUX ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch 1259 BLAKE2B d5ef0954e0a998b1ede15404fa2ed2e4aa8cbdb556aa22665e3193e179348274963303f384e984f73c808f5745ef347b5764f4408ca20110fe03383f0d92ffc7 SHA512 84671a1db5e4df6b4c21e313bb7b620e83016015ee32f508bbb14f791d7e09f138e83891b5c18a7a8ea2f9dd0d056bc9757152211e818275182df02c9701570e
-DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
-DIST ocamlbuild-0.14.1.tar.gz 199103 BLAKE2B e29d5cf2b333dd45c0aa86cc1fa4ddb160079b8a7badfe6127039d9215d3e6ad655eeacc9410887eadf1d61615025a59ea008254cae5fd65c13eb2afc7937ec8 SHA512 1f5b43215b1d3dc427b9c64e005add9d423ed4bca9686d52c55912df8955647cb2d7d86622d44b41b14c4f0d657b770c27967c541c868eeb7c78e3bd35b827ad
 DIST ocamlbuild-0.14.2.tar.gz 199293 BLAKE2B d81613878f93f27c6de41461e6b3cebe0744a5204297725263a608cb129a708aaf6f27b444b97d68f2bde844a760f8e78647641f10eed61e727ef3936562cdea SHA512 f568bf10431a1f701e8bd7554dc662400a0d978411038bbad93d44dceab02874490a8a5886a9b44e017347e7949997f13f5c3752f74e1eb5e273d2beb19a75fd
-EBUILD ocamlbuild-0.14.0-r1.ebuild 1369 BLAKE2B c40ae8b4619179421ef78ee4f68f6ce5b71a2e83d46d1feb8c450664f8d7792f68d5cfca1b6586fc7706a497d78e58afbe1c011a34e5b18daf198ca1c207b21e SHA512 e1efe6aa52a4693bcaa34ff1a39cf03f2c4423c56fe99a2b30c74046d8e7bb4792562012acfaa8da0d03f7757efd7da82213172c991bbdda3c9c143da1fcc0ee
-EBUILD ocamlbuild-0.14.1.ebuild 1374 BLAKE2B 842f9d56b6d9cc9196ddd956decaae807eeac955f4954c8aebf1db49d9967070143a9c50d810f325d17cdf33271dabfd4107a21b5923ab6c01c099b4d20ec67f SHA512 e3948dc923e57e9b6afd012fe87d8adf0eb17957db507bb3c1f9a82610218c9721d8f6c8777f59897d5d7272bd4ce185cc544dc8a588e3156391d1a42ede65da
-EBUILD ocamlbuild-0.14.2.ebuild 1362 BLAKE2B b75ff9a53b21836afb86a0d2a6022a039b651a12242f658962e3de0efd5d40848e50163050e1bcf62140e06c8554c10d57dc2bea3b80057bc54b199a40822b59 SHA512 1176d0667513e81beeacd2399045b228523b0b116d1363884a09c2b2d8bbdf60319c5f63172640abc349e91c227844c9d96c14fe9dd687faf02dfa157d53d9b8
+DIST ocamlbuild-0.14.3.tar.gz 199357 BLAKE2B b839d3757f4c2ce466291e00d2e5a87c51f81cc9e21f252ca7381fed9a4e8468e920d34946cb58c9297a1b98afe231b7eabc3960d68ba99f051891880742d7a6 SHA512 def8fa1d5488905fda31f72b7f6f0ebdccefa55a8e984a6ea4a7c1e0856e8ea1f7814410202e0f7f7d5e72aca7e8ae0d6623f7f2bade78b0dd82155de76ec4e5
+EBUILD ocamlbuild-0.14.2-r1.ebuild 1381 BLAKE2B a295b397c90f84b55e3914a2bd7a85768cc00f19be3826070b09b746fca4240499a7e4d90fae93e44a8e7d8e6a43e219ff1c2f417c353583115ebe8b8043d629 SHA512 6dd8a6fa3672761c3d4b9d5fc5278d82e21b1824df1e2c3ddd7f2d8db933dedb549de105d0cdee00a6181eed82a8f94cb05f97fcbeb38697427951a2748fd658
+EBUILD ocamlbuild-0.14.3.ebuild 1367 BLAKE2B 5c672d183f40379d35c9d10d704809778c3890e46e84b595a22d4a6c22932399e1405b29bbc17309476e1fc16289732c00c04349d737c2411d4a790aae60b5cf SHA512 2dac18ff3dac1bab0b85464d5c403e8087ab954aca1a883beef703f79cec03f13bce0c5528d05fa8d515d0cc9f355f12989ce035f3bf92a59b31c614e5af36dd
 MISC metadata.xml 314 BLAKE2B 6b6d5017c9d5ad7070b020fbfc85a313a8d89ff664b666504e0a9acc71e934bf5c28487c127846733dadb91fb657c71c70749955f4b713c41813c38336c0a7cf SHA512 6c4a92b198d2a2e52df3c6c223237e513b3eb681d06b2b6a15494c2ca9bf2ec6bfd0fb39cae1ed4e47088f87277fa35f1b959aa797cae4c59ccb764ac75de9e7
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
deleted file mode 100644
index c581a219720e..000000000000
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
-HOMEPAGE="https://github.com/ocaml/ocamlbuild"
-SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( ocamlopt )"
-
-RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
-)
-
-QA_FLAGS_IGNORED='.*'
-src_prepare() {
-	sed -i \
-		-e "/package_exists/s:camlp4.macro:xxxxxx:" \
-		-e "/package_exists/s:menhirLib:xxxxxx:" \
-		testsuite/external.ml || die
-	default
-}
-
-src_configure() {
-	emake -f configure.make Makefile.config \
-		PREFIX="${EPREFIX}/usr" \
-		BINDIR="${EPREFIX}/usr/bin" \
-		LIBDIR="$(ocamlc -where)" \
-		OCAML_NATIVE=$(usex ocamlopt true false) \
-		OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \
-		NATDYNLINK=$(usex ocamlopt true false)
-}
-
-src_compile() {
-	emake src/ocamlbuild_config.cmo
-	default
-}
-
-src_install() {
-	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
-	dodoc Changes
-}
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.2.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild
index b3b5fb33ae0c..99a412886ea8 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.2.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~
 IUSE="+ocamlopt"
 RESTRICT="test"  # Tests fail
 
-RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
+RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+	<dev-lang/ocaml-5"
 DEPEND="${RDEPEND}
 	dev-ml/findlib"
 
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild
index 9a074afe9de9..43c87eabc97a 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
 HOMEPAGE="https://github.com/ocaml/ocamlbuild"
@@ -10,18 +10,13 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( ocamlopt )"
+IUSE="+ocamlopt"
+RESTRICT="test"  # Tests fail
 
 RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
 DEPEND="${RDEPEND}
 	dev-ml/findlib"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
-)
-
 QA_FLAGS_IGNORED='.*'
 src_prepare() {
 	sed -i \
@@ -47,6 +42,10 @@ src_compile() {
 }
 
 src_install() {
+	# OCaml generates textrels on 32-bit arches
+	if use arm || use ppc || use x86 ; then
+		export QA_TEXTRELS='.*'
+	fi
 	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
 	dodoc Changes
 }