diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
| commit | eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch) | |
| tree | 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /kde-apps/cantor | |
| parent | a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff) | |
gentoo resync : 18.05.2019
Diffstat (limited to 'kde-apps/cantor')
| -rw-r--r-- | kde-apps/cantor/Manifest | 4 | ||||
| -rw-r--r-- | kde-apps/cantor/cantor-19.04.1.ebuild (renamed from kde-apps/cantor/cantor-19.04.0.ebuild) | 24 |
2 files changed, 11 insertions, 17 deletions
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest index 36ef32226185..0c06597387a8 100644 --- a/kde-apps/cantor/Manifest +++ b/kde-apps/cantor/Manifest @@ -1,5 +1,5 @@ DIST cantor-18.12.3.tar.xz 2515580 BLAKE2B caff71f7ec631129424f3b6e9e28b22007faaab607260359d9b3bf12f6478d773a953c9e6b918601ea74eaee6056e5b11264745e73409b3b616c8f61ec35818e SHA512 196d47adef9cb35c1816efa0a88dcf904ac7b91176bde779f84c40315732bbc1196c21dff4a6c363cbf6fc4785aaa512590638a965c79c50574b264a4d7beccf -DIST cantor-19.04.0.tar.xz 2523240 BLAKE2B fb03c56228fa326cfe31937396852cc80b1d826f79b73c629319efe68a2819e395a34063a558e12d1107561555b33be9b37f45007e5e759abde29d26885b62ed SHA512 affed3d29e6af9a98ea60400c8ab3d8835d60f47f960d1453c6173ebe2eab0146b625269d66380e2ffd4c5a1bf7326b56750a0d4acb2aeed1627be8c6d0818e2 +DIST cantor-19.04.1.tar.xz 2521404 BLAKE2B 68924bcb3f046775d886b9af4903653cc1395af0d90ad932e1667972d79b454126493764b9bee548db690c0ec56fb78a5336f6dd04b97117c84a916dd14ca2a7 SHA512 a6ae43ace5761a12157f2cfdd2dafeb5ac5cf0f0e96b4328cd7913d9168976b75133c122604f8296fb9baaae252e786a16128c2c9e1f2df4403f1bbef507493b EBUILD cantor-18.12.3.ebuild 3298 BLAKE2B bf3d895ae40ceaeb3c7fa185e6494c9ea405933137dd73f2edde10b372876fbcce155dadc8e65bba8d4a415d589521f58e48c054915373fd35636cf39a34ef50 SHA512 c960a12488ad409d206e1defb77a6949f3ae1ce2dba495f07bed66c5475882f359ac8b55ce397dd14b06d4f4abf8329d269c8dfe63598543865c6d68e4b4e6dc -EBUILD cantor-19.04.0.ebuild 3296 BLAKE2B 592a4d65efbb21a218024d79f564c9765cbac2b2fe5433185682ea1182aa5d31e49fdbcebee01ec590748f1059ef55fa02771a80cd321dbd00ac5370230ac70e SHA512 aa1a47bb0ae4140cb4e1dde7501f163808ea11664905bf02bccccdcf08f913a330d7df89f9651ef66ffcf27e8ccad7db3e8cfbfcc4d4618ca23fa4b2c4946baa +EBUILD cantor-19.04.1.ebuild 3100 BLAKE2B 47c92eefa0775dcfa0bf8176de0d7a6b2b9331e90d1e002a0f89ba026ecba26bbc44b367d4bee2da9ab7fac2fe95272e21094022f93f4d13561e1cc1d1985ad6 SHA512 a7f31794496dc315acd4869c09e65dc9fc6b7b80d487aa5d07c9e12dc8d50a3d674b02331319fe0858a4282fe73c3b0267f3b5916d0ff107ff164249da937eb3 MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c diff --git a/kde-apps/cantor/cantor-19.04.0.ebuild b/kde-apps/cantor/cantor-19.04.1.ebuild index 5066ab170988..181b280d4be7 100644 --- a/kde-apps/cantor/cantor-19.04.0.ebuild +++ b/kde-apps/cantor/cantor-19.04.1.ebuild @@ -5,9 +5,8 @@ EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" -PYTHON_COMPAT=( python2_7 ) -# FIXME: PYTHON_COMPAT=( python{2_7,3_5} ) -inherit kde5 python-r1 +PYTHON_COMPAT=( python3_{5,6,7} ) +inherit kde5 python-single-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" HOMEPAGE="https://kde.org/applications/education/cantor https://edu.kde.org/cantor/" @@ -17,7 +16,6 @@ IUSE="+analitza julia lua markdown postscript python qalculate R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # TODO Add Sage Mathematics Software backend (http://www.sagemath.org) -# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*') DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) @@ -51,7 +49,10 @@ DEPEND=" sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) - python? ( ${PYTHON_DEPS} ) + python? ( + ${PYTHON_DEPS} + $(add_qt_dep qtdbus) + ) R? ( dev-lang/R ) " RDEPEND="${DEPEND}" @@ -81,28 +82,21 @@ pkg_pretend() { } pkg_setup() { - use python && python_setup + use python && python-single-r1_pkg_setup kde5_pkg_setup } -src_prepare() { - kde5_src_prepare - - # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo - sed -e "/^find_package(PythonLibs3)/ s/^/#/" \ - -i src/backends/CMakeLists.txt || die -} - src_configure() { use julia && addpredict /proc/self/mem # bug 602894 local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON $(cmake-utils_use_find_package analitza Analitza5) $(cmake-utils_use_find_package julia Julia) $(cmake-utils_use_find_package lua LuaJIT) $(cmake-utils_use_find_package markdown Discount) $(cmake-utils_use_find_package postscript LibSpectre) - $(cmake-utils_use_find_package python PythonLibs) + $(cmake-utils_use_find_package python PythonLibs3) $(cmake-utils_use_find_package qalculate Qalculate) $(cmake-utils_use_find_package R R) ) |