Signed-off-by: Michał Górny <mgo...@gentoo.org> --- dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild | 12 +++--------- dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild | 7 +++---- dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild | 13 +++---------- 3 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild index 664c0aa44847..37dbc834d6fc 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild @@ -8,13 +8,12 @@ EAPI=7 CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 +inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -S=${WORKDIR}/${P}/llvm +LLVM_COMPONENTS=( llvm ) +llvm.org_set_globals # Keep in sync with sys-devel/llvm ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR ) @@ -53,11 +52,6 @@ pkg_setup() { python-any-r1_pkg_setup } -src_unpack() { - git-r3_fetch - git-r3_checkout '' '' '' llvm -} - src_prepare() { # Python is needed to run tests using lit python_setup diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild index 44c293f604cc..c62d0e0c7625 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild @@ -8,13 +8,12 @@ EAPI=7 CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils llvm multiprocessing python-any-r1 +inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 -MY_P=llvm-${PV/_/}.src DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" -SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz" -S=${WORKDIR}/${MY_P} +LLVM_COMPONENTS=( llvm ) +llvm.org_set_globals # Keep in sync with sys-devel/llvm ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild index d47587faed9b..78b08e83dab6 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild @@ -8,14 +8,12 @@ EAPI=7 CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 +inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -EGIT_BRANCH="release/9.x" -S=${WORKDIR}/${P}/llvm +LLVM_COMPONENTS=( llvm ) +llvm.org_set_globals # Keep in sync with sys-devel/llvm ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 @@ -52,11 +50,6 @@ pkg_setup() { python-any-r1_pkg_setup } -src_unpack() { - git-r3_fetch - git-r3_checkout '' '' '' llvm -} - src_prepare() { # Python is needed to run tests using lit python_setup -- 2.23.0