1 |
commit: 1aeb3e088cbccbaaa406f305cb9e02566eb4363d |
2 |
Author: Huang Rui <vowstar <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jun 24 06:03:36 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 24 06:03:36 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1aeb3e08 |
7 |
|
8 |
sci-electronics/kactus2: fix build problem |
9 |
|
10 |
Add missing python and swig depend |
11 |
Python3 is required to build and run this package |
12 |
|
13 |
Closes: https://bugs.gentoo.org/853838 |
14 |
Closes: https://bugs.gentoo.org/853841 |
15 |
Signed-off-by: Huang Rui <vowstar <AT> gmail.com> |
16 |
|
17 |
sci-electronics/kactus2/kactus2-3.10.0.ebuild | 39 ++++++++++++++------------- |
18 |
sci-electronics/kactus2/kactus2-9999.ebuild | 39 ++++++++++++++------------- |
19 |
2 files changed, 40 insertions(+), 38 deletions(-) |
20 |
|
21 |
diff --git a/sci-electronics/kactus2/kactus2-3.10.0.ebuild b/sci-electronics/kactus2/kactus2-3.10.0.ebuild |
22 |
index 5ac2c4877..eb13a7c47 100644 |
23 |
--- a/sci-electronics/kactus2/kactus2-3.10.0.ebuild |
24 |
+++ b/sci-electronics/kactus2/kactus2-3.10.0.ebuild |
25 |
@@ -23,10 +23,10 @@ fi |
26 |
|
27 |
LICENSE="GPL-2" |
28 |
SLOT="0" |
29 |
-IUSE="+python" |
30 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
31 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
32 |
|
33 |
RDEPEND=" |
34 |
+ ${PYTHON_DEPS} |
35 |
dev-qt/qtcore:5 |
36 |
dev-qt/qtgui:5 |
37 |
dev-qt/qthelp:5 |
38 |
@@ -34,13 +34,16 @@ RDEPEND=" |
39 |
dev-qt/qtsvg:5 |
40 |
dev-qt/qtwidgets:5 |
41 |
dev-qt/qtxml:5 |
42 |
- python? ( ${PYTHON_DEPS} ) |
43 |
" |
44 |
|
45 |
DEPEND=" |
46 |
${RDEPEND} |
47 |
" |
48 |
|
49 |
+BDEPEND=" |
50 |
+ dev-lang/swig |
51 |
+" |
52 |
+ |
53 |
src_prepare() { |
54 |
default |
55 |
# Fix QA pre-stripped warnings, bug 781674 |
56 |
@@ -54,20 +57,18 @@ src_prepare() { |
57 |
src_install() { |
58 |
# Can't use default, set INSTALL_ROOT and workaround parallel install bug |
59 |
emake -j1 INSTALL_ROOT="${D}" install |
60 |
- if use python; then |
61 |
- python_install() { |
62 |
- export PYTHON_C_FLAGS="$(python_get_CFLAGS)" |
63 |
- export PYTHON_LIBS="$(python_get_LIBS)" |
64 |
- pushd "PythonAPI" || die |
65 |
- emake clean |
66 |
- eqmake5 PREFIX="$(python_get_library_path)" |
67 |
- emake |
68 |
- rm -rf _pythonAPI.so || die |
69 |
- cp -rf libPythonAPI.so.1.0.0 _pythonAPI.so || die |
70 |
- python_domodule _pythonAPI.so |
71 |
- python_domodule pythonAPI.py |
72 |
- popd |
73 |
- } |
74 |
- python_foreach_impl python_install |
75 |
- fi |
76 |
+ python_install() { |
77 |
+ export PYTHON_C_FLAGS="$(python_get_CFLAGS)" |
78 |
+ export PYTHON_LIBS="$(python_get_LIBS)" |
79 |
+ pushd "PythonAPI" || die |
80 |
+ emake clean |
81 |
+ eqmake5 PREFIX="$(python_get_library_path)" |
82 |
+ emake |
83 |
+ rm -rf _pythonAPI.so || die |
84 |
+ cp -rf libPythonAPI.so.1.0.0 _pythonAPI.so || die |
85 |
+ python_domodule _pythonAPI.so |
86 |
+ python_domodule pythonAPI.py |
87 |
+ popd |
88 |
+ } |
89 |
+ python_foreach_impl python_install |
90 |
} |
91 |
|
92 |
diff --git a/sci-electronics/kactus2/kactus2-9999.ebuild b/sci-electronics/kactus2/kactus2-9999.ebuild |
93 |
index 5ac2c4877..eb13a7c47 100644 |
94 |
--- a/sci-electronics/kactus2/kactus2-9999.ebuild |
95 |
+++ b/sci-electronics/kactus2/kactus2-9999.ebuild |
96 |
@@ -23,10 +23,10 @@ fi |
97 |
|
98 |
LICENSE="GPL-2" |
99 |
SLOT="0" |
100 |
-IUSE="+python" |
101 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
102 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
103 |
|
104 |
RDEPEND=" |
105 |
+ ${PYTHON_DEPS} |
106 |
dev-qt/qtcore:5 |
107 |
dev-qt/qtgui:5 |
108 |
dev-qt/qthelp:5 |
109 |
@@ -34,13 +34,16 @@ RDEPEND=" |
110 |
dev-qt/qtsvg:5 |
111 |
dev-qt/qtwidgets:5 |
112 |
dev-qt/qtxml:5 |
113 |
- python? ( ${PYTHON_DEPS} ) |
114 |
" |
115 |
|
116 |
DEPEND=" |
117 |
${RDEPEND} |
118 |
" |
119 |
|
120 |
+BDEPEND=" |
121 |
+ dev-lang/swig |
122 |
+" |
123 |
+ |
124 |
src_prepare() { |
125 |
default |
126 |
# Fix QA pre-stripped warnings, bug 781674 |
127 |
@@ -54,20 +57,18 @@ src_prepare() { |
128 |
src_install() { |
129 |
# Can't use default, set INSTALL_ROOT and workaround parallel install bug |
130 |
emake -j1 INSTALL_ROOT="${D}" install |
131 |
- if use python; then |
132 |
- python_install() { |
133 |
- export PYTHON_C_FLAGS="$(python_get_CFLAGS)" |
134 |
- export PYTHON_LIBS="$(python_get_LIBS)" |
135 |
- pushd "PythonAPI" || die |
136 |
- emake clean |
137 |
- eqmake5 PREFIX="$(python_get_library_path)" |
138 |
- emake |
139 |
- rm -rf _pythonAPI.so || die |
140 |
- cp -rf libPythonAPI.so.1.0.0 _pythonAPI.so || die |
141 |
- python_domodule _pythonAPI.so |
142 |
- python_domodule pythonAPI.py |
143 |
- popd |
144 |
- } |
145 |
- python_foreach_impl python_install |
146 |
- fi |
147 |
+ python_install() { |
148 |
+ export PYTHON_C_FLAGS="$(python_get_CFLAGS)" |
149 |
+ export PYTHON_LIBS="$(python_get_LIBS)" |
150 |
+ pushd "PythonAPI" || die |
151 |
+ emake clean |
152 |
+ eqmake5 PREFIX="$(python_get_library_path)" |
153 |
+ emake |
154 |
+ rm -rf _pythonAPI.so || die |
155 |
+ cp -rf libPythonAPI.so.1.0.0 _pythonAPI.so || die |
156 |
+ python_domodule _pythonAPI.so |
157 |
+ python_domodule pythonAPI.py |
158 |
+ popd |
159 |
+ } |
160 |
+ python_foreach_impl python_install |
161 |
} |