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-cluster/charliecloud/
Date: Sun, 09 Feb 2020 16:42:32
Message-Id: 1581266226.82159286fd75b35bc55f030fabd6d79a9422bd51.mgorny@gentoo
1 commit: 82159286fd75b35bc55f030fabd6d79a9422bd51
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 7 20:21:38 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 16:37:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82159286
7
8 sys-cluster/charliecloud: Switch to PYTHON_MULTI_USEDEP API
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 .../{charliecloud-0.10.ebuild => charliecloud-0.10-r1.ebuild} | 9 ++++++---
13 sys-cluster/charliecloud/charliecloud-0.9.10.ebuild | 9 ++++++---
14 sys-cluster/charliecloud/charliecloud-9999.ebuild | 9 ++++++---
15 3 files changed, 18 insertions(+), 9 deletions(-)
16
17 diff --git a/sys-cluster/charliecloud/charliecloud-0.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
18 similarity index 90%
19 rename from sys-cluster/charliecloud/charliecloud-0.10.ebuild
20 rename to sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
21 index 8705c0ed4ae..b1560f0ec96 100644
22 --- a/sys-cluster/charliecloud/charliecloud-0.10.ebuild
23 +++ b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
24 @@ -34,9 +34,12 @@ RDEPEND="${PYTHON_DEPS}
25 pv? ( sys-apps/pv )
26 squashfuse? ( sys-fs/squashfuse )
27 "
28 -DEPEND="doc? (
29 - dev-python/sphinx[${PYTHON_USEDEP}]
30 - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
31 +DEPEND="
32 + doc? (
33 + $(python_gen_cond_dep '
34 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
35 + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
36 + ')
37 net-misc/rsync
38 )"
39
40
41 diff --git a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
42 index d86e0f7345f..042093fc108 100644
43 --- a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
44 +++ b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
45 @@ -33,9 +33,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
46 RDEPEND="${PYTHON_DEPS}
47 pv? ( sys-apps/pv )
48 "
49 -DEPEND="doc? (
50 - dev-python/sphinx[${PYTHON_USEDEP}]
51 - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
52 +DEPEND="
53 + doc? (
54 + $(python_gen_cond_dep '
55 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
56 + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
57 + ')
58 net-misc/rsync
59 )"
60
61
62 diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
63 index 4b1d3475315..c838d73e90e 100644
64 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
65 +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
66 @@ -34,9 +34,12 @@ RDEPEND="${PYTHON_DEPS}
67 pv? ( sys-apps/pv )
68 squashfuse? ( sys-fs/squashfuse )
69 "
70 -DEPEND="doc? (
71 - dev-python/sphinx[${PYTHON_USEDEP}]
72 - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
73 +DEPEND="
74 + doc? (
75 + $(python_gen_cond_dep '
76 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
77 + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
78 + ')
79 net-misc/rsync
80 )"