diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /kde-apps/cantor | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'kde-apps/cantor')
-rw-r--r-- | kde-apps/cantor/Manifest | 7 | ||||
-rw-r--r-- | kde-apps/cantor/cantor-20.04.3-r1.ebuild | 110 | ||||
-rw-r--r-- | kde-apps/cantor/cantor-20.08.3.ebuild (renamed from kde-apps/cantor/cantor-20.08.1.ebuild) | 57 | ||||
-rw-r--r-- | kde-apps/cantor/files/cantor-20.08.3-python.patch | 71 |
4 files changed, 101 insertions, 144 deletions
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest index 7d03edb35b85..c395e959f5b3 100644 --- a/kde-apps/cantor/Manifest +++ b/kde-apps/cantor/Manifest @@ -1,5 +1,4 @@ -DIST cantor-20.04.3.tar.xz 9029068 BLAKE2B c5b436304d3aa84150a0994d556318600f73ccb606b59fc67d8476828c356f54d64cda85f781c9c939403b0bb6808e2a943d37ad306fbc751800944ad27e74f4 SHA512 07351d8b4b72653394a337bc3ae5c8f8c669dd8cd66f4cf9d41bbdd25b47a8b3666f79580e319ef56c878ab626ce959d825b4a34243c5f639de96674a1bc111d -DIST cantor-20.08.1.tar.xz 9078272 BLAKE2B 13134da1df4753fc00faf0ff354a1fc0ff489e7233573496bb88a6dbd6b1d3a48e7ef82cedc0936e34ad58039046dc64450de99166d9738afdf98adf13ef0681 SHA512 7f3193753a3368940cad14b51cb920f59a2c5550ef2ae527869c1011b238533e15b0d89b47c29b383d623709e7576457d9bc803a63124c641e58871115e72d6c -EBUILD cantor-20.04.3-r1.ebuild 3208 BLAKE2B 4f898e218a51e89ac90d09a049b293d1754853b2eaee14efbeb889f9bc10e1651873832eb9243c027f00a11abff6147f5bc97695cadf78d234ea5b3a46486c88 SHA512 4b451a499178fd8efc23455f2ef344f6f3fba7d541c2401c798a905479c2d853bb463bc1a7f801c0edf93d90ee98e6149423e52da843b012eb681d767c281989 -EBUILD cantor-20.08.1.ebuild 3199 BLAKE2B 70a26b36ae09ab13280b20dcaafd739360b8113df97b4133065abd4f504184fc7ba0f1599e35370d4c92efa777c16b84dfbbe016cbaa80032890e056d3967a31 SHA512 2c707f803b8fae9ae5cfdcf8aad59ba3ba3dc9c31986ab96f71f2425e2e30f0f17467d55830306cf0e4b6f0eeb18e1072b3d962cddaa3de452f0521f0ef6dc63 +AUX cantor-20.08.3-python.patch 2597 BLAKE2B b92ddb263a4eda184811a597ec26db479ba4b5f6887ccff6b6655f48e5b1a3a8c9b7791f7aba17c222d76229d1734039f3421453067cb0700ca39f8c68b60c6f SHA512 5444255c1c186bb07dccd6def392f6e0ea4d894d1205bef19bba15e06993e730be175960e1bb8efd19d51ac6671e485e23ff78a441d941e99f8bc9d96dc9044f +DIST cantor-20.08.3.tar.xz 9082332 BLAKE2B 7ea84959559e109a28794d1f610e07936de353c08e7732a90c6f8145828df99d6b408006580e367208e135c3d76530bdb02716c873a4adf491912ef07b470350 SHA512 8558bb6b3e6641c1c575a4f5f0b1db7f6d6003ed011432f555ee0954586f0cd3a0d1d897d55114dd29cd9aa58d7e6d7ffb9a2357b1e96c01bbf2b4f3623174dd +EBUILD cantor-20.08.3.ebuild 2926 BLAKE2B c13d8bd379b3f88099bff6ce5adbac7902455b6b712c7e9f967b689044a19a207d8c142316afae9591d8009e86201fbf7a053161a7241443986a3c8f5e3e80c7 SHA512 9b712cd2be6aec653497240e5b3985884750462d19568d1bdd296c62c5eaafd44e82e0c4cc7a9a20b11255955e48130637d65d222fd82ba8b2a95c3aa1581117 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53 diff --git a/kde-apps/cantor/cantor-20.04.3-r1.ebuild b/kde-apps/cantor/cantor-20.04.3-r1.ebuild deleted file mode 100644 index fa579218619c..000000000000 --- a/kde-apps/cantor/cantor-20.04.3-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{7,8} ) -PVCUT=$(ver_cut 1-3) -KFMIN=5.70.0 -QTMIN=5.14.2 -inherit ecm kde.org python-single-r1 - -DESCRIPTION="Interface for doing mathematics and scientific computing" -HOMEPAGE="https://kde.org/applications/education/org.kde.cantor -https://edu.kde.org/cantor/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 x86" -IUSE="+analitza julia lua postscript python qalculate R" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# TODO Add Sage Mathematics Software backend (http://www.sagemath.org) -DEPEND=" - app-text/poppler[qt5] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) - julia? ( dev-lang/julia ) - lua? ( dev-lang/luajit:2 ) - qalculate? ( - sci-libs/cln - sci-libs/libqalculate:= - ) - postscript? ( app-text/libspectre ) - python? ( - ${PYTHON_DEPS} - >=dev-qt/qtdbus-${QTMIN}:5 - ) - R? ( dev-lang/R ) -" -RDEPEND="${DEPEND}" - -RESTRICT+=" test" - -pkg_pretend() { - ecm_pkg_pretend - - if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \ - ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then - elog "You have decided to build ${PN} with no backend." - elog "To have this application functional, please enable one of the backends via USE flag:" - elog " analitza, lua, python, qalculate, R" - elog "Alternatively, install one of these:" - elog " # emerge sci-mathematics/maxima (bug #619534)" - elog " # emerge sci-mathematics/octave" - elog "Experimental available USE flag:" - elog " julia (not stable, bug #613576)" - elog - fi - - if ! has_version virtual/latex-base; then - elog "For LaTeX support:" - elog " # emerge virtual/latex-base" - fi -} - -pkg_setup() { - use python && python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_configure() { - use julia && addpredict /proc/self/mem # bug 602894 - - local mycmakeargs=( - $(cmake_use_find_package analitza Analitza5) - $(cmake_use_find_package julia Julia) - $(cmake_use_find_package lua LuaJIT) - $(cmake_use_find_package postscript LibSpectre) - $(cmake_use_find_package python PythonLibs3) - $(cmake_use_find_package qalculate Qalculate) - $(cmake_use_find_package R R) - ) - ecm_src_configure -} diff --git a/kde-apps/cantor/cantor-20.08.1.ebuild b/kde-apps/cantor/cantor-20.08.3.ebuild index f4e32e0c2d11..09094f1a82bb 100644 --- a/kde-apps/cantor/cantor-20.08.1.ebuild +++ b/kde-apps/cantor/cantor-20.08.3.ebuild @@ -6,19 +6,18 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) PVCUT=$(ver_cut 1-3) -KFMIN=5.72.0 -QTMIN=5.14.2 -inherit ecm kde.org python-single-r1 +KFMIN=5.74.0 +QTMIN=5.15.1 +inherit ecm kde.org optfeature python-single-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" -HOMEPAGE="https://kde.org/applications/education/org.kde.cantor -https://edu.kde.org/cantor/" +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} )" @@ -63,31 +62,18 @@ DEPEND=" ) R? ( dev-lang/R ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? ( + || ( + sci-mathematics/maxima + sci-mathematics/octave + ) + ) ) ) ) ) ) +" RESTRICT+=" test" -pkg_pretend() { - ecm_pkg_pretend - - if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \ - ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then - elog "You have decided to build ${PN} with no backend." - elog "To have this application functional, please enable one of the backends via USE flag:" - elog " analitza, lua, python, qalculate, R" - elog "Alternatively, install one of these:" - elog " # emerge sci-mathematics/maxima (bug #619534)" - elog " # emerge sci-mathematics/octave" - elog "Experimental available USE flag:" - elog " julia (not stable, bug #613576)" - elog - fi - - if ! has_version virtual/latex-base; then - elog "For LaTeX support:" - elog " # emerge virtual/latex-base" - fi -} +PATCHES=( "${FILESDIR}/${PN}-20.08.3-python.patch" ) pkg_setup() { use python && python-single-r1_pkg_setup @@ -102,9 +88,20 @@ src_configure() { $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) -DUSE_LIBSPECTRE=$(usex postscript) - $(cmake_use_find_package python PythonLibs3) + $(cmake_use_find_package python Python3) $(cmake_use_find_package qalculate Qalculate) $(cmake_use_find_package R R) ) + 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 + fi + ecm_pkg_postinst +} diff --git a/kde-apps/cantor/files/cantor-20.08.3-python.patch b/kde-apps/cantor/files/cantor-20.08.3-python.patch new file mode 100644 index 000000000000..c0dc3804c83c --- /dev/null +++ b/kde-apps/cantor/files/cantor-20.08.3-python.patch @@ -0,0 +1,71 @@ +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 + |