Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: sci-electronics/kicad/
Date: Sun, 09 Feb 2020 16:36:39
Message-Id: 1581266123.a1b617de69c4c48480f336dd450665e01e12e4d7.mgorny@gentoo
1 commit: a1b617de69c4c48480f336dd450665e01e12e4d7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 7 18:59:18 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 16:35:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b617de
7
8 sci-electronics/kicad: Switch to PYTHON_MULTI_USEDEP API
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 .../kicad/{kicad-4.0.7.ebuild => kicad-4.0.7-r1.ebuild} | 14 ++++++++------
13 sci-electronics/kicad/kicad-5.0.1.ebuild | 14 ++++++++------
14 sci-electronics/kicad/kicad-5.1.0-r1.ebuild | 14 ++++++++------
15 sci-electronics/kicad/kicad-5.1.2-r1.ebuild | 12 +++++++-----
16 sci-electronics/kicad/kicad-5.1.4.ebuild | 12 +++++++-----
17 .../kicad/{kicad-5.1.5.ebuild => kicad-5.1.5-r1.ebuild} | 7 +++++--
18 6 files changed, 43 insertions(+), 30 deletions(-)
19
20 diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild
21 similarity index 96%
22 rename from sci-electronics/kicad/kicad-4.0.7.ebuild
23 rename to sci-electronics/kicad/kicad-4.0.7-r1.ebuild
24 index 624172e8994..a85b949bc42 100644
25 --- a/sci-electronics/kicad/kicad-4.0.7.ebuild
26 +++ b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild
27 @@ -1,4 +1,4 @@
28 -# Copyright 1999-2019 Gentoo Authors
29 +# Copyright 1999-2020 Gentoo Authors
30 # Distributed under the terms of the GNU General Public License v2
31
32 EAPI=6
33 @@ -33,11 +33,13 @@ REQUIRED_USE="
34 python? ( ${PYTHON_REQUIRED_USE} )"
35
36 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
37 - python? (
38 - dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
39 - ${PYTHON_DEPS}
40 - )
41 - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
42 + $(python_gen_cond_dep "
43 + python? (
44 + dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
45 + ${PYTHON_DEPS}
46 + )
47 + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
48 + ")
49 github? (
50 libressl? ( dev-libs/libressl:0= )
51 !libressl? ( dev-libs/openssl:0= )
52
53 diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
54 index a9f2e30229b..cb1d50631ac 100644
55 --- a/sci-electronics/kicad/kicad-5.0.1.ebuild
56 +++ b/sci-electronics/kicad/kicad-5.0.1.ebuild
57 @@ -1,4 +1,4 @@
58 -# Copyright 1999-2019 Gentoo Authors
59 +# Copyright 1999-2020 Gentoo Authors
60 # Distributed under the terms of the GNU General Public License v2
61
62 EAPI=6
63 @@ -23,11 +23,13 @@ REQUIRED_USE="
64 "
65
66 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
67 - python? (
68 - dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
69 - ${PYTHON_DEPS}
70 - )
71 - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
72 + $(python_gen_cond_dep "
73 + python? (
74 + dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
75 + ${PYTHON_DEPS}
76 + )
77 + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
78 + ")
79 github? ( net-misc/curl:=[ssl] )
80 media-libs/glew:0=
81 media-libs/glm
82
83 diff --git a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
84 index 6646e63fac8..8c93a13852a 100644
85 --- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
86 +++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
87 @@ -1,4 +1,4 @@
88 -# Copyright 1999-2019 Gentoo Authors
89 +# Copyright 1999-2020 Gentoo Authors
90 # Distributed under the terms of the GNU General Public License v2
91
92 # Can switch to EAPI=7 when wxwidgets eclass also supports it
93 @@ -24,11 +24,13 @@ REQUIRED_USE="
94 "
95
96 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
97 - python? (
98 - dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
99 - ${PYTHON_DEPS}
100 - )
101 - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
102 + $(python_gen_cond_dep "
103 + python? (
104 + dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
105 + ${PYTHON_DEPS}
106 + )
107 + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
108 + ")
109 github? ( net-misc/curl:=[ssl] )
110 media-libs/glew:0=
111 media-libs/glm
112
113 diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
114 index eaf36e9596e..377f42f962a 100644
115 --- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
116 +++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
117 @@ -24,11 +24,13 @@ REQUIRED_USE="
118 "
119
120 COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
121 - python? (
122 - dev-python/wxpython:4.0[${PYTHON_USEDEP}]
123 - ${PYTHON_DEPS}
124 - )
125 - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
126 + $(python_gen_cond_dep "
127 + python? (
128 + dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
129 + ${PYTHON_DEPS}
130 + )
131 + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
132 + ")
133 github? ( net-misc/curl:=[ssl] )
134 media-libs/glew:0=
135 media-libs/glm
136
137 diff --git a/sci-electronics/kicad/kicad-5.1.4.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild
138 index b442e402be3..68c690312a8 100644
139 --- a/sci-electronics/kicad/kicad-5.1.4.ebuild
140 +++ b/sci-electronics/kicad/kicad-5.1.4.ebuild
141 @@ -24,11 +24,13 @@ REQUIRED_USE="
142 "
143
144 COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
145 - python? (
146 - dev-python/wxpython:4.0[${PYTHON_USEDEP}]
147 - ${PYTHON_DEPS}
148 - )
149 - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
150 + $(python_gen_cond_dep "
151 + python? (
152 + dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
153 + ${PYTHON_DEPS}
154 + )
155 + >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
156 + ")
157 github? ( net-misc/curl:=[ssl] )
158 media-libs/glew:0=
159 >=media-libs/glm-0.9.9.1
160
161 diff --git a/sci-electronics/kicad/kicad-5.1.5.ebuild b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild
162 similarity index 94%
163 rename from sci-electronics/kicad/kicad-5.1.5.ebuild
164 rename to sci-electronics/kicad/kicad-5.1.5-r1.ebuild
165 index 46baaff613c..af08ef9e488 100644
166 --- a/sci-electronics/kicad/kicad-5.1.5.ebuild
167 +++ b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild
168 @@ -24,7 +24,7 @@ REQUIRED_USE="
169 "
170
171 COMMON_DEPEND="
172 - >=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
173 + >=dev-libs/boost-1.61:=[context,nls,threads]
174 media-libs/freeglut
175 media-libs/glew:0=
176 >=media-libs/glm-0.9.9.1
177 @@ -39,7 +39,10 @@ COMMON_DEPEND="
178 occ? ( >=sci-libs/opencascade-6.8.0:= )
179 oce? ( sci-libs/oce )
180 python? (
181 - dev-python/wxpython:4.0[${PYTHON_USEDEP}]
182 + $(python_gen_cond_dep '
183 + >=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
184 + dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
185 + ')
186 ${PYTHON_DEPS}
187 )
188 "
Report Message
Find on MARC Find on Google Groups