1 |
commit: cecd559e5e4c0b727413d688ccbdc663024a6c0f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 7 14:59:26 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:26:44 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cecd559e |
7 |
|
8 |
media-gfx/cura: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
media-gfx/cura/cura-3.4.1.ebuild | 12 +++++++----- |
13 |
media-gfx/cura/cura-3.6.0.ebuild | 12 +++++++----- |
14 |
media-gfx/cura/cura-4.2.1.ebuild | 12 +++++++----- |
15 |
media-gfx/cura/{cura-4.3.0.ebuild => cura-4.3.0-r1.ebuild} | 12 +++++++----- |
16 |
4 files changed, 28 insertions(+), 20 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild |
19 |
index 16ebf84a070..f1b275618c6 100644 |
20 |
--- a/media-gfx/cura/cura-3.4.1.ebuild |
21 |
+++ b/media-gfx/cura/cura-3.4.1.ebuild |
22 |
@@ -19,13 +19,15 @@ IUSE="+usb zeroconf" |
23 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
24 |
|
25 |
RDEPEND="${PYTHON_DEPS} |
26 |
- >=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}] |
27 |
>=media-gfx/curaengine-${PV:0:3} |
28 |
>=media-gfx/fdm-materials-${PV:0:3} |
29 |
- >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}] |
30 |
- >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}] |
31 |
- usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) |
32 |
- zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )" |
33 |
+ >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] |
34 |
+ >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
35 |
+ >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
36 |
+ $(python_gen_cond_dep ' |
37 |
+ usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) |
38 |
+ zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) |
39 |
+ ')" |
40 |
|
41 |
DEPEND="${RDEPEND} |
42 |
sys-devel/gettext" |
43 |
|
44 |
diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild |
45 |
index 16ebf84a070..f1b275618c6 100644 |
46 |
--- a/media-gfx/cura/cura-3.6.0.ebuild |
47 |
+++ b/media-gfx/cura/cura-3.6.0.ebuild |
48 |
@@ -19,13 +19,15 @@ IUSE="+usb zeroconf" |
49 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
50 |
|
51 |
RDEPEND="${PYTHON_DEPS} |
52 |
- >=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}] |
53 |
>=media-gfx/curaengine-${PV:0:3} |
54 |
>=media-gfx/fdm-materials-${PV:0:3} |
55 |
- >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}] |
56 |
- >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}] |
57 |
- usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) |
58 |
- zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )" |
59 |
+ >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] |
60 |
+ >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
61 |
+ >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
62 |
+ $(python_gen_cond_dep ' |
63 |
+ usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) |
64 |
+ zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) |
65 |
+ ')" |
66 |
|
67 |
DEPEND="${RDEPEND} |
68 |
sys-devel/gettext" |
69 |
|
70 |
diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild |
71 |
index ba1e9563f25..d72614d316d 100644 |
72 |
--- a/media-gfx/cura/cura-4.2.1.ebuild |
73 |
+++ b/media-gfx/cura/cura-4.2.1.ebuild |
74 |
@@ -20,13 +20,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
75 |
|
76 |
BDEPEND="sys-devel/gettext" |
77 |
RDEPEND="${PYTHON_DEPS} |
78 |
- >=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}] |
79 |
>=media-gfx/curaengine-${PV:0:3} |
80 |
>=media-gfx/fdm-materials-${PV:0:3} |
81 |
- >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}] |
82 |
- >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}] |
83 |
- usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) |
84 |
- zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )" |
85 |
+ >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] |
86 |
+ >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
87 |
+ >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
88 |
+ $(python_gen_cond_dep ' |
89 |
+ usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) |
90 |
+ zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) |
91 |
+ ')" |
92 |
|
93 |
DEPEND="${RDEPEND}" |
94 |
|
95 |
|
96 |
diff --git a/media-gfx/cura/cura-4.3.0.ebuild b/media-gfx/cura/cura-4.3.0-r1.ebuild |
97 |
similarity index 77% |
98 |
rename from media-gfx/cura/cura-4.3.0.ebuild |
99 |
rename to media-gfx/cura/cura-4.3.0-r1.ebuild |
100 |
index ba1e9563f25..d72614d316d 100644 |
101 |
--- a/media-gfx/cura/cura-4.3.0.ebuild |
102 |
+++ b/media-gfx/cura/cura-4.3.0-r1.ebuild |
103 |
@@ -20,13 +20,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
104 |
|
105 |
BDEPEND="sys-devel/gettext" |
106 |
RDEPEND="${PYTHON_DEPS} |
107 |
- >=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}] |
108 |
>=media-gfx/curaengine-${PV:0:3} |
109 |
>=media-gfx/fdm-materials-${PV:0:3} |
110 |
- >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}] |
111 |
- >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}] |
112 |
- usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) |
113 |
- zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )" |
114 |
+ >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] |
115 |
+ >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
116 |
+ >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
117 |
+ $(python_gen_cond_dep ' |
118 |
+ usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) |
119 |
+ zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) |
120 |
+ ')" |
121 |
|
122 |
DEPEND="${RDEPEND}" |