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

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/
Date: Fri, 21 Jan 2022 19:11:24
Message-Id: 1642792254.a5f3816845e8b29538dae8d4aee7e2e20a04a34d.sam@gentoo
1 commit: a5f3816845e8b29538dae8d4aee7e2e20a04a34d
2 Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
3 AuthorDate: Tue Jan 18 04:01:26 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 21 19:10:54 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f38168
7
8 sci-electronics/kicad: Bump to 6.0.1
9
10 Also move to EAPI8, add "nls" USE flag to allow for toggling
11 translations, change -DKICAD_DOCS to point to Gentoo's versioned
12 documentation path to fix documentation menu, and clean up some left
13 over variables
14
15 Package-Manager: Portage-3.0.30, Repoman-3.0.3
16 Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
17 Signed-off-by: Sam James <sam <AT> gentoo.org>
18
19 sci-electronics/kicad/Manifest | 1 +
20 .../kicad/{kicad-9999.ebuild => kicad-6.0.1.ebuild} | 16 +++++++++-------
21 sci-electronics/kicad/kicad-9999.ebuild | 14 ++++++++------
22 3 files changed, 18 insertions(+), 13 deletions(-)
23
24 diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
25 index d38b7350d368..62fda8577ed1 100644
26 --- a/sci-electronics/kicad/Manifest
27 +++ b/sci-electronics/kicad/Manifest
28 @@ -1,2 +1,3 @@
29 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
30 DIST kicad-6.0.0.tar.gz 45037889 BLAKE2B 4ea4075cd8e860ed19ee051be3567400c57f8c1b51550d2da80525ef65cc0b6c0951bac8c306c4fc19bddd824e2b727f416817ea4006a67f949dbf70df673a37 SHA512 1cadf59cfa85c5bbeb86f968ced896eff16c330e498497bf58826a58a59dfb83989422d660f7230d7921eeeda709d1ff10b50d4f842a36e50d44bf9017360b50
31 +DIST kicad-6.0.1.tar.gz 44971453 BLAKE2B e9fcaf367efb544197fb2ce448b0d808bb79f166e73e5c6f4c7c0ef303ee1bed5697101883ad4945aea8a1a1cd3b868832ea1ebfb727dfc8bdf56ce4d177838e SHA512 a257c69e0515c6d0c709bb59f632daff6e1e2108e1b1d4553d0cde397d551c3bfd969471dc63efdb12d57202842e1f645026650e2a7ca2c8af8b7150ceaebb3d
32
33 diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-6.0.1.ebuild
34 similarity index 93%
35 copy from sci-electronics/kicad/kicad-9999.ebuild
36 copy to sci-electronics/kicad/kicad-6.0.1.ebuild
37 index ff3a92646a7e..4efd1ddc6a91 100644
38 --- a/sci-electronics/kicad/kicad-9999.ebuild
39 +++ b/sci-electronics/kicad/kicad-6.0.1.ebuild
40 @@ -1,7 +1,7 @@
41 # Copyright 1999-2022 Gentoo Authors
42 # Distributed under the terms of the GNU General Public License v2
43
44 -EAPI=7
45 +EAPI=8
46
47 PYTHON_COMPAT=( python3_{8,9} )
48 WX_GTK_VER="3.0-gtk3"
49 @@ -28,7 +28,7 @@ fi
50 # BSD for bundled pybind
51 LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
52 SLOT="0"
53 -IUSE="doc examples +ngspice openmp +occ +pcm"
54 +IUSE="doc examples +ngspice nls openmp +occ +pcm"
55
56 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
57
58 @@ -52,6 +52,9 @@ COMMON_DEPEND="
59 ngspice? (
60 >sci-electronics/ngspice-27[shared]
61 )
62 + nls? (
63 + sys-devel/gettext
64 + )
65 occ? (
66 >=sci-libs/opencascade-7.3.0:=
67 )
68 @@ -68,8 +71,7 @@ if [[ ${PV} == 9999 ]] ; then
69 BDEPEND+=" >=x11-misc/util-macros-1.18"
70 fi
71
72 -CHECKREQS_DISK_BUILD="800M"
73 -CAS_VERSION=7.5.3
74 +CHECKREQS_DISK_BUILD="900M"
75
76 pkg_setup() {
77 use openmp && tc-check-openmp
78 @@ -91,13 +93,13 @@ src_configure() {
79 xdg_environment_reset
80
81 local mycmakeargs=(
82 - -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
83 + -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
84
85 -DKICAD_SCRIPTING_WXPYTHON=ON
86
87 # Merged from separate -i18n package, bug #830274
88 - -DKICAD_BUILD_I18N=ON
89 - -DKICAD_I18N_UNIX_STRICT_PATH=ON
90 + -DKICAD_BUILD_I18N="$(usex nls)"
91 + -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
92
93 -DPYTHON_DEST="$(python_get_sitedir)"
94 -DPYTHON_EXECUTABLE="${PYTHON}"
95
96 diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
97 index ff3a92646a7e..129d19372060 100644
98 --- a/sci-electronics/kicad/kicad-9999.ebuild
99 +++ b/sci-electronics/kicad/kicad-9999.ebuild
100 @@ -1,7 +1,7 @@
101 # Copyright 1999-2022 Gentoo Authors
102 # Distributed under the terms of the GNU General Public License v2
103
104 -EAPI=7
105 +EAPI=8
106
107 PYTHON_COMPAT=( python3_{8,9} )
108 WX_GTK_VER="3.0-gtk3"
109 @@ -28,7 +28,7 @@ fi
110 # BSD for bundled pybind
111 LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
112 SLOT="0"
113 -IUSE="doc examples +ngspice openmp +occ +pcm"
114 +IUSE="doc examples +ngspice nls openmp +occ +pcm"
115
116 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
117
118 @@ -52,6 +52,9 @@ COMMON_DEPEND="
119 ngspice? (
120 >sci-electronics/ngspice-27[shared]
121 )
122 + nls? (
123 + sys-devel/gettext
124 + )
125 occ? (
126 >=sci-libs/opencascade-7.3.0:=
127 )
128 @@ -68,8 +71,7 @@ if [[ ${PV} == 9999 ]] ; then
129 BDEPEND+=" >=x11-misc/util-macros-1.18"
130 fi
131
132 -CHECKREQS_DISK_BUILD="800M"
133 -CAS_VERSION=7.5.3
134 +CHECKREQS_DISK_BUILD="900M"
135
136 pkg_setup() {
137 use openmp && tc-check-openmp
138 @@ -96,8 +98,8 @@ src_configure() {
139 -DKICAD_SCRIPTING_WXPYTHON=ON
140
141 # Merged from separate -i18n package, bug #830274
142 - -DKICAD_BUILD_I18N=ON
143 - -DKICAD_I18N_UNIX_STRICT_PATH=ON
144 + -DKICAD_BUILD_I18N="$(usex nls)"
145 + -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
146
147 -DPYTHON_DEST="$(python_get_sitedir)"
148 -DPYTHON_EXECUTABLE="${PYTHON}"
Report Message
Find on MARC Find on Google Groups