[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlbuild/

[Alfredo Tupone]

commit:     5888d48fd18eb1fa1cefc88aaa495f23951ffdf4
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  4 18:56:42 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 18:56:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5888d48f

dev-ml/ocamlbuild: remove some test

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild    |  2 +-
 dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild 
b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
index dfaf2d16bd3..13bf43e4852 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@@ -24,7 +24,7 @@ DEPEND="${DEPEND}
 src_prepare() {
        sed -i \
                -e "/package_exists/s:camlp4.macro:xxxxxx:" \
-               -e "/package_exists/s:menhirLib.macro:xxxxxx:" \
+               -e "/package_exists/s:menhirLib:xxxxxx:" \
                testsuite/external.ml || die
        default
 }

diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild 
b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
index 8ec83d02e23..cdd908c12d7 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@@ -25,6 +25,13 @@ PATCHES=(
 )
 
 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 \
@@ -36,6 +43,11 @@ src_configure() {
                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