commit: 372049e39ab93af18ce0e72e884ee2ca5ea1b5a9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Oct 7 01:38:34 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 7 01:38:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372049e3
dev-ml/num: fix collision with newer findlib Closes: https://bugs.gentoo.org/803275 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-ml/num/{num-1.4-r1.ebuild => num-1.4-r2.ebuild} | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dev-ml/num/num-1.4-r1.ebuild b/dev-ml/num/num-1.4-r2.ebuild similarity index 80% rename from dev-ml/num/num-1.4-r1.ebuild rename to dev-ml/num/num-1.4-r2.ebuild index cf5b56b7a6d..cf3d3b3bc4c 100644 --- a/dev-ml/num/num-1.4-r1.ebuild +++ b/dev-ml/num/num-1.4-r2.ebuild @@ -16,6 +16,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86- IUSE="+ocamlopt" RDEPEND="dev-lang/ocaml:=[ocamlopt?]" +DEPEND="dev-ml/findlib:=" src_compile() { emake CFLAGS="${CFLAGS}" NATDYNLINK="$(usex ocamlopt true false)" @@ -27,6 +28,10 @@ src_test() { } src_install() { - findlib_src_preinst - OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}" NATDYNLINK="$(usex ocamlopt true false)" + findlib_src_install + + if has_version ">=dev-ml/findlib-1.9" ; then + # See bug #803275 + rm "${ED}/usr/$(get_libdir)/ocaml/num-top/META" || die + fi }
