commit: 7c5fe5929a81d287bd4256f89cd53d49e8f38957 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sat Jun 15 15:49:37 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sat Jun 15 15:56:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5fe592
dev-ml/ocamlbuild: add 0.14.3, block ocaml-5 for older Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ml/ocamlbuild/Manifest | 3 +- dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild | 52 ---------------------- ...d-0.14.2.ebuild => ocamlbuild-0.14.2-r1.ebuild} | 3 +- ...uild-0.14.1.ebuild => ocamlbuild-0.14.3.ebuild} | 17 ++++--- 4 files changed, 11 insertions(+), 64 deletions(-) diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest index 12c241b94048..a231aeb15560 100644 --- a/dev-ml/ocamlbuild/Manifest +++ b/dev-ml/ocamlbuild/Manifest @@ -1,3 +1,2 @@ -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 +DIST ocamlbuild-0.14.3.tar.gz 199357 BLAKE2B b839d3757f4c2ce466291e00d2e5a87c51f81cc9e21f252ca7381fed9a4e8468e920d34946cb58c9297a1b98afe231b7eabc3960d68ba99f051891880742d7a6 SHA512 def8fa1d5488905fda31f72b7f6f0ebdccefa55a8e984a6ea4a7c1e0856e8ea1f7814410202e0f7f7d5e72aca7e8ae0d6623f7f2bade78b0dd82155de76ec4e5 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 similarity index 95% rename from dev-ml/ocamlbuild/ocamlbuild-0.14.2.ebuild rename to 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 similarity index 84% rename from dev-ml/ocamlbuild/ocamlbuild-0.14.1.ebuild rename to 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 }
