commit: 77581a9e63e15d4d6a35ad7c48555a0e045d430a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 9 16:13:08 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 18:01:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77581a9e
sys-devel/llvm: Improve OCaml deps as suggested by aballier
sys-devel/llvm/llvm-3.8.1-r2.ebuild | 6 +++---
sys-devel/llvm/llvm-3.9.0.ebuild | 6 +++---
sys-devel/llvm/llvm-9999.ebuild | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 7db30d1..195d8ec 100644
--- 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 fa91fb5..ec4ce04 100644
--- 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 d7470a2..17f78ea 100644
--- 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}"
