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

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
Date: Thu, 09 May 2019 22:07:43
Message-Id: 1557438683.dbcd5c2f9cf56d201d92459200f3e3024d84bff2.asturm@gentoo
1 commit: dbcd5c2f9cf56d201d92459200f3e3024d84bff2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 9 21:41:39 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu May 9 21:51:23 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dbcd5c2f
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.49.9999.ebuild | 24 +++++++++---------------
14 kde-apps/cantor/cantor-9999.ebuild | 24 +++++++++---------------
15 2 files changed, 18 insertions(+), 30 deletions(-)
16
17 diff --git a/kde-apps/cantor/cantor-19.04.49.9999.ebuild b/kde-apps/cantor/cantor-19.04.49.9999.ebuild
18 index 601738f64c..8a32077f6f 100644
19 --- a/kde-apps/cantor/cantor-19.04.49.9999.ebuild
20 +++ b/kde-apps/cantor/cantor-19.04.49.9999.ebuild
21 @@ -5,9 +5,8 @@ EAPI=7
22
23 KDE_HANDBOOK="forceoptional"
24 KDE_TEST="forceoptional"
25 -PYTHON_COMPAT=( python2_7 )
26 -# FIXME: PYTHON_COMPAT=( python3_{5,6,7} )
27 -inherit kde5 python-r1
28 +PYTHON_COMPAT=( python3_{5,6,7} )
29 +inherit kde5 python-single-r1
30
31 DESCRIPTION="Interface for doing mathematics and scientific computing"
32 HOMEPAGE="https://kde.org/applications/education/cantor https://edu.kde.org/cantor/"
33 @@ -17,7 +16,6 @@ IUSE="+analitza julia lua markdown postscript python qalculate R"
34 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
35
36 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
37 -# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
38 DEPEND="
39 $(add_frameworks_dep karchive)
40 $(add_frameworks_dep kcompletion)
41 @@ -51,7 +49,10 @@ DEPEND="
42 sci-libs/libqalculate:=
43 )
44 postscript? ( app-text/libspectre )
45 - python? ( ${PYTHON_DEPS} )
46 + python? (
47 + ${PYTHON_DEPS}
48 + $(add_qt_dep qtdbus)
49 + )
50 R? ( dev-lang/R )
51 "
52 RDEPEND="${DEPEND}"
53 @@ -81,28 +82,21 @@ pkg_pretend() {
54 }
55
56 pkg_setup() {
57 - use python && python_setup
58 + use python && python-single-r1_pkg_setup
59 kde5_pkg_setup
60 }
61
62 -src_prepare() {
63 - kde5_src_prepare
64 -
65 - # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
66 - sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
67 - -i src/backends/CMakeLists.txt || die
68 -}
69 -
70 src_configure() {
71 use julia && addpredict /proc/self/mem # bug 602894
72
73 local mycmakeargs=(
74 + -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
75 $(cmake-utils_use_find_package analitza Analitza5)
76 $(cmake-utils_use_find_package julia Julia)
77 $(cmake-utils_use_find_package lua LuaJIT)
78 $(cmake-utils_use_find_package markdown Discount)
79 $(cmake-utils_use_find_package postscript LibSpectre)
80 - $(cmake-utils_use_find_package python PythonLibs)
81 + $(cmake-utils_use_find_package python PythonLibs3)
82 $(cmake-utils_use_find_package qalculate Qalculate)
83 $(cmake-utils_use_find_package R R)
84 )
85
86 diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
87 index 601738f64c..8a32077f6f 100644
88 --- a/kde-apps/cantor/cantor-9999.ebuild
89 +++ b/kde-apps/cantor/cantor-9999.ebuild
90 @@ -5,9 +5,8 @@ EAPI=7
91
92 KDE_HANDBOOK="forceoptional"
93 KDE_TEST="forceoptional"
94 -PYTHON_COMPAT=( python2_7 )
95 -# FIXME: PYTHON_COMPAT=( python3_{5,6,7} )
96 -inherit kde5 python-r1
97 +PYTHON_COMPAT=( python3_{5,6,7} )
98 +inherit kde5 python-single-r1
99
100 DESCRIPTION="Interface for doing mathematics and scientific computing"
101 HOMEPAGE="https://kde.org/applications/education/cantor https://edu.kde.org/cantor/"
102 @@ -17,7 +16,6 @@ IUSE="+analitza julia lua markdown postscript python qalculate R"
103 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
104
105 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
106 -# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
107 DEPEND="
108 $(add_frameworks_dep karchive)
109 $(add_frameworks_dep kcompletion)
110 @@ -51,7 +49,10 @@ DEPEND="
111 sci-libs/libqalculate:=
112 )
113 postscript? ( app-text/libspectre )
114 - python? ( ${PYTHON_DEPS} )
115 + python? (
116 + ${PYTHON_DEPS}
117 + $(add_qt_dep qtdbus)
118 + )
119 R? ( dev-lang/R )
120 "
121 RDEPEND="${DEPEND}"
122 @@ -81,28 +82,21 @@ pkg_pretend() {
123 }
124
125 pkg_setup() {
126 - use python && python_setup
127 + use python && python-single-r1_pkg_setup
128 kde5_pkg_setup
129 }
130
131 -src_prepare() {
132 - kde5_src_prepare
133 -
134 - # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
135 - sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
136 - -i src/backends/CMakeLists.txt || die
137 -}
138 -
139 src_configure() {
140 use julia && addpredict /proc/self/mem # bug 602894
141
142 local mycmakeargs=(
143 + -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
144 $(cmake-utils_use_find_package analitza Analitza5)
145 $(cmake-utils_use_find_package julia Julia)
146 $(cmake-utils_use_find_package lua LuaJIT)
147 $(cmake-utils_use_find_package markdown Discount)
148 $(cmake-utils_use_find_package postscript LibSpectre)
149 - $(cmake-utils_use_find_package python PythonLibs)
150 + $(cmake-utils_use_find_package python PythonLibs3)
151 $(cmake-utils_use_find_package qalculate Qalculate)
152 $(cmake-utils_use_find_package R R)
153 )
Report Message
Find on MARC Find on Google Groups