Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad-symbols/, app-doc/kicad-doc/, ...
Date: Fri, 21 Jan 2022 19:11:25
Message-Id: 1642792260.e3434580d1234bd975bb7840421cd003f6891d36.sam@gentoo
1 commit: e3434580d1234bd975bb7840421cd003f6891d36
2 Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
3 AuthorDate: Tue Jan 18 08:53:17 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 21 19:11:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3434580
7
8 sci-electronics: Drop KiCAD 6.0.0 packages
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
12 Closes: https://github.com/gentoo/gentoo/pull/23855
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 app-doc/kicad-doc/Manifest | 1 -
16 app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild | 65 --------
17 sci-electronics/kicad-footprints/Manifest | 1 -
18 .../kicad-footprints/kicad-footprints-6.0.0.ebuild | 36 -----
19 sci-electronics/kicad-meta/kicad-meta-6.0.0.ebuild | 30 ----
20 sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild | 2 +-
21 sci-electronics/kicad-packages3d/Manifest | 1 -
22 .../kicad-packages3d/kicad-packages3d-6.0.0.ebuild | 37 -----
23 sci-electronics/kicad-symbols/Manifest | 1 -
24 .../kicad-symbols/kicad-symbols-6.0.0.ebuild | 36 -----
25 sci-electronics/kicad-templates/Manifest | 1 -
26 .../kicad-templates/kicad-templates-6.0.0.ebuild | 28 ----
27 sci-electronics/kicad/Manifest | 1 -
28 sci-electronics/kicad/kicad-6.0.0-r1.ebuild | 167 ---------------------
29 14 files changed, 1 insertion(+), 406 deletions(-)
30
31 diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
32 index 16b15f1b0c11..fc0b92b1f4c8 100644
33 --- a/app-doc/kicad-doc/Manifest
34 +++ b/app-doc/kicad-doc/Manifest
35 @@ -1,3 +1,2 @@
36 DIST kicad-doc-5.1.12.tar.bz2 74217615 BLAKE2B f0906fdb0cf697348e06b63ef0003630a9035d47732c9a22ed3c4fee2f21c02f85fda51eee5149291b72326adc4899b31198178ee6e6ac0d494361cec6c06208 SHA512 db678d91ea5f564ca3f266829c297362cfd6cf35a5dced2ede5e7c9c38a37ca1037b264ee9314fa5c4a9d8197fcd92484ad4cae3668ea9741947d38c7ac7f910
37 -DIST kicad-doc-6.0.0.tar.gz 81338236 BLAKE2B 949d07a1b16635ad5be1a4855bc0c530a85c5d674096e8d1ae48e250e56168c2cb203d71a882e64c1816f0eb7c4ad1a0233be70bcbac185b2b8bb1e99b85dc66 SHA512 1f327c407b0ae88d1f13266571d978fd18fded857e63f1a56a10aa518da6ccb72e85a35215a51f4c91382f61445d141d837244699e932f411f6522bcf26290c3
38 DIST kicad-doc-6.0.1.tar.gz 78035248 BLAKE2B 25ff6eb1318d2c55ace2df3b1d553ce9220b035f8de034e583a98eb601c1032856b0efc8b81e0a142483722015878d64e25b05df5a53e5d53df56967dfc23021 SHA512 1027a4f46a855ab34c9e4fb53df1a495d8cb1d27f98263fb574ef25135b0d20ba3a875e2711fcb73836c27f5c0e193aea2dec3e9fa313434785eb0553ca214b8
39
40 diff --git a/app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild
41 deleted file mode 100644
42 index a3020d2a2df1..000000000000
43 --- a/app-doc/kicad-doc/kicad-doc-6.0.0-r1.ebuild
44 +++ /dev/null
45 @@ -1,65 +0,0 @@
46 -# Copyright 1999-2021 Gentoo Authors
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI=8
50 -
51 -inherit cmake
52 -
53 -DESCRIPTION="Electronic Schematic and PCB design tools manuals"
54 -HOMEPAGE="https://docs.kicad.org/"
55 -
56 -if [[ ${PV} == 9999 ]]; then
57 - EGIT_REPO_URI="https://gitlab.com/kicad/services/kicad-doc.git"
58 - inherit git-r3
59 - # x11-misc-util/macros only required on live ebuilds
60 - LIVE_DEPEND=">=x11-misc/util-macros-1.18"
61 -else
62 - MY_PV="${PV/_rc/-rc}"
63 - MY_P="${PN}-${MY_PV}"
64 - SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
65 - S="${WORKDIR}/${PN}-${MY_PV}"
66 - KEYWORDS="~amd64 ~arm64 ~x86"
67 -fi
68 -
69 -LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
70 -SLOT="0"
71 -# TODO: Change default back to +df once asciidoctor-pdf is packaged?
72 -IUSE="+html pdf"
73 -
74 -LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
75 -IUSE+=${LANG_USE}
76 -REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
77 -unset LANG_USE
78 -
79 -# TODO: need asciidoctor-pdf for pdf
80 -# bug #697450
81 -BDEPEND="
82 - >=app-text/asciidoc-8.6.9
83 - >=app-text/dblatex-0.3.10
84 - >=app-text/po4a-0.45
85 - >=sys-devel/gettext-0.18
86 - dev-perl/Unicode-LineBreak
87 - dev-util/source-highlight
88 - l10n_ca? ( dev-texlive/texlive-langspanish )
89 - l10n_de? ( dev-texlive/texlive-langgerman )
90 - l10n_en? ( dev-texlive/texlive-langenglish )
91 - l10n_es? ( dev-texlive/texlive-langspanish )
92 - l10n_fr? ( dev-texlive/texlive-langfrench )
93 - l10n_it? ( dev-texlive/texlive-langitalian )
94 - l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
95 - l10n_pl? ( dev-texlive/texlive-langpolish )
96 - l10n_ru? ( dev-texlive/texlive-langcyrillic )
97 - l10n_zh? ( dev-texlive/texlive-langchinese )"
98 -
99 -src_configure() {
100 - local mycmakeargs=(
101 - # May not always work?
102 - # https://gitlab.com/kicad/services/kicad-doc/-/issues/808
103 - -DADOC_TOOLCHAIN="ASCIIDOC"
104 - # Note: need EAPI 8 usev here, not pre-EAPI 8 behaviour
105 - -DBUILD_FORMATS="$(usev html);$(usev pdf)"
106 - -DSINGLE_LANGUAGE="${L10N}"
107 - -DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}/help
108 - )
109 - cmake_src_configure
110 -}
111
112 diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
113 index eeae8711cba9..09c17b3589e7 100644
114 --- a/sci-electronics/kicad-footprints/Manifest
115 +++ b/sci-electronics/kicad-footprints/Manifest
116 @@ -1,3 +1,2 @@
117 DIST kicad-footprints-5.1.12.tar.bz2 3382783 BLAKE2B 6f7725bebd6099d86780ed2582aacfb3abff4db6065a6a17fcd7631782a0c2e1e8a23064f80cd95c79bbaca8da52003f01fce7e398e95596e45f15b144eeef7f SHA512 e717886dc742f37b626226065953a36829b50f9bf203efe1dbeab41d4dbe3a898bd65fbde9fa059ea9374ea92905faeb0ccd19dfb1a62f2d6a445c07f90b89a9
118 -DIST kicad-footprints-6.0.0.tar.gz 6151018 BLAKE2B f54b1e47e4eb575c2d7bbb7d009954ca12f1aad5c06e4b39c9fa55ba1450ed865d3528dec5d98fac558a183266a77fb58209fb1028a2e2f5f6bd4e1d14b5caf7 SHA512 919883ee3a422e03ec7e89c6859d85431965e2ba6a6ee0449c1c7349d190abc65e6e9ac85e083e0fa8ed5d5657fa0a00f4094cf1c56046af470a2b4300bac19b
119 DIST kicad-footprints-6.0.1.tar.gz 31372634 BLAKE2B 5cb451a9a69c926af1aa8e0b180a244b8e195a450c83c960d62125d3bfc35d6a8c0a07e1a54c207fe851198b83bbdc7e3a26d06bdd92afbb1637733898661159 SHA512 dbe8689a0f32a9b448c7aa37c673736d97163f8e3f23b1e5119a732926cfd635aaa7927f0bf77327ab824353fe431523ca10f4035a37ca4fa364c8a7e2e2805d
120
121 diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.0.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.0.ebuild
122 deleted file mode 100644
123 index e640cdac16e1..000000000000
124 --- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.0.ebuild
125 +++ /dev/null
126 @@ -1,36 +0,0 @@
127 -# Copyright 1999-2021 Gentoo Authors
128 -# Distributed under the terms of the GNU General Public License v2
129 -
130 -EAPI=7
131 -
132 -inherit cmake
133 -
134 -DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
135 -HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints"
136 -
137 -if [[ ${PV} == 9999 ]]; then
138 - EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git"
139 - inherit git-r3
140 -else
141 - MY_PV="${PV/_rc/-rc}"
142 - MY_P="${PN}-${MY_PV}"
143 - SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
144 -
145 - if [[ ${PV} != *_rc* ]] ; then
146 - KEYWORDS="~amd64 ~arm64 ~x86"
147 - fi
148 -
149 - S="${WORKDIR}/${PN}-${MY_PV}"
150 -fi
151 -
152 -LICENSE="CC-BY-SA-4.0"
153 -SLOT="0"
154 -IUSE=""
155 -
156 -DEPEND=""
157 -RDEPEND=">=sci-electronics/kicad-5.99"
158 -
159 -if [[ ${PV} == 9999 ]] ; then
160 -# x11-misc-util/macros only required on live ebuilds
161 - BDEPEND+=" >=x11-misc/util-macros-1.18"
162 -fi
163
164 diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.0.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.0.ebuild
165 deleted file mode 100644
166 index 13ce06ce65fd..000000000000
167 --- a/sci-electronics/kicad-meta/kicad-meta-6.0.0.ebuild
168 +++ /dev/null
169 @@ -1,30 +0,0 @@
170 -# Copyright 1999-2021 Gentoo Authors
171 -# Distributed under the terms of the GNU General Public License v2
172 -
173 -EAPI=7
174 -
175 -DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
176 -HOMEPAGE="http://www.kicad.org"
177 -SRC_URI=""
178 -
179 -LICENSE="metapackage"
180 -SLOT="0"
181 -
182 -if [[ ${PV} != *_rc* ]] ; then
183 - KEYWORDS="~amd64 ~arm64 ~x86"
184 -fi
185 -
186 -IUSE="doc minimal"
187 -
188 -RDEPEND="
189 - >=sci-electronics/kicad-${PV}
190 - >=sci-electronics/kicad-symbols-${PV}
191 - >=sci-electronics/kicad-footprints-${PV}
192 - doc? (
193 - >=app-doc/kicad-doc-${PV}
194 - )
195 - !minimal? (
196 - >=sci-electronics/kicad-packages3d-${PV}
197 - >=sci-electronics/kicad-templates-${PV}
198 - )
199 -"
200
201 diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild
202 index 187af8ef45ee..570479b87ece 100644
203 --- a/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild
204 +++ b/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild
205 @@ -1,4 +1,4 @@
206 -# Copyright 1999-2022 Gentoo Authors
207 +# Copyright 1999-2021 Gentoo Authors
208 # Distributed under the terms of the GNU General Public License v2
209
210 EAPI=8
211
212 diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
213 index f620595c1f8d..b89d1ca3c485 100644
214 --- a/sci-electronics/kicad-packages3d/Manifest
215 +++ b/sci-electronics/kicad-packages3d/Manifest
216 @@ -1,3 +1,2 @@
217 DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2
218 -DIST kicad-packages3d-6.0.0.tar.gz 943422281 BLAKE2B dcea4d4a323d021eba61dcab307e09e2bb8d39cdc38dc5ca64b7a19e93ffe1d0b6c4869dac47d81eca950a0c6db8c023758c66eb1a839fbb073529be02165c0b SHA512 5931309d9ed1fb78a0c9ef8eba80b68851749f369d4efe10f5fa02b6444fa7a3cfcfe1a8188127cbf15745f4e6d357e56f34ee5e6ff06560441937a8967495e0
219 DIST kicad-packages3d-6.0.1.tar.gz 943455043 BLAKE2B 7d26b3f6eb9fe279343d9c43dfff875ba2f56b56ff1fe868a07fa43f9abe476f7b6c8e3e9122adf2bf5546b571f45573926055452bac9b5dc03618dd8ace245a SHA512 326ad5d3b4fea482921af2f69b21e7f36ad462632804c24c160b824e722d79050a2e7d81b499fad09c7e03381026a9d3d292a85ace79d7a7cc3a976454e8bb83
220
221 diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0.ebuild
222 deleted file mode 100644
223 index f5a45cc6b9cd..000000000000
224 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0.ebuild
225 +++ /dev/null
226 @@ -1,37 +0,0 @@
227 -# Copyright 1999-2021 Gentoo Authors
228 -# Distributed under the terms of the GNU General Public License v2
229 -
230 -EAPI=7
231 -
232 -inherit check-reqs cmake
233 -
234 -DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
235 -HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
236 -
237 -if [[ ${PV} == 9999 ]]; then
238 - EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git"
239 - inherit git-r3
240 -else
241 - MY_PV="${PV/_rc/-rc}"
242 - MY_P="${PN}-${MY_PV}"
243 - SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
244 -
245 - if [[ ${PV} != *_rc* ]] ; then
246 - KEYWORDS="~amd64 ~arm64 ~x86"
247 - fi
248 -
249 - S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d"
250 -fi
251 -
252 -IUSE="+occ"
253 -LICENSE="CC-BY-SA-4.0"
254 -SLOT="0"
255 -
256 -RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
257 -
258 -if [[ ${PV} == 9999 ]] ; then
259 - # x11-misc-util/macros only required on live ebuilds
260 - BDEPEND=">=x11-misc/util-macros-1.18"
261 -fi
262 -
263 -CHECKREQS_DISK_BUILD="11G"
264
265 diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
266 index e4becbb62f03..777cdb0aa489 100644
267 --- a/sci-electronics/kicad-symbols/Manifest
268 +++ b/sci-electronics/kicad-symbols/Manifest
269 @@ -1,3 +1,2 @@
270 DIST kicad-symbols-5.1.12.tar.bz2 1815145 BLAKE2B e3a74c0e2cb24f4286cdd7fa63b62c72c39575475305680ba8e19d5b3acb5c6cbff1e17d37d169043949ad89ffb9b94f0341e1faf7d063c1cf9872d31b863e21 SHA512 32e73b8a43e54779e4b95fc13505d603c7ef70600467a1e38f2685288aa9223ca29cc44a552d8c02e153cbf3048faa59610bc92e81dbbed7a432c16db0bd05f6
271 -DIST kicad-symbols-6.0.0.tar.gz 4809848 BLAKE2B ba96aac11c60ba590c23d3df56e0c3cb7fbea828833e0cd7874976f0ed93bf7e0dd21a3a367eff0e5086126c663eec075b45cb82f463c36289b780ecf1836e20 SHA512 9e223ba15e8c8d00d5f5889f4fc9f7677a290253121889dd162788af3bbf1400b39c6d41bb1167b53ea028c32016f8f465251a308f546ece69149a9e5b32e66c
272 DIST kicad-symbols-6.0.1.tar.gz 4809762 BLAKE2B 8133932edf7f480ea61c98838e0c7b0ed32c79ef8cc89d385192c7cd137bcfabdb9a4ed28cc10b2006dfc37729b070d286a5b29b94108da487c797fef1605b20 SHA512 0f62118118adff693bb127d229232cfeeb88f48d3d818d44c3d9d8d1db89de903587ed8cc9081914eec8233650dd0bac6dd5d4618b4417bdf06955ebd1b8923c
273
274 diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.0.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.0.ebuild
275 deleted file mode 100644
276 index 985b0dfbfdba..000000000000
277 --- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.0.ebuild
278 +++ /dev/null
279 @@ -1,36 +0,0 @@
280 -# Copyright 1999-2021 Gentoo Authors
281 -# Distributed under the terms of the GNU General Public License v2
282 -
283 -EAPI=7
284 -
285 -inherit cmake
286 -
287 -DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
288 -HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols"
289 -
290 -if [[ ${PV} == 9999 ]]; then
291 - EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git"
292 - inherit git-r3
293 -else
294 - MY_PV="${PV/_rc/-rc}"
295 - MY_P="${PN}-${MY_PV}"
296 - SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
297 -
298 - if [[ ${PV} != *_rc* ]] ; then
299 - KEYWORDS="~amd64 ~arm64 ~x86"
300 - fi
301 -
302 - S="${WORKDIR}/${PN}-${MY_PV}"
303 -fi
304 -
305 -LICENSE="CC-BY-SA-4.0"
306 -SLOT="0"
307 -IUSE=""
308 -
309 -DEPEND=""
310 -RDEPEND=">=sci-electronics/kicad-5.99"
311 -
312 -if [[ ${PV} == 9999 ]] ; then
313 - # x11-misc-util/macros only required on live ebuilds
314 - BDEPEND+=" >=x11-misc/util-macros-1.18"
315 -fi
316
317 diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
318 index 6fa517ce1c71..e45a9fd2bc0a 100644
319 --- a/sci-electronics/kicad-templates/Manifest
320 +++ b/sci-electronics/kicad-templates/Manifest
321 @@ -1,3 +1,2 @@
322 DIST kicad-templates-5.1.12.tar.bz2 1552173 BLAKE2B 51791729e049aa835f15b80f783d07c099dd177783b1a78209e7c7db709a3b0a18bd22572227ab5193d4da955796bc4c78f502fdedd275f379f84fa49108a324 SHA512 4f44816fa78048c0db93ecd10ae980236bc5ef1ed5170270ac761dd5fc32d08a5c8bf733837e6dceecf736f75fa09780326af813de04cbd69345cf376815d430
323 -DIST kicad-templates-6.0.0.tar.gz 2248671 BLAKE2B f164b0788923e8cc314241127bc235513bfa04706548a080c0d83dfcce2087e5ce202545a7ce545da0d3e7c67299b712a1289188afe7ff27ae6509b23c6e33ff SHA512 fbe54dd90ce1cc913b406796952b1503fc7720e01a181880771df29ee0f7be1de062f71fccfb7d71ce1fc4a4044e12019d9e9a3cade100dfc021dbdbbd117ad4
324 DIST kicad-templates-6.0.1.tar.gz 2248692 BLAKE2B fa9f1667958f25f965e1f41b50b009724b8b46960b55561048aca74f876196ac896ee72294f32ad815f7d7097dd4caba2a4fe8c5f6731e0e13322c48cf6df1a0 SHA512 ee0423949e63a17634c0abe3eb5184d16650cf702f37fa2f10af8f0e9377d4031b0b213cb8570af63d8ff8d5549f0b6f153287db9d8f64140273134ee2650a60
325
326 diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.0.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.0.ebuild
327 deleted file mode 100644
328 index c54c0c834164..000000000000
329 --- a/sci-electronics/kicad-templates/kicad-templates-6.0.0.ebuild
330 +++ /dev/null
331 @@ -1,28 +0,0 @@
332 -# Copyright 1999-2021 Gentoo Authors
333 -# Distributed under the terms of the GNU General Public License v2
334 -
335 -EAPI=7
336 -
337 -inherit cmake
338 -
339 -DESCRIPTION="Electronic Schematic and PCB design tools project templates"
340 -HOMEPAGE="https://github.com/kicad/kicad-templates"
341 -if [[ ${PV} == 9999 ]]; then
342 - EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git"
343 - inherit git-r3
344 -else
345 - MY_PV="${PV/_rc/-rc}"
346 - MY_P="${PN}-${MY_PV}"
347 - SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
348 -
349 - if [[ ${PV} != *_rc* ]] ; then
350 - KEYWORDS="~amd64 ~arm64 ~x86"
351 - fi
352 -
353 - S="${WORKDIR}/${PN}-${MY_PV}"
354 -fi
355 -
356 -LICENSE="CC-BY-SA-4.0"
357 -SLOT="0"
358 -
359 -RDEPEND=">=sci-electronics/kicad-5.99"
360
361 diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
362 index 62fda8577ed1..ee977e4d1eb5 100644
363 --- a/sci-electronics/kicad/Manifest
364 +++ b/sci-electronics/kicad/Manifest
365 @@ -1,3 +1,2 @@
366 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
367 -DIST kicad-6.0.0.tar.gz 45037889 BLAKE2B 4ea4075cd8e860ed19ee051be3567400c57f8c1b51550d2da80525ef65cc0b6c0951bac8c306c4fc19bddd824e2b727f416817ea4006a67f949dbf70df673a37 SHA512 1cadf59cfa85c5bbeb86f968ced896eff16c330e498497bf58826a58a59dfb83989422d660f7230d7921eeeda709d1ff10b50d4f842a36e50d44bf9017360b50
368 DIST kicad-6.0.1.tar.gz 44971453 BLAKE2B e9fcaf367efb544197fb2ce448b0d808bb79f166e73e5c6f4c7c0ef303ee1bed5697101883ad4945aea8a1a1cd3b868832ea1ebfb727dfc8bdf56ce4d177838e SHA512 a257c69e0515c6d0c709bb59f632daff6e1e2108e1b1d4553d0cde397d551c3bfd969471dc63efdb12d57202842e1f645026650e2a7ca2c8af8b7150ceaebb3d
369
370 diff --git a/sci-electronics/kicad/kicad-6.0.0-r1.ebuild b/sci-electronics/kicad/kicad-6.0.0-r1.ebuild
371 deleted file mode 100644
372 index ff3a92646a7e..000000000000
373 --- a/sci-electronics/kicad/kicad-6.0.0-r1.ebuild
374 +++ /dev/null
375 @@ -1,167 +0,0 @@
376 -# Copyright 1999-2022 Gentoo Authors
377 -# Distributed under the terms of the GNU General Public License v2
378 -
379 -EAPI=7
380 -
381 -PYTHON_COMPAT=( python3_{8,9} )
382 -WX_GTK_VER="3.0-gtk3"
383 -
384 -inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
385 -
386 -DESCRIPTION="Electronic Schematic and PCB design tools"
387 -HOMEPAGE="https://www.kicad.org"
388 -
389 -if [[ ${PV} == 9999 ]]; then
390 - EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
391 - inherit git-r3
392 -else
393 - MY_PV="${PV/_rc/-rc}"
394 - MY_P="${PN}-${MY_PV}"
395 - SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
396 - S="${WORKDIR}/${PN}-${MY_PV}"
397 -
398 - if [[ ${PV} != *_rc* ]] ; then
399 - KEYWORDS="~amd64 ~arm64 ~x86"
400 - fi
401 -fi
402 -
403 -# BSD for bundled pybind
404 -LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
405 -SLOT="0"
406 -IUSE="doc examples +ngspice openmp +occ +pcm"
407 -
408 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
409 -
410 -# Contains bundled pybind but it's patched for wx
411 -# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
412 -COMMON_DEPEND="
413 - !sci-electronics/kicad-i18n
414 - >=dev-libs/boost-1.61:=[context,nls]
415 - media-libs/freeglut
416 - media-libs/glew:0=
417 - >=media-libs/glm-0.9.9.1
418 - media-libs/mesa[X(+)]
419 - >=x11-libs/cairo-1.8.8:=
420 - >=x11-libs/pixman-0.30
421 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
422 - $(python_gen_cond_dep '
423 - >=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_USEDEP}]
424 - dev-python/wxpython:4.0[${PYTHON_USEDEP}]
425 - ')
426 - ${PYTHON_DEPS}
427 - ngspice? (
428 - >sci-electronics/ngspice-27[shared]
429 - )
430 - occ? (
431 - >=sci-libs/opencascade-7.3.0:=
432 - )
433 -"
434 -DEPEND="${COMMON_DEPEND}"
435 -RDEPEND="${COMMON_DEPEND}
436 - sci-electronics/electronics-menu
437 -"
438 -BDEPEND=">=dev-lang/swig-3.0
439 - doc? ( app-doc/doxygen )"
440 -
441 -if [[ ${PV} == 9999 ]] ; then
442 - # x11-misc-util/macros only required on live ebuilds
443 - BDEPEND+=" >=x11-misc/util-macros-1.18"
444 -fi
445 -
446 -CHECKREQS_DISK_BUILD="800M"
447 -CAS_VERSION=7.5.3
448 -
449 -pkg_setup() {
450 - use openmp && tc-check-openmp
451 -
452 - python-single-r1_pkg_setup
453 - setup-wxwidgets
454 - check-reqs_pkg_setup
455 -}
456 -
457 -src_unpack() {
458 - if [[ ${PV} == 9999 ]]; then
459 - git-r3_src_unpack
460 - else
461 - default_src_unpack
462 - fi
463 -}
464 -
465 -src_configure() {
466 - xdg_environment_reset
467 -
468 - local mycmakeargs=(
469 - -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
470 -
471 - -DKICAD_SCRIPTING_WXPYTHON=ON
472 -
473 - # Merged from separate -i18n package, bug #830274
474 - -DKICAD_BUILD_I18N=ON
475 - -DKICAD_I18N_UNIX_STRICT_PATH=ON
476 -
477 - -DPYTHON_DEST="$(python_get_sitedir)"
478 - -DPYTHON_EXECUTABLE="${PYTHON}"
479 - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
480 - -DPYTHON_LIBRARY="$(python_get_library_path)"
481 -
482 - -DKICAD_SPICE="$(usex ngspice)"
483 - -DKICAD_PCM="$(usex pcm)"
484 -
485 - -DKICAD_USE_OCC="$(usex occ)"
486 - -DKICAD_INSTALL_DEMOS="$(usex examples)"
487 - -DCMAKE_SKIP_RPATH="ON"
488 - )
489 -
490 - use occ && mycmakeargs+=(
491 - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
492 - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
493 - )
494 -
495 - cmake_src_configure
496 -}
497 -
498 -src_compile() {
499 - cmake_src_compile
500 - if use doc; then
501 - cmake_src_compile doxygen-docs
502 - fi
503 -}
504 -
505 -src_test() {
506 - # Test cannot find library in Portage's sandbox. Let's create a link so test can run.
507 - ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
508 -
509 - # LD_LIBRARY_PATH is there to help it pick up the just-built libraries
510 - LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
511 -}
512 -
513 -src_install() {
514 - cmake_src_install
515 - python_optimize
516 -
517 - if use doc ; then
518 - dodoc uncrustify.cfg
519 - cd Documentation || die
520 - dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
521 - fi
522 -}
523 -
524 -pkg_postinst() {
525 - optfeature "Component symbols library" sci-electronics/kicad-symbols
526 - optfeature "Component footprints library" sci-electronics/kicad-footprints
527 - optfeature "3D models of components " sci-electronics/kicad-packages3d
528 - optfeature "Project templates" sci-electronics/kicad-templates
529 - optfeature "Different languages for GUI" sci-electronics/kicad-i18n
530 - optfeature "Extended documentation" app-doc/kicad-doc
531 - optfeature "Creating 3D models of components" media-gfx/wings
532 -
533 - xdg_desktop_database_update
534 - xdg_mimeinfo_database_update
535 - xdg_icon_cache_update
536 -}
537 -
538 -pkg_postrm() {
539 - xdg_desktop_database_update
540 - xdg_mimeinfo_database_update
541 - xdg_icon_cache_update
542 -}