From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 1 Jan 2021 21:06:00 +0000
Subject: gentoo new year resync : 01.01.2021

---
 kde-apps/cantor/Manifest              |  2 +-
 kde-apps/cantor/cantor-20.12.0.ebuild | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'kde-apps/cantor')

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 9ba5fafe2f6c..1ee886ff72f9 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -2,5 +2,5 @@ AUX cantor-20.08.3-python.patch 2597 BLAKE2B b92ddb263a4eda184811a597ec26db479ba
 DIST cantor-20.08.3.tar.xz 9082332 BLAKE2B 7ea84959559e109a28794d1f610e07936de353c08e7732a90c6f8145828df99d6b408006580e367208e135c3d76530bdb02716c873a4adf491912ef07b470350 SHA512 8558bb6b3e6641c1c575a4f5f0b1db7f6d6003ed011432f555ee0954586f0cd3a0d1d897d55114dd29cd9aa58d7e6d7ffb9a2357b1e96c01bbf2b4f3623174dd
 DIST cantor-20.12.0.tar.xz 9102652 BLAKE2B b4abda0e34abc34bd46fe3a5d2ae79a6a3d9d601f3118bb7ef7e20afbdd2ad7d4b6477ece2bcafaf65a9755fa17d34cad8ba5378d55a5cd25ff385bfe6324d17 SHA512 1edea13034d4b9038feb66ee3b8e1f938cced7e30bdd5de1fe5007f5b32e3c5bec1f27bce2ca5bdaa228b9abaa486a044c6be230e19d0310e7adaa7b3b2826b4
 EBUILD cantor-20.08.3.ebuild 2926 BLAKE2B c13d8bd379b3f88099bff6ce5adbac7902455b6b712c7e9f967b689044a19a207d8c142316afae9591d8009e86201fbf7a053161a7241443986a3c8f5e3e80c7 SHA512 9b712cd2be6aec653497240e5b3985884750462d19568d1bdd296c62c5eaafd44e82e0c4cc7a9a20b11255955e48130637d65d222fd82ba8b2a95c3aa1581117
-EBUILD cantor-20.12.0.ebuild 2875 BLAKE2B 661316d19b7b49556b4ffab51bda9a40b504078b744c75751cd966907057488bd9df7cece9500b35e46dd1c2d8b249082eb7c4a66cd60cb52e2b63983d3fc07c SHA512 63ba5fc3d88f2ae4d496dee20560308652354f5bf5237537b85a92d3ed2e7095cbd8e0a13a2c1c31a400bfd89e9ab2e2650bce50f6cdc906423ccc1055e6dcfc
+EBUILD cantor-20.12.0.ebuild 3104 BLAKE2B 01e76913d834bcfe94cb6666e7c61672cf378008394f539ee1302595f5793de9b22de6d55f981e4e8887df72feff94def06ecabe938003a5528827afc499202f SHA512 b24ef1297801730676b5ddcaf0298922c5b200802f7544fcd661e564f17dc7c3411807b1354b7e475cc2236d23f841f1ba291bad28cdfaa02923b792a251590a
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-20.12.0.ebuild b/kde-apps/cantor/cantor-20.12.0.ebuild
index f8c2cd2064cc..066493ac4f71 100644
--- a/kde-apps/cantor/cantor-20.12.0.ebuild
+++ b/kde-apps/cantor/cantor-20.12.0.ebuild
@@ -6,11 +6,12 @@ EAPI=7
 CMAKE_MAKEFILE_GENERATOR="emake"
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
+LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{7,8,9} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
 QTMIN=5.15.1
-inherit ecm kde.org optfeature python-single-r1
+inherit ecm kde.org lua-single optfeature python-single-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"
 HOMEPAGE="https://apps.kde.org/en/cantor https://edu.kde.org/cantor/"
@@ -20,9 +21,9 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+analitza julia lua postscript python qalculate R"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
 
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+# TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
 DEPEND="
 	app-text/poppler[qt5]
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -50,7 +51,7 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
 	julia? ( dev-lang/julia )
-	lua? ( dev-lang/luajit:2 )
+	lua? ( ${LUA_DEPS} )
 	qalculate? (
 		sci-libs/cln
 		sci-libs/libqalculate:=
@@ -74,6 +75,7 @@ RDEPEND="${DEPEND}
 RESTRICT+=" test"
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 	ecm_pkg_setup
 }
@@ -90,6 +92,10 @@ src_configure() {
 		$(cmake_use_find_package qalculate Qalculate)
 		$(cmake_use_find_package R R)
 	)
+	use lua && mycmakeargs+=(
+		-DLUAJIT_INCLUDEDIR="${EPREFIX}/$(lua_get_include_dir)"
+		-DLUAJIT_LIBDIR="${EPREFIX}/$(lua_get_cmod_dir)"
+	)
 	use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
 	ecm_src_configure
 }
-- 
cgit v1.2.3