| 1 |
commit: 005287b8721073d616f9aa294c81d7d32d0c44c7 |
| 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: Mon Dec 28 15:59:11 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=005287b8 |
| 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.49.9999.ebuild | 14 ++++++++++---- |
| 15 |
kde-apps/cantor/cantor-9999.ebuild | 14 ++++++++++---- |
| 16 |
2 files changed, 20 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/cantor/cantor-20.12.49.9999.ebuild b/kde-apps/cantor/cantor-20.12.49.9999.ebuild |
| 19 |
index 022dd14d94..c9d06f1a21 100644 |
| 20 |
--- a/kde-apps/cantor/cantor-20.12.49.9999.ebuild |
| 21 |
+++ b/kde-apps/cantor/cantor-20.12.49.9999.ebuild |
| 22 |
@@ -6,11 +6,12 @@ EAPI=7 |
| 23 |
CMAKE_MAKEFILE_GENERATOR="emake" |
| 24 |
ECM_HANDBOOK="forceoptional" |
| 25 |
ECM_TEST="forceoptional" |
| 26 |
+LUA_COMPAT=( luajit ) |
| 27 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 28 |
PVCUT=$(ver_cut 1-3) |
| 29 |
KFMIN=5.75.0 |
| 30 |
QTMIN=5.15.1 |
| 31 |
-inherit ecm kde.org optfeature python-single-r1 |
| 32 |
+inherit ecm kde.org lua-single optfeature python-single-r1 |
| 33 |
|
| 34 |
DESCRIPTION="Interface for doing mathematics and scientific computing" |
| 35 |
HOMEPAGE="https://apps.kde.org/en/cantor https://edu.kde.org/cantor/" |
| 36 |
@@ -20,9 +21,9 @@ SLOT="5" |
| 37 |
KEYWORDS="" |
| 38 |
IUSE="+analitza julia lua postscript python qalculate R" |
| 39 |
|
| 40 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 41 |
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" |
| 42 |
|
| 43 |
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org) |
| 44 |
+# TODO Add Sage Mathematics Software backend (https://www.sagemath.org) |
| 45 |
DEPEND=" |
| 46 |
app-text/poppler[qt5] |
| 47 |
>=dev-qt/qtgui-${QTMIN}:5 |
| 48 |
@@ -50,7 +51,7 @@ DEPEND=" |
| 49 |
>=kde-frameworks/syntax-highlighting-${KFMIN}:5 |
| 50 |
analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) |
| 51 |
julia? ( dev-lang/julia ) |
| 52 |
- lua? ( dev-lang/luajit:2 ) |
| 53 |
+ lua? ( ${LUA_DEPS} ) |
| 54 |
qalculate? ( |
| 55 |
sci-libs/cln |
| 56 |
sci-libs/libqalculate:= |
| 57 |
@@ -74,6 +75,7 @@ RDEPEND="${DEPEND} |
| 58 |
RESTRICT+=" test" |
| 59 |
|
| 60 |
pkg_setup() { |
| 61 |
+ use lua && lua-single_pkg_setup |
| 62 |
use python && python-single-r1_pkg_setup |
| 63 |
ecm_pkg_setup |
| 64 |
} |
| 65 |
@@ -90,6 +92,10 @@ src_configure() { |
| 66 |
$(cmake_use_find_package qalculate Qalculate) |
| 67 |
$(cmake_use_find_package R R) |
| 68 |
) |
| 69 |
+ use lua && mycmakeargs+=( |
| 70 |
+ -DLUAJIT_INCLUDEDIR="${EPREFIX}/$(lua_get_include_dir)" |
| 71 |
+ -DLUAJIT_LIBDIR="${EPREFIX}/$(lua_get_cmod_dir)" |
| 72 |
+ ) |
| 73 |
use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" ) |
| 74 |
ecm_src_configure |
| 75 |
} |
| 76 |
|
| 77 |
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild |
| 78 |
index 022dd14d94..c9d06f1a21 100644 |
| 79 |
--- a/kde-apps/cantor/cantor-9999.ebuild |
| 80 |
+++ b/kde-apps/cantor/cantor-9999.ebuild |
| 81 |
@@ -6,11 +6,12 @@ EAPI=7 |
| 82 |
CMAKE_MAKEFILE_GENERATOR="emake" |
| 83 |
ECM_HANDBOOK="forceoptional" |
| 84 |
ECM_TEST="forceoptional" |
| 85 |
+LUA_COMPAT=( luajit ) |
| 86 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 87 |
PVCUT=$(ver_cut 1-3) |
| 88 |
KFMIN=5.75.0 |
| 89 |
QTMIN=5.15.1 |
| 90 |
-inherit ecm kde.org optfeature python-single-r1 |
| 91 |
+inherit ecm kde.org lua-single optfeature python-single-r1 |
| 92 |
|
| 93 |
DESCRIPTION="Interface for doing mathematics and scientific computing" |
| 94 |
HOMEPAGE="https://apps.kde.org/en/cantor https://edu.kde.org/cantor/" |
| 95 |
@@ -20,9 +21,9 @@ SLOT="5" |
| 96 |
KEYWORDS="" |
| 97 |
IUSE="+analitza julia lua postscript python qalculate R" |
| 98 |
|
| 99 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 100 |
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" |
| 101 |
|
| 102 |
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org) |
| 103 |
+# TODO Add Sage Mathematics Software backend (https://www.sagemath.org) |
| 104 |
DEPEND=" |
| 105 |
app-text/poppler[qt5] |
| 106 |
>=dev-qt/qtgui-${QTMIN}:5 |
| 107 |
@@ -50,7 +51,7 @@ DEPEND=" |
| 108 |
>=kde-frameworks/syntax-highlighting-${KFMIN}:5 |
| 109 |
analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) |
| 110 |
julia? ( dev-lang/julia ) |
| 111 |
- lua? ( dev-lang/luajit:2 ) |
| 112 |
+ lua? ( ${LUA_DEPS} ) |
| 113 |
qalculate? ( |
| 114 |
sci-libs/cln |
| 115 |
sci-libs/libqalculate:= |
| 116 |
@@ -74,6 +75,7 @@ RDEPEND="${DEPEND} |
| 117 |
RESTRICT+=" test" |
| 118 |
|
| 119 |
pkg_setup() { |
| 120 |
+ use lua && lua-single_pkg_setup |
| 121 |
use python && python-single-r1_pkg_setup |
| 122 |
ecm_pkg_setup |
| 123 |
} |
| 124 |
@@ -90,6 +92,10 @@ src_configure() { |
| 125 |
$(cmake_use_find_package qalculate Qalculate) |
| 126 |
$(cmake_use_find_package R R) |
| 127 |
) |
| 128 |
+ use lua && mycmakeargs+=( |
| 129 |
+ -DLUAJIT_INCLUDEDIR="${EPREFIX}/$(lua_get_include_dir)" |
| 130 |
+ -DLUAJIT_LIBDIR="${EPREFIX}/$(lua_get_cmod_dir)" |
| 131 |
+ ) |
| 132 |
use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" ) |
| 133 |
ecm_src_configure |
| 134 |
} |
Archives