commit:     b1be4a4487d92cdabd348712f5bb9d102b512c92
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 06:47:16 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 06:47:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1be4a44

findlib.eclass: add ocamlopt? use dep to findlib

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 eclass/findlib.eclass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
index 0e14514e298f..dae19d91c37d 100644
--- a/eclass/findlib.eclass
+++ b/eclass/findlib.eclass
@@ -6,13 +6,13 @@
 # ML <[email protected]>
 # @AUTHOR:
 # Original author: Matthieu Sozeau <[email protected]> (retired)
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: ocamlfind (a.k.a. findlib) eclass
 # @DESCRIPTION:
 # ocamlfind (a.k.a. findlib) eclass
 
 case ${EAPI:-0} in
-       [67]) ;;
+       [678]) ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -26,11 +26,14 @@ QA_FLAGS_IGNORED='.*'
 IUSE="+ocamlopt"
 
 # From this findlib version, there is proper stublibs support.
-DEPEND=">=dev-ml/findlib-1.0.4-r1"
+DEPEND=">=dev-ml/findlib-1.0.4-r1[ocamlopt?]"
 [[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )"
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
 [[ ${FINDLIB_USE} ]] && RDEPEND="${FINDLIB_USE}? ( ${RDEPEND} )"
 
+# @FUNCTION: check_ocamlfind
+# @DESCRIPTION:
+# Die if ocamlfind is not found
 check_ocamlfind() {
        if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ] ; then
                eerror "In ${ECLASS}: could not find the ocamlfind executable"

Reply via email to