Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 4/8] dev-ml/llvm-ocaml: Port 9+ to llvm.org.eclass
Date: Fri, 01 Nov 2019 17:40:57
Message-Id: 20191101173927.146967-4-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/8] llvm.org.eclass: New eclass to help maintaining LLVM by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild | 12 +++---------
4 dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild | 7 +++----
5 dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild | 13 +++----------
6 3 files changed, 9 insertions(+), 23 deletions(-)
7
8 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
9 index 664c0aa44847..37dbc834d6fc 100644
10 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
11 +++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
12 @@ -8,13 +8,12 @@ EAPI=7
13 CMAKE_MIN_VERSION=3.7.0-r1
14 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
15
16 -inherit cmake-utils git-r3 llvm multiprocessing python-any-r1
17 +inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
18
19 DESCRIPTION="OCaml bindings for LLVM"
20 HOMEPAGE="https://llvm.org/"
21 -SRC_URI=""
22 -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
23 -S=${WORKDIR}/${P}/llvm
24 +LLVM_COMPONENTS=( llvm )
25 +llvm.org_set_globals
26
27 # Keep in sync with sys-devel/llvm
28 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
29 @@ -53,11 +52,6 @@ pkg_setup() {
30 python-any-r1_pkg_setup
31 }
32
33 -src_unpack() {
34 - git-r3_fetch
35 - git-r3_checkout '' '' '' llvm
36 -}
37 -
38 src_prepare() {
39 # Python is needed to run tests using lit
40 python_setup
41 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild
42 index 44c293f604cc..c62d0e0c7625 100644
43 --- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild
44 +++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.0.ebuild
45 @@ -8,13 +8,12 @@ EAPI=7
46 CMAKE_MIN_VERSION=3.7.0-r1
47 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
48
49 -inherit cmake-utils llvm multiprocessing python-any-r1
50 +inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
51
52 -MY_P=llvm-${PV/_/}.src
53 DESCRIPTION="OCaml bindings for LLVM"
54 HOMEPAGE="https://llvm.org/"
55 -SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz"
56 -S=${WORKDIR}/${MY_P}
57 +LLVM_COMPONENTS=( llvm )
58 +llvm.org_set_globals
59
60 # Keep in sync with sys-devel/llvm
61 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
62 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
63 index d47587faed9b..78b08e83dab6 100644
64 --- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild
65 +++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild
66 @@ -8,14 +8,12 @@ EAPI=7
67 CMAKE_MIN_VERSION=3.7.0-r1
68 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
69
70 -inherit cmake-utils git-r3 llvm multiprocessing python-any-r1
71 +inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
72
73 DESCRIPTION="OCaml bindings for LLVM"
74 HOMEPAGE="https://llvm.org/"
75 -SRC_URI=""
76 -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
77 -EGIT_BRANCH="release/9.x"
78 -S=${WORKDIR}/${P}/llvm
79 +LLVM_COMPONENTS=( llvm )
80 +llvm.org_set_globals
81
82 # Keep in sync with sys-devel/llvm
83 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
84 @@ -52,11 +50,6 @@ pkg_setup() {
85 python-any-r1_pkg_setup
86 }
87
88 -src_unpack() {
89 - git-r3_fetch
90 - git-r3_checkout '' '' '' llvm
91 -}
92 -
93 src_prepare() {
94 # Python is needed to run tests using lit
95 python_setup
96 --
97 2.23.0