1 |
commit: 6cba2808cb4d28157f57ef7c8dbfb22b39dfc002 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 9 22:07:16 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 9 22:08:14 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cba2808 |
7 |
|
8 |
kde-apps/cantor: Switch to python3_{5,6,7} |
9 |
|
10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
kde-apps/cantor/cantor-19.04.1.ebuild | 24 +++++++++--------------- |
14 |
1 file changed, 9 insertions(+), 15 deletions(-) |
15 |
|
16 |
diff --git a/kde-apps/cantor/cantor-19.04.1.ebuild b/kde-apps/cantor/cantor-19.04.1.ebuild |
17 |
index 774b4d25871..181b280d4be 100644 |
18 |
--- a/kde-apps/cantor/cantor-19.04.1.ebuild |
19 |
+++ b/kde-apps/cantor/cantor-19.04.1.ebuild |
20 |
@@ -5,9 +5,8 @@ EAPI=7 |
21 |
|
22 |
KDE_HANDBOOK="forceoptional" |
23 |
KDE_TEST="forceoptional" |
24 |
-PYTHON_COMPAT=( python2_7 ) |
25 |
-# FIXME: PYTHON_COMPAT=( python3_{5,6,7} ) |
26 |
-inherit kde5 python-r1 |
27 |
+PYTHON_COMPAT=( python3_{5,6,7} ) |
28 |
+inherit kde5 python-single-r1 |
29 |
|
30 |
DESCRIPTION="Interface for doing mathematics and scientific computing" |
31 |
HOMEPAGE="https://kde.org/applications/education/cantor https://edu.kde.org/cantor/" |
32 |
@@ -17,7 +16,6 @@ IUSE="+analitza julia lua markdown postscript python qalculate R" |
33 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
34 |
|
35 |
# TODO Add Sage Mathematics Software backend (http://www.sagemath.org) |
36 |
-# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*') |
37 |
DEPEND=" |
38 |
$(add_frameworks_dep karchive) |
39 |
$(add_frameworks_dep kcompletion) |
40 |
@@ -51,7 +49,10 @@ DEPEND=" |
41 |
sci-libs/libqalculate:= |
42 |
) |
43 |
postscript? ( app-text/libspectre ) |
44 |
- python? ( ${PYTHON_DEPS} ) |
45 |
+ python? ( |
46 |
+ ${PYTHON_DEPS} |
47 |
+ $(add_qt_dep qtdbus) |
48 |
+ ) |
49 |
R? ( dev-lang/R ) |
50 |
" |
51 |
RDEPEND="${DEPEND}" |
52 |
@@ -81,28 +82,21 @@ pkg_pretend() { |
53 |
} |
54 |
|
55 |
pkg_setup() { |
56 |
- use python && python_setup |
57 |
+ use python && python-single-r1_pkg_setup |
58 |
kde5_pkg_setup |
59 |
} |
60 |
|
61 |
-src_prepare() { |
62 |
- kde5_src_prepare |
63 |
- |
64 |
- # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo |
65 |
- sed -e "/^find_package(PythonLibs3)/ s/^/#/" \ |
66 |
- -i src/backends/CMakeLists.txt || die |
67 |
-} |
68 |
- |
69 |
src_configure() { |
70 |
use julia && addpredict /proc/self/mem # bug 602894 |
71 |
|
72 |
local mycmakeargs=( |
73 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON |
74 |
$(cmake-utils_use_find_package analitza Analitza5) |
75 |
$(cmake-utils_use_find_package julia Julia) |
76 |
$(cmake-utils_use_find_package lua LuaJIT) |
77 |
$(cmake-utils_use_find_package markdown Discount) |
78 |
$(cmake-utils_use_find_package postscript LibSpectre) |
79 |
- $(cmake-utils_use_find_package python PythonLibs) |
80 |
+ $(cmake-utils_use_find_package python PythonLibs3) |
81 |
$(cmake-utils_use_find_package qalculate Qalculate) |
82 |
$(cmake-utils_use_find_package R R) |
83 |
) |