sys-devel/llvm: Improve OCaml deps as suggested by aballier

diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 7db30d1df19dc987040ac123aeebe806bdcbe5f8..195d8ec78c89f5e81aa9eb70711ddefbe61d6004 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -43,8 +43,7 @@ COMMON_DEPEND="
        ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
        ocaml? (
                >=dev-lang/ocaml-4.00.0:0=
-               dev-ml/findlib
-               dev-ml/ocaml-ctypes
+               dev-ml/ocaml-ctypes:=
                !!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${COMMON_DEPEND}
@@ -63,7 +62,8 @@ DEPEND="${COMMON_DEPEND}
        libffi? ( virtual/pkgconfig )
        lldb? ( dev-lang/swig )
        !!<dev-python/configparser-3.3.0.2
-       ocaml? ( test? ( dev-ml/ounit ) )
+       ocaml? ( dev-ml/findlib
+               test? ( dev-ml/ounit ) )
        ${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
        clang? ( !<=sys-devel/clang-${PV}-r99 )

diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild
index fa91fb535861589436e9c5801ffa10973ce45d3a..ec4ce048623ca24b684a2749bec7a93a2d3eb90d 100644 (file)
--- a/sys-devel/llvm/llvm-3.9.0.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0.ebuild
@@ -45,8 +45,7 @@ COMMON_DEPEND="
        ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
        ocaml? (
                >=dev-lang/ocaml-4.00.0:0=
-               dev-ml/findlib
-               dev-ml/ocaml-ctypes
+               dev-ml/ocaml-ctypes:=
                !!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${COMMON_DEPEND}
@@ -65,7 +64,8 @@ DEPEND="${COMMON_DEPEND}
        libffi? ( virtual/pkgconfig )
        lldb? ( dev-lang/swig )
        !!<dev-python/configparser-3.3.0.2
-       ocaml? ( test? ( dev-ml/ounit ) )
+       ocaml? ( dev-ml/findlib
+               test? ( dev-ml/ounit ) )
        ${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
        clang? ( !<=sys-devel/clang-${PV}-r99 )

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index d7470a269db29c86361c6a6a7bd1f6e0a1f8f0fe..17f78ea432aec82b25fea65c31a3479f8262420a 100644 (file)
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -32,8 +32,7 @@ RDEPEND="
        ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
        ocaml? (
                >=dev-lang/ocaml-4.00.0:0=
-               dev-ml/findlib
-               dev-ml/ocaml-ctypes )"
+               dev-ml/ocaml-ctypes:= )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${RDEPEND}
        dev-lang/perl
@@ -45,7 +44,8 @@ DEPEND="${RDEPEND}
        doc? ( dev-python/sphinx )
        gold? ( sys-libs/binutils-libs )
        libffi? ( virtual/pkgconfig )
-       ocaml? ( test? ( dev-ml/ounit ) )
+       ocaml? ( dev-ml/findlib
+               test? ( dev-ml/ounit ) )
        !!<dev-python/configparser-3.3.0.2
        ${PYTHON_DEPS}"