1 |
commit: 558eef33b65fa47e25a839c8836b6c67e44edfc5 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 7 12:20:26 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:17:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=558eef33 |
7 |
|
8 |
app-vim/youcompleteme: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
.../youcompleteme/youcompleteme-20130910.ebuild | 12 +++++---- |
13 |
.../youcompleteme/youcompleteme-99999999.ebuild | 30 +++++++++++++--------- |
14 |
2 files changed, 25 insertions(+), 17 deletions(-) |
15 |
|
16 |
diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild |
17 |
index 90bc485b417..29e5f6c9426 100644 |
18 |
--- a/app-vim/youcompleteme/youcompleteme-20130910.ebuild |
19 |
+++ b/app-vim/youcompleteme/youcompleteme-20130910.ebuild |
20 |
@@ -1,4 +1,4 @@ |
21 |
-# Copyright 1999-2019 Gentoo Authors |
22 |
+# Copyright 1999-2020 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
EAPI=5 |
26 |
@@ -26,13 +26,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
27 |
RDEPEND="${PYTHON_DEPS} |
28 |
clang? ( >=sys-devel/clang-3.3 ) |
29 |
|| ( |
30 |
- app-editors/vim[python,${PYTHON_USEDEP}] |
31 |
- app-editors/gvim[python,${PYTHON_USEDEP}] |
32 |
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}] |
33 |
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}] |
34 |
)" |
35 |
DEPEND="${RDEPEND} |
36 |
test? ( |
37 |
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] |
38 |
- >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] |
39 |
+ $(python_gen_cond_dep ' |
40 |
+ >=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}] |
41 |
+ >=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}] |
42 |
+ ') |
43 |
)" |
44 |
|
45 |
CMAKE_IN_SOURCE_BUILD=1 |
46 |
|
47 |
diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild |
48 |
index 987fec6263b..c5e133ef743 100644 |
49 |
--- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild |
50 |
+++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild |
51 |
@@ -1,4 +1,4 @@ |
52 |
-# Copyright 1999-2019 Gentoo Authors |
53 |
+# Copyright 1999-2020 Gentoo Authors |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
|
56 |
EAPI=5 |
57 |
@@ -26,26 +26,32 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
58 |
COMMON_DEPEND=" |
59 |
${PYTHON_DEPS} |
60 |
clang? ( >=sys-devel/clang-3.3 ) |
61 |
- dev-libs/boost[python,threads,${PYTHON_USEDEP}] |
62 |
+ $(python_gen_cond_dep ' |
63 |
+ dev-libs/boost[python,threads,${PYTHON_MULTI_USEDEP}] |
64 |
+ ') |
65 |
|| ( |
66 |
- app-editors/vim[python,${PYTHON_USEDEP}] |
67 |
- app-editors/gvim[python,${PYTHON_USEDEP}] |
68 |
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}] |
69 |
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}] |
70 |
) |
71 |
" |
72 |
RDEPEND=" |
73 |
${COMMON_DEPEND} |
74 |
- dev-python/bottle[${PYTHON_USEDEP}] |
75 |
- virtual/python-futures[${PYTHON_USEDEP}] |
76 |
- dev-python/jedi[${PYTHON_USEDEP}] |
77 |
- dev-python/requests[${PYTHON_USEDEP}] |
78 |
- dev-python/sh[${PYTHON_USEDEP}] |
79 |
- dev-python/waitress[${PYTHON_USEDEP}] |
80 |
+ $(python_gen_cond_dep ' |
81 |
+ dev-python/bottle[${PYTHON_MULTI_USEDEP}] |
82 |
+ virtual/python-futures[${PYTHON_MULTI_USEDEP}] |
83 |
+ dev-python/jedi[${PYTHON_MULTI_USEDEP}] |
84 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
85 |
+ dev-python/sh[${PYTHON_MULTI_USEDEP}] |
86 |
+ dev-python/waitress[${PYTHON_MULTI_USEDEP}] |
87 |
+ ') |
88 |
" |
89 |
DEPEND=" |
90 |
${COMMON_DEPEND} |
91 |
test? ( |
92 |
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] |
93 |
- >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] |
94 |
+ $(python_gen_cond_dep ' |
95 |
+ >=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}] |
96 |
+ >=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}] |
97 |
+ ') |
98 |
>=dev-cpp/gtest-1.8.0 |
99 |
) |
100 |
" |