1 |
commit: 81006f8284b08a2b5097da883709f268dfa535d5 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Nov 26 23:32:15 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 27 11:30:46 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=81006f82 |
7 |
|
8 |
kde-apps/cantor: Fix DEPENDs, add USE=julia, pkg_postinst -> pkg_pretend |
9 |
|
10 |
Better warn before the emerge than afterwards. |
11 |
Add two runtime backends to pkg_pretend message. |
12 |
|
13 |
Gentoo-bug: 598926 |
14 |
|
15 |
Package-Manager: portage-2.3.0 |
16 |
|
17 |
kde-apps/cantor/cantor-16.12.49.9999.ebuild | 40 +++++++++++++++++------------ |
18 |
kde-apps/cantor/cantor-9999.ebuild | 40 +++++++++++++++++------------ |
19 |
kde-apps/cantor/metadata.xml | 1 + |
20 |
3 files changed, 47 insertions(+), 34 deletions(-) |
21 |
|
22 |
diff --git a/kde-apps/cantor/cantor-16.12.49.9999.ebuild b/kde-apps/cantor/cantor-16.12.49.9999.ebuild |
23 |
index ed84d7b..022066a 100644 |
24 |
--- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild |
25 |
+++ b/kde-apps/cantor/cantor-16.12.49.9999.ebuild |
26 |
@@ -13,7 +13,7 @@ inherit kde5 python-r1 |
27 |
DESCRIPTION="Interface for doing mathematics and scientific computing" |
28 |
HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor" |
29 |
KEYWORDS="" |
30 |
-IUSE="analitza lua postscript python qalculate +R" |
31 |
+IUSE="analitza julia lua postscript python qalculate +R" |
32 |
|
33 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
34 |
|
35 |
@@ -26,8 +26,8 @@ RDEPEND=" |
36 |
$(add_frameworks_dep kconfigwidgets) |
37 |
$(add_frameworks_dep kcoreaddons) |
38 |
$(add_frameworks_dep kcrash) |
39 |
- $(add_frameworks_dep kdelibs4support) |
40 |
$(add_frameworks_dep ki18n) |
41 |
+ $(add_frameworks_dep kiconthemes) |
42 |
$(add_frameworks_dep kio) |
43 |
$(add_frameworks_dep knewstuff) |
44 |
$(add_frameworks_dep kparts) |
45 |
@@ -36,11 +36,13 @@ RDEPEND=" |
46 |
$(add_frameworks_dep kwidgetsaddons) |
47 |
$(add_frameworks_dep kxmlgui) |
48 |
$(add_qt_dep qtgui) |
49 |
+ $(add_qt_dep qtprintsupport) |
50 |
$(add_qt_dep qtsvg) |
51 |
$(add_qt_dep qtwidgets) |
52 |
$(add_qt_dep qtxml) |
53 |
$(add_qt_dep qtxmlpatterns) |
54 |
analitza? ( $(add_kdeapps_dep analitza) ) |
55 |
+ julia? ( dev-lang/julia ) |
56 |
lua? ( dev-lang/luajit:2 ) |
57 |
qalculate? ( |
58 |
sci-libs/cln |
59 |
@@ -51,10 +53,26 @@ RDEPEND=" |
60 |
R? ( dev-lang/R ) |
61 |
" |
62 |
DEPEND="${RDEPEND} |
63 |
- >=dev-cpp/eigen-2.0.3:2 |
64 |
+ dev-cpp/eigen:2 |
65 |
" |
66 |
|
67 |
-RESTRICT="test" |
68 |
+RESTRICT+=" test" |
69 |
+ |
70 |
+pkg_pretend() { |
71 |
+ kde5_pkg_pretend |
72 |
+ |
73 |
+ if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \ |
74 |
+ ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then |
75 |
+ einfo |
76 |
+ einfo "You have decided to build ${PN} with no backend." |
77 |
+ einfo "To have this application functional, please enable one of the backends via USE flag:" |
78 |
+ einfo " analitza, julia, lua, python, qalculate, R" |
79 |
+ einfo "Alternatively, install one of these:" |
80 |
+ einfo " # emerge sci-mathematics/maxima" |
81 |
+ einfo " # emerge sci-mathematics/octave" |
82 |
+ einfo |
83 |
+ fi |
84 |
+} |
85 |
|
86 |
pkg_setup() { |
87 |
use python && python_setup |
88 |
@@ -72,6 +90,7 @@ src_prepare() { |
89 |
src_configure() { |
90 |
local mycmakeargs=( |
91 |
$(cmake-utils_use_find_package analitza Analitza5) |
92 |
+ $(cmake-utils_use_find_package julia Julia) |
93 |
$(cmake-utils_use_find_package lua LuaJIT) |
94 |
$(cmake-utils_use_find_package postscript LibSpectre) |
95 |
$(cmake-utils_use_find_package python PythonLibs) |
96 |
@@ -80,16 +99,3 @@ src_configure() { |
97 |
) |
98 |
kde5_src_configure |
99 |
} |
100 |
- |
101 |
-pkg_postinst() { |
102 |
- kde5_pkg_postinst |
103 |
- |
104 |
- if ! use analitza && ! use lua && ! use python && ! use qalculate && ! use R; then |
105 |
- echo |
106 |
- ewarn "You have decided to build ${PN} with no backend." |
107 |
- ewarn "To have this application functional, please do one of below:" |
108 |
- ewarn " # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'lua', 'python', 'qalculate' or 'R' USE flag enabled" |
109 |
- ewarn " # emerge -vaDu sci-mathematics/maxima" |
110 |
- echo |
111 |
- fi |
112 |
-} |
113 |
|
114 |
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild |
115 |
index ed84d7b..022066a 100644 |
116 |
--- a/kde-apps/cantor/cantor-9999.ebuild |
117 |
+++ b/kde-apps/cantor/cantor-9999.ebuild |
118 |
@@ -13,7 +13,7 @@ inherit kde5 python-r1 |
119 |
DESCRIPTION="Interface for doing mathematics and scientific computing" |
120 |
HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor" |
121 |
KEYWORDS="" |
122 |
-IUSE="analitza lua postscript python qalculate +R" |
123 |
+IUSE="analitza julia lua postscript python qalculate +R" |
124 |
|
125 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
126 |
|
127 |
@@ -26,8 +26,8 @@ RDEPEND=" |
128 |
$(add_frameworks_dep kconfigwidgets) |
129 |
$(add_frameworks_dep kcoreaddons) |
130 |
$(add_frameworks_dep kcrash) |
131 |
- $(add_frameworks_dep kdelibs4support) |
132 |
$(add_frameworks_dep ki18n) |
133 |
+ $(add_frameworks_dep kiconthemes) |
134 |
$(add_frameworks_dep kio) |
135 |
$(add_frameworks_dep knewstuff) |
136 |
$(add_frameworks_dep kparts) |
137 |
@@ -36,11 +36,13 @@ RDEPEND=" |
138 |
$(add_frameworks_dep kwidgetsaddons) |
139 |
$(add_frameworks_dep kxmlgui) |
140 |
$(add_qt_dep qtgui) |
141 |
+ $(add_qt_dep qtprintsupport) |
142 |
$(add_qt_dep qtsvg) |
143 |
$(add_qt_dep qtwidgets) |
144 |
$(add_qt_dep qtxml) |
145 |
$(add_qt_dep qtxmlpatterns) |
146 |
analitza? ( $(add_kdeapps_dep analitza) ) |
147 |
+ julia? ( dev-lang/julia ) |
148 |
lua? ( dev-lang/luajit:2 ) |
149 |
qalculate? ( |
150 |
sci-libs/cln |
151 |
@@ -51,10 +53,26 @@ RDEPEND=" |
152 |
R? ( dev-lang/R ) |
153 |
" |
154 |
DEPEND="${RDEPEND} |
155 |
- >=dev-cpp/eigen-2.0.3:2 |
156 |
+ dev-cpp/eigen:2 |
157 |
" |
158 |
|
159 |
-RESTRICT="test" |
160 |
+RESTRICT+=" test" |
161 |
+ |
162 |
+pkg_pretend() { |
163 |
+ kde5_pkg_pretend |
164 |
+ |
165 |
+ if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \ |
166 |
+ ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then |
167 |
+ einfo |
168 |
+ einfo "You have decided to build ${PN} with no backend." |
169 |
+ einfo "To have this application functional, please enable one of the backends via USE flag:" |
170 |
+ einfo " analitza, julia, lua, python, qalculate, R" |
171 |
+ einfo "Alternatively, install one of these:" |
172 |
+ einfo " # emerge sci-mathematics/maxima" |
173 |
+ einfo " # emerge sci-mathematics/octave" |
174 |
+ einfo |
175 |
+ fi |
176 |
+} |
177 |
|
178 |
pkg_setup() { |
179 |
use python && python_setup |
180 |
@@ -72,6 +90,7 @@ src_prepare() { |
181 |
src_configure() { |
182 |
local mycmakeargs=( |
183 |
$(cmake-utils_use_find_package analitza Analitza5) |
184 |
+ $(cmake-utils_use_find_package julia Julia) |
185 |
$(cmake-utils_use_find_package lua LuaJIT) |
186 |
$(cmake-utils_use_find_package postscript LibSpectre) |
187 |
$(cmake-utils_use_find_package python PythonLibs) |
188 |
@@ -80,16 +99,3 @@ src_configure() { |
189 |
) |
190 |
kde5_src_configure |
191 |
} |
192 |
- |
193 |
-pkg_postinst() { |
194 |
- kde5_pkg_postinst |
195 |
- |
196 |
- if ! use analitza && ! use lua && ! use python && ! use qalculate && ! use R; then |
197 |
- echo |
198 |
- ewarn "You have decided to build ${PN} with no backend." |
199 |
- ewarn "To have this application functional, please do one of below:" |
200 |
- ewarn " # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'lua', 'python', 'qalculate' or 'R' USE flag enabled" |
201 |
- ewarn " # emerge -vaDu sci-mathematics/maxima" |
202 |
- echo |
203 |
- fi |
204 |
-} |
205 |
|
206 |
diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml |
207 |
index 632627c..20e3a59 100644 |
208 |
--- a/kde-apps/cantor/metadata.xml |
209 |
+++ b/kde-apps/cantor/metadata.xml |
210 |
@@ -7,6 +7,7 @@ |
211 |
</maintainer> |
212 |
<use> |
213 |
<flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag> |
214 |
+ <flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend support</flag> |
215 |
<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag> |
216 |
<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag> |
217 |
</use> |