diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /kde-apps/cantor | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'kde-apps/cantor')
-rw-r--r-- | kde-apps/cantor/Manifest | 7 | ||||
-rw-r--r-- | kde-apps/cantor/cantor-20.12.3.ebuild | 3 | ||||
-rw-r--r-- | kde-apps/cantor/cantor-21.04.0.ebuild (renamed from kde-apps/cantor/cantor-20.08.3.ebuild) | 25 | ||||
-rw-r--r-- | kde-apps/cantor/files/cantor-20.08.3-python.patch | 71 |
4 files changed, 18 insertions, 88 deletions
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest index 8e54da80384b..5759ded5f025 100644 --- a/kde-apps/cantor/Manifest +++ b/kde-apps/cantor/Manifest @@ -1,6 +1,5 @@ -AUX cantor-20.08.3-python.patch 2597 BLAKE2B b92ddb263a4eda184811a597ec26db479ba4b5f6887ccff6b6655f48e5b1a3a8c9b7791f7aba17c222d76229d1734039f3421453067cb0700ca39f8c68b60c6f SHA512 5444255c1c186bb07dccd6def392f6e0ea4d894d1205bef19bba15e06993e730be175960e1bb8efd19d51ac6671e485e23ff78a441d941e99f8bc9d96dc9044f -DIST cantor-20.08.3.tar.xz 9082332 BLAKE2B 7ea84959559e109a28794d1f610e07936de353c08e7732a90c6f8145828df99d6b408006580e367208e135c3d76530bdb02716c873a4adf491912ef07b470350 SHA512 8558bb6b3e6641c1c575a4f5f0b1db7f6d6003ed011432f555ee0954586f0cd3a0d1d897d55114dd29cd9aa58d7e6d7ffb9a2357b1e96c01bbf2b4f3623174dd DIST cantor-20.12.3.tar.xz 9128948 BLAKE2B 9cc4c6b28ea1f9946ad6d4eeac98b5c47b17b16efc434f355ba2a0f71b23afd4a58ab31df12a881e2a35e836901075d197ad9550409a97f025efdbd21ac919de SHA512 35461a47c9ce4aa4de8ca8496ca33c42691db6be927f30018e174f3234a485c436cca90b6362c8ba325f8bc220a09079069278bdfd08f4510dd7d12ee1a39ed7 -EBUILD cantor-20.08.3.ebuild 2926 BLAKE2B c13d8bd379b3f88099bff6ce5adbac7902455b6b712c7e9f967b689044a19a207d8c142316afae9591d8009e86201fbf7a053161a7241443986a3c8f5e3e80c7 SHA512 9b712cd2be6aec653497240e5b3985884750462d19568d1bdd296c62c5eaafd44e82e0c4cc7a9a20b11255955e48130637d65d222fd82ba8b2a95c3aa1581117 -EBUILD cantor-20.12.3.ebuild 3104 BLAKE2B c8a46d6ab9274faf53f1228dec7265358bb7b4f7b69f0277a97b8b92215f34b525ea7a9c0d8119e3f62b6a87959b431bfc251614c659c6e2615690531960bed8 SHA512 44a2960b4e93d602023eed98ecb63e96249bffef7c9b08a7b993f5be538c4a5c3500709dd7727d811e7acb46ceccb7ef015d3243f81273e3af5a0f7127e8c4ce +DIST cantor-21.04.0.tar.xz 9133736 BLAKE2B afa21074188d4d61503592f9d15f25077ea63bcc696cc86c55a823ef4db09a087cbf4369ecff7d691cbaa4adfffa083ff48104c94d8df9459d3fb46aaff821c3 SHA512 c6cc1c29d4455c1709b184e3a92b4fd81ae213f5a762a381f5174378820e3c1419b9c2477b5b4a9951eee91c552d1a59f4754dc8f49d71310ac7da06399f82d3 +EBUILD cantor-20.12.3.ebuild 3069 BLAKE2B b1dba899bd3e61a759e8765806c45a06a0ebca38b585e802bb452a297d7d3beea49fbce774dcdd6158bb81c5816c0bc122babbecb0eaa63d8ebe5c6cc2311d62 SHA512 d1b02c92e0fa15492c63c4139f4d2a41156e0538793580d61c9624a876bbe43edf58938815abbc518440556065f0e1b2e5aa01409066b4d7c2040a17dac550d0 +EBUILD cantor-21.04.0.ebuild 3072 BLAKE2B b8c36f2d9c1ddd225d499e5a6a76d4524847ee88511449c4fca7acd54780720737f3b0a40f79af9556eb7891047ade239da5f6264bbea259cc1fe8ea6a1dc714 SHA512 0e0a4db378866e9dc667269ab1bacd907d890fb43b7d25747e3bdeb5795d5abd2c9b81807037211450ff58e2becb99528afac1b20b331c3f2a4e2e932d138f4d MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53 diff --git a/kde-apps/cantor/cantor-20.12.3.ebuild b/kde-apps/cantor/cantor-20.12.3.ebuild index 1b56dc9a352b..50fdcdc98e87 100644 --- a/kde-apps/cantor/cantor-20.12.3.ebuild +++ b/kde-apps/cantor/cantor-20.12.3.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://apps.kde.org/en/cantor https://edu.kde.org/cantor/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="+analitza julia lua postscript python qalculate R" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" @@ -102,7 +102,6 @@ src_configure() { pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "Optional dependencies:" optfeature "Maxima backend" sci-mathematics/maxima optfeature "Octave backend" sci-mathematics/octave optfeature "LaTeX support" virtual/latex-base diff --git a/kde-apps/cantor/cantor-20.08.3.ebuild b/kde-apps/cantor/cantor-21.04.0.ebuild index 09094f1a82bb..677b39e44709 100644 --- a/kde-apps/cantor/cantor-20.08.3.ebuild +++ b/kde-apps/cantor/cantor-21.04.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,23 +6,24 @@ 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.74.0 -QTMIN=5.15.1 -inherit ecm kde.org optfeature python-single-r1 +KFMIN=5.80.0 +QTMIN=5.15.2 +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/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 arm64 x86" +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:= @@ -73,9 +74,8 @@ RDEPEND="${DEPEND} RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-20.08.3-python.patch" ) - pkg_setup() { + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup ecm_pkg_setup } @@ -92,13 +92,16 @@ 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 } pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "Optional dependencies:" optfeature "Maxima backend" sci-mathematics/maxima optfeature "Octave backend" sci-mathematics/octave optfeature "LaTeX support" virtual/latex-base diff --git a/kde-apps/cantor/files/cantor-20.08.3-python.patch b/kde-apps/cantor/files/cantor-20.08.3-python.patch deleted file mode 100644 index c0dc3804c83c..000000000000 --- a/kde-apps/cantor/files/cantor-20.08.3-python.patch +++ /dev/null @@ -1,71 +0,0 @@ -From c794fb5f0f616ce2d9e4004fc459a1c50f077470 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 11 Oct 2020 22:47:55 +0200 -Subject: [PATCH] Use CMake FindPython3 module, raises minimum CMake to 3.12 - -Gives us out-of-the-box future proof python detection (python-3.9 right now). ---- - CMakeLists.txt | 2 +- - src/backends/CMakeLists.txt | 10 ++++------ - src/backends/python/CMakeLists.txt | 4 +--- - 3 files changed, 6 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e96e6df0..a90328b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.5 FATAL_ERROR) -+cmake_minimum_required (VERSION 3.12 FATAL_ERROR) - - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt -index e99e1731..9b6b615e 100644 ---- a/src/backends/CMakeLists.txt -+++ b/src/backends/CMakeLists.txt -@@ -50,15 +50,13 @@ if(QALCULATE_FOUND) - add_subdirectory(qalculate) - endif(QALCULATE_FOUND) - --set_package_properties(PythonLibs3 PROPERTIES DESCRIPTION "A powerful dynamic programming language." -- URL "https://www.python.org/" -- TYPE OPTIONAL -+set_package_properties(Python3 PROPERTIES TYPE OPTIONAL - PURPOSE "Backend to use Python with Cantor.") - --find_package(PythonLibs3) --if(PYTHONLIBS3_FOUND) -+find_package(Python3 COMPONENTS Interpreter Development) -+if(Python3_FOUND) - add_subdirectory(python) --endif(PYTHONLIBS3_FOUND) -+endif() - - set_package_properties(LuaJIT PROPERTIES DESCRIPTION "A lightweight, extensible programming language (luajit implementation)." - URL "https://www.lua.org/" -diff --git a/src/backends/python/CMakeLists.txt b/src/backends/python/CMakeLists.txt -index 04b4c313..c7868561 100644 ---- a/src/backends/python/CMakeLists.txt -+++ b/src/backends/python/CMakeLists.txt -@@ -14,8 +14,6 @@ set(PythonServer_SRCS - pythonserver.cpp - ) - --include_directories(${PYTHONLIBS3_INCLUDE_DIRS}) -- - qt5_add_resources(PythonBackend_RSCS python.qrc) - ki18n_wrap_ui(PythonBackend_SRCS settings.ui) - kconfig_add_kcfg_files(PythonBackend_SRCS settings.kcfgc) -@@ -34,7 +32,7 @@ set_target_properties(cantor_pythonserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH - if(MSVC) - set_property(TARGET cantor_pythonserver PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE") - endif() --target_link_libraries(cantor_pythonserver ${PYTHONLIBS3_LIBRARIES}) -+target_link_libraries(cantor_pythonserver Python3::Python) - - if(BUILD_TESTING) - add_executable(testpython testpython.cpp settings.cpp) --- -2.28.0 - |