Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/lld/
Date: Thu, 02 Feb 2017 15:08:11
Message-Id: 1486048077.cd63416086421984d4ebccc539706e3ef373fe5d.mgorny@gentoo
1 commit: cd63416086421984d4ebccc539706e3ef373fe5d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 2 14:57:42 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 2 15:07:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd634160
7
8 sys-devel/lld: Use python-any-r1
9
10 sys-devel/lld/lld-4.0.0_rc1.ebuild | 12 ++++++++++--
11 sys-devel/lld/lld-9999.ebuild | 12 ++++++++++--
12 2 files changed, 20 insertions(+), 4 deletions(-)
13
14 diff --git a/sys-devel/lld/lld-4.0.0_rc1.ebuild b/sys-devel/lld/lld-4.0.0_rc1.ebuild
15 index 3e6dfc9..cb62439 100644
16 --- a/sys-devel/lld/lld-4.0.0_rc1.ebuild
17 +++ b/sys-devel/lld/lld-4.0.0_rc1.ebuild
18 @@ -9,7 +9,7 @@ EAPI=6
19 CMAKE_MIN_VERSION=3.7.0-r1
20 PYTHON_COMPAT=( python2_7 )
21
22 -inherit cmake-utils
23 +inherit cmake-utils python-any-r1
24
25 DESCRIPTION="The LLVM linker (link editor)"
26 HOMEPAGE="http://llvm.org/"
27 @@ -23,7 +23,7 @@ IUSE="test"
28
29 RDEPEND="~sys-devel/llvm-${PV}"
30 DEPEND="${RDEPEND}
31 - test? ( ~dev-python/lit-${PV} )"
32 + test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
33
34 S=${WORKDIR}/${P/_/}.src
35
36 @@ -33,6 +33,14 @@ RESTRICT="test"
37 # least intrusive of all
38 CMAKE_BUILD_TYPE=RelWithDebInfo
39
40 +python_check_deps() {
41 + has_version "dev-python/lit[${PYTHON_USEDEP}]"
42 +}
43 +
44 +pkg_setup() {
45 + use test && python-any-r1_pkg_setup
46 +}
47 +
48 src_unpack() {
49 default
50
51
52 diff --git a/sys-devel/lld/lld-9999.ebuild b/sys-devel/lld/lld-9999.ebuild
53 index 93b234c..6a01839 100644
54 --- a/sys-devel/lld/lld-9999.ebuild
55 +++ b/sys-devel/lld/lld-9999.ebuild
56 @@ -9,7 +9,7 @@ EAPI=6
57 CMAKE_MIN_VERSION=3.7.0-r1
58 PYTHON_COMPAT=( python2_7 )
59
60 -inherit cmake-utils git-r3
61 +inherit cmake-utils git-r3 python-any-r1
62
63 DESCRIPTION="The LLVM linker (link editor)"
64 HOMEPAGE="http://llvm.org/"
65 @@ -24,7 +24,7 @@ IUSE="test"
66
67 RDEPEND="~sys-devel/llvm-${PV}"
68 DEPEND="${RDEPEND}
69 - test? ( ~dev-python/lit-${PV} )"
70 + test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
71
72 # TODO: fix test suite to build stand-alone
73 RESTRICT="test"
74 @@ -32,6 +32,14 @@ RESTRICT="test"
75 # least intrusive of all
76 CMAKE_BUILD_TYPE=RelWithDebInfo
77
78 +python_check_deps() {
79 + has_version "dev-python/lit[${PYTHON_USEDEP}]"
80 +}
81 +
82 +pkg_setup() {
83 + use test && python-any-r1_pkg_setup
84 +}
85 +
86 src_unpack() {
87 if use test; then
88 # needed for patched gtest