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: Mon, 27 Dec 2021 01:09:01
Message-Id: 1640567320.ebe49a5529db5ae9dccc6f04804a50c348b596ab.sam@gentoo
1 commit: ebe49a5529db5ae9dccc6f04804a50c348b596ab
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 27 00:41:51 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 27 01:08:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe49a55
7
8 sci-electronics/kicad: add note re bundled pybind
9
10 Needed to work with wxwidgets for now.
11
12 See: https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 sci-electronics/kicad/kicad-6.0.0.ebuild | 6 ++++--
16 sci-electronics/kicad/kicad-9999.ebuild | 6 ++++--
17 2 files changed, 8 insertions(+), 4 deletions(-)
18
19 diff --git a/sci-electronics/kicad/kicad-6.0.0.ebuild b/sci-electronics/kicad/kicad-6.0.0.ebuild
20 index 9ee69cf7de52..02029d4ba76b 100644
21 --- a/sci-electronics/kicad/kicad-6.0.0.ebuild
22 +++ b/sci-electronics/kicad/kicad-6.0.0.ebuild
23 @@ -4,7 +4,6 @@
24 EAPI=7
25
26 PYTHON_COMPAT=( python3_{8,9} )
27 -
28 WX_GTK_VER="3.0-gtk3"
29
30 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
31 @@ -26,12 +25,15 @@ else
32 fi
33 fi
34
35 -LICENSE="GPL-2+ GPL-3+ Boost-1.0"
36 +# BSD for bundled pybind
37 +LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
38 SLOT="0"
39 IUSE="doc examples +ngspice openmp +occ +pcm"
40
41 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
42
43 +# Contains bundled pybind but it's patched for wx
44 +# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
45 COMMON_DEPEND="
46 >=dev-libs/boost-1.61:=[context,nls]
47 media-libs/freeglut
48
49 diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
50 index 9ee69cf7de52..02029d4ba76b 100644
51 --- a/sci-electronics/kicad/kicad-9999.ebuild
52 +++ b/sci-electronics/kicad/kicad-9999.ebuild
53 @@ -4,7 +4,6 @@
54 EAPI=7
55
56 PYTHON_COMPAT=( python3_{8,9} )
57 -
58 WX_GTK_VER="3.0-gtk3"
59
60 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
61 @@ -26,12 +25,15 @@ else
62 fi
63 fi
64
65 -LICENSE="GPL-2+ GPL-3+ Boost-1.0"
66 +# BSD for bundled pybind
67 +LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
68 SLOT="0"
69 IUSE="doc examples +ngspice openmp +occ +pcm"
70
71 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
72
73 +# Contains bundled pybind but it's patched for wx
74 +# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
75 COMMON_DEPEND="
76 >=dev-libs/boost-1.61:=[context,nls]
77 media-libs/freeglut