1 |
commit: 1316e9572318eef731d853e32bfae5ad15c648f3 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 28 15:59:11 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 29 19:54:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1316e957 |
7 |
|
8 |
kde-apps/cantor: Migrate to lua-single.eclass |
9 |
|
10 |
Bug: https://bugs.gentoo.org/752735 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
kde-apps/cantor/cantor-20.12.0.ebuild | 14 ++++++++++---- |
15 |
1 file changed, 10 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/kde-apps/cantor/cantor-20.12.0.ebuild b/kde-apps/cantor/cantor-20.12.0.ebuild |
18 |
index f8c2cd2064c..066493ac4f7 100644 |
19 |
--- a/kde-apps/cantor/cantor-20.12.0.ebuild |
20 |
+++ b/kde-apps/cantor/cantor-20.12.0.ebuild |
21 |
@@ -6,11 +6,12 @@ EAPI=7 |
22 |
CMAKE_MAKEFILE_GENERATOR="emake" |
23 |
ECM_HANDBOOK="forceoptional" |
24 |
ECM_TEST="forceoptional" |
25 |
+LUA_COMPAT=( luajit ) |
26 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
27 |
PVCUT=$(ver_cut 1-3) |
28 |
KFMIN=5.75.0 |
29 |
QTMIN=5.15.1 |
30 |
-inherit ecm kde.org optfeature python-single-r1 |
31 |
+inherit ecm kde.org lua-single optfeature python-single-r1 |
32 |
|
33 |
DESCRIPTION="Interface for doing mathematics and scientific computing" |
34 |
HOMEPAGE="https://apps.kde.org/en/cantor https://edu.kde.org/cantor/" |
35 |
@@ -20,9 +21,9 @@ SLOT="5" |
36 |
KEYWORDS="~amd64 ~arm64 ~x86" |
37 |
IUSE="+analitza julia lua postscript python qalculate R" |
38 |
|
39 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
40 |
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" |
41 |
|
42 |
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org) |
43 |
+# TODO Add Sage Mathematics Software backend (https://www.sagemath.org) |
44 |
DEPEND=" |
45 |
app-text/poppler[qt5] |
46 |
>=dev-qt/qtgui-${QTMIN}:5 |
47 |
@@ -50,7 +51,7 @@ DEPEND=" |
48 |
>=kde-frameworks/syntax-highlighting-${KFMIN}:5 |
49 |
analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) |
50 |
julia? ( dev-lang/julia ) |
51 |
- lua? ( dev-lang/luajit:2 ) |
52 |
+ lua? ( ${LUA_DEPS} ) |
53 |
qalculate? ( |
54 |
sci-libs/cln |
55 |
sci-libs/libqalculate:= |
56 |
@@ -74,6 +75,7 @@ RDEPEND="${DEPEND} |
57 |
RESTRICT+=" test" |
58 |
|
59 |
pkg_setup() { |
60 |
+ use lua && lua-single_pkg_setup |
61 |
use python && python-single-r1_pkg_setup |
62 |
ecm_pkg_setup |
63 |
} |
64 |
@@ -90,6 +92,10 @@ src_configure() { |
65 |
$(cmake_use_find_package qalculate Qalculate) |
66 |
$(cmake_use_find_package R R) |
67 |
) |
68 |
+ use lua && mycmakeargs+=( |
69 |
+ -DLUAJIT_INCLUDEDIR="${EPREFIX}/$(lua_get_include_dir)" |
70 |
+ -DLUAJIT_LIBDIR="${EPREFIX}/$(lua_get_cmod_dir)" |
71 |
+ ) |
72 |
use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" ) |
73 |
ecm_src_configure |
74 |
} |