[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 45e19555a4d055428601d489551531a38b96c111 Author: Sam James gentoo org> AuthorDate: Tue Feb 27 21:36:31 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 27 21:36:31 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=45e19555 kde-apps/cantor: drop 24.01.95 Signed-off-by: Sam James gentoo.org> kde-apps/cantor/cantor-24.01.95.ebuild | 117 - 1 file changed, 117 deletions(-) diff --git a/kde-apps/cantor/cantor-24.01.95.ebuild b/kde-apps/cantor/cantor-24.01.95.ebuild deleted file mode 100644 index 58ec0f5fab..00 --- a/kde-apps/cantor/cantor-24.01.95.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_MAKEFILE_GENERATOR="emake" -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{10..12} ) -PVCUT=$(ver_cut 1-3) -KFMIN=5.113.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org lua-single optfeature python-single-r1 - -DESCRIPTION="Interface for doing mathematics and scientific computing" -HOMEPAGE="https://apps.kde.org/cantor/ https://edu.kde.org/cantor/"; - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" -# TODO: restore +analitza once cantor is ported to Qt6 -IUSE="julia lua postscript python qalculate R" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="test" - -# TODO Add Sage Mathematics Software backend (https://www.sagemath.org) -# analitza? ( >=kde-apps/analitza-23.08.4:5 ) -DEPEND=" - app-text/poppler[qt5] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qthelp-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=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/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - julia? ( dev-lang/julia ) - lua? ( ${LUA_DEPS} ) - qalculate? ( - sci-libs/cln - sci-libs/libqalculate:= - ) - postscript? ( app-text/libspectre ) - python? ( - ${PYTHON_DEPS} - >=dev-qt/qtdbus-${QTMIN}:5 - ) - R? ( dev-lang/R ) -" -# !analitza? -RDEPEND="${DEPEND} - !julia? ( !lua? ( !python? ( !qalculate? ( !R? ( - || ( - sci-mathematics/maxima - sci-mathematics/octave - ) - ) ) ) ) ) -" -BDEPEND="x11-misc/shared-mime-info" - -pkg_setup() { - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_configure() { - use julia && addpredict /proc/self/mem # bug 602894 - - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Analitza5=ON - $(cmake_use_find_package julia Julia) - $(cmake_use_find_package lua LuaJIT) - -DUSE_LIBSPECTRE=$(usex postscript) - $(cmake_use_find_package python Python3) - $(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)" - ) - ecm_src_configure -} - -src_compile() { - # -j1 for bug #919576 - MAKEOPTS="-j1" ecm_src_compile -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Maxima backend" sci-mathematics/maxima - optfeature "Octave backend" sci-mathematics/octave - optfeature "LaTeX support" virtual/latex-base - fi - ecm_pkg_postinst -}
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 68cf45d028f20b6d496bc025468d136b6db5bbc7 Author: Sam James gentoo org> AuthorDate: Tue Feb 27 21:25:44 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 27 21:25:44 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=68cf45d0 kde-apps/cantor: comment out analitza desc Fixes: a8a2c6b0ca807167546763f592dc0eca142020f4 Signed-off-by: Sam James gentoo.org> kde-apps/cantor/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml index 1053a5e0c0..d1af88c0cc 100644 --- a/kde-apps/cantor/metadata.xml +++ b/kde-apps/cantor/metadata.xml @@ -9,7 +9,7 @@ https://bugs.kde.org/ - Enable kde-apps/analitza backend support + Enable dev-lang/julia backend support Enable sci-libs/libqalculate backend support Enable dev-lang/R backend support
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: a8a2c6b0ca807167546763f592dc0eca142020f4 Author: Sam James gentoo org> AuthorDate: Tue Feb 27 21:22:53 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 27 21:25:07 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8a2c6b0 kde-apps/cantor: drop analitza for now analitza has been ported to KF6 but cantor hasn't been, so disable analitza for now, as Fedora has done. Signed-off-by: Sam James gentoo.org> kde-apps/cantor/cantor-24.01.95.ebuild | 12 +++- kde-apps/cantor/cantor-24.02.0.ebuild | 12 +++- kde-apps/cantor/cantor-24.02.49..ebuild | 12 +++- kde-apps/cantor/cantor-.ebuild | 12 +++- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/kde-apps/cantor/cantor-24.01.95.ebuild b/kde-apps/cantor/cantor-24.01.95.ebuild index ec59607c7f..58ec0f5fab 100644 --- a/kde-apps/cantor/cantor-24.01.95.ebuild +++ b/kde-apps/cantor/cantor-24.01.95.ebuild @@ -19,12 +19,14 @@ HOMEPAGE="https://apps.kde.org/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" +# TODO: restore +analitza once cantor is ported to Qt6 +IUSE="julia lua postscript python qalculate R" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="test" # TODO Add Sage Mathematics Software backend (https://www.sagemath.org) +# analitza? ( >=kde-apps/analitza-23.08.4:5 ) DEPEND=" app-text/poppler[qt5] >=dev-qt/qtgui-${QTMIN}:5 @@ -51,7 +53,6 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - analitza? ( >=kde-apps/analitza-23.08.4:5 ) julia? ( dev-lang/julia ) lua? ( ${LUA_DEPS} ) qalculate? ( @@ -65,13 +66,14 @@ DEPEND=" ) R? ( dev-lang/R ) " +# !analitza? RDEPEND="${DEPEND} - !analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? ( + !julia? ( !lua? ( !python? ( !qalculate? ( !R? ( || ( sci-mathematics/maxima sci-mathematics/octave ) - ) ) ) ) ) ) + ) ) ) ) ) " BDEPEND="x11-misc/shared-mime-info" @@ -85,7 +87,7 @@ src_configure() { use julia && addpredict /proc/self/mem # bug 602894 local mycmakeargs=( - $(cmake_use_find_package analitza Analitza5) + -DCMAKE_DISABLE_FIND_PACKAGE_Analitza5=ON $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) -DUSE_LIBSPECTRE=$(usex postscript) diff --git a/kde-apps/cantor/cantor-24.02.0.ebuild b/kde-apps/cantor/cantor-24.02.0.ebuild index ec59607c7f..58ec0f5fab 100644 --- a/kde-apps/cantor/cantor-24.02.0.ebuild +++ b/kde-apps/cantor/cantor-24.02.0.ebuild @@ -19,12 +19,14 @@ HOMEPAGE="https://apps.kde.org/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" +# TODO: restore +analitza once cantor is ported to Qt6 +IUSE="julia lua postscript python qalculate R" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="test" # TODO Add Sage Mathematics Software backend (https://www.sagemath.org) +# analitza? ( >=kde-apps/analitza-23.08.4:5 ) DEPEND=" app-text/poppler[qt5] >=dev-qt/qtgui-${QTMIN}:5 @@ -51,7 +53,6 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - analitza? ( >=kde-apps/analitza-23.08.4:5 ) julia? ( dev-lang/julia ) lua? ( ${LUA_DEPS} ) qalculate? ( @@ -65,13 +66,14 @@ DEPEND=" ) R? ( dev-lang/R ) " +# !analitza? RDEPEND="${DEPEND} - !analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? ( + !julia? ( !lua? ( !python? ( !qalculate? ( !R? ( || ( sci-mathematics/maxima sci-mathematics/octave ) - ) ) ) ) ) ) + ) ) ) ) ) " BDEPEND="x11-misc/shared-mime-info" @@ -85,7 +87,7 @@ src_configure() { use julia && addpredict /proc/self/mem # bug 602894 local mycmakeargs=( - $(cmake_use_find_package analitza Analitza5) + -DCMAKE_DISABLE_FIND_PACKAGE_Analitza5=ON $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) -DUSE_LIBSPECTRE=$(usex postscript) diff --git a/kde-apps/cantor/cantor-24.02.49..ebuild b/kde-apps/cantor/cantor-24.02.49..ebuild index a79facb107..d124392bdc 100644 --- a/kde-apps/cantor/cantor-24.02.49..ebuild +++ b/kde-apps/cantor/cantor-24.02.49.99
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 2b9f0c114be8ddd8ff6c88805f2ecd8aa04e6ffe Author: Sam James gentoo org> AuthorDate: Fri Feb 23 08:54:49 2024 + Commit: Sam James gentoo org> CommitDate: Fri Feb 23 08:54:49 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b9f0c11 kde-apps/cantor: -j1 workaround Bug: https://bugs.gentoo.org/919576 Signed-off-by: Sam James gentoo.org> kde-apps/cantor/cantor-24.01.95.ebuild | 5 + kde-apps/cantor/cantor-24.02.0.ebuild | 5 + kde-apps/cantor/cantor-24.02.49..ebuild | 5 + kde-apps/cantor/cantor-.ebuild | 5 + 4 files changed, 20 insertions(+) diff --git a/kde-apps/cantor/cantor-24.01.95.ebuild b/kde-apps/cantor/cantor-24.01.95.ebuild index dbc325b71c..ec59607c7f 100644 --- a/kde-apps/cantor/cantor-24.01.95.ebuild +++ b/kde-apps/cantor/cantor-24.01.95.ebuild @@ -100,6 +100,11 @@ src_configure() { ecm_src_configure } +src_compile() { + # -j1 for bug #919576 + MAKEOPTS="-j1" ecm_src_compile +} + pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then optfeature "Maxima backend" sci-mathematics/maxima diff --git a/kde-apps/cantor/cantor-24.02.0.ebuild b/kde-apps/cantor/cantor-24.02.0.ebuild index 25d1ffb4ac..b67c2d46df 100644 --- a/kde-apps/cantor/cantor-24.02.0.ebuild +++ b/kde-apps/cantor/cantor-24.02.0.ebuild @@ -100,6 +100,11 @@ src_configure() { ecm_src_configure } +src_compile() { + # -j1 for bug #919576 + MAKEOPTS="-j1" ecm_src_compile +} + pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then optfeature "Maxima backend" sci-mathematics/maxima diff --git a/kde-apps/cantor/cantor-24.02.49..ebuild b/kde-apps/cantor/cantor-24.02.49..ebuild index 3e6f3ced91..a79facb107 100644 --- a/kde-apps/cantor/cantor-24.02.49..ebuild +++ b/kde-apps/cantor/cantor-24.02.49..ebuild @@ -100,6 +100,11 @@ src_configure() { ecm_src_configure } +src_compile() { + # -j1 for bug #919576 + MAKEOPTS="-j1" ecm_src_compile +} + pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then optfeature "Maxima backend" sci-mathematics/maxima diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 3e6f3ced91..a79facb107 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -100,6 +100,11 @@ src_configure() { ecm_src_configure } +src_compile() { + # -j1 for bug #919576 + MAKEOPTS="-j1" ecm_src_compile +} + pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then optfeature "Maxima backend" sci-mathematics/maxima
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 31848b855c95c137b95d72bdb8fbc2c3e337ca4f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 6 09:36:02 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 6 09:36:02 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31848b85 kde-apps/cantor: Drop obsolete dependency Upstream commits: 68d7944c08dc9899d85baffbf4caae8cc932d816 f89a6cd736aad7d6d86029bc93a99eaaca6f7d3c Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 715a9e4f50..0cc0e1b8ab 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -46,7 +46,6 @@ DEPEND=" >=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
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: d472f1c478a11a34cdc6e329ad695806de4be356 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 6 00:26:43 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 22 18:54:40 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d472f1c4 kde-apps/cantor: Drop obsolete Python3_EXECUTABLE cmakearg Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 197e583fe7..a6d0b84bc6 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -98,7 +98,6 @@ src_configure() { -DLUAJIT_INCLUDEDIR="${EPREFIX}/$(lua_get_include_dir)" -DLUAJIT_LIBDIR="${EPREFIX}/$(lua_get_cmod_dir)" ) - use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" ) ecm_src_configure }
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 0bf117ea67643099a6d9e7a59d197e011400a5dd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 3 23:12:53 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 3 23:12:53 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0bf117ea kde-apps/cantor: python3_11 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-22.04.49..ebuild | 2 +- kde-apps/cantor/cantor-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/cantor/cantor-22.04.49..ebuild b/kde-apps/cantor/cantor-22.04.49..ebuild index c1292fe511..6d45a22f53 100644 --- a/kde-apps/cantor/cantor-22.04.49..ebuild +++ b/kde-apps/cantor/cantor-22.04.49..ebuild @@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) PVCUT=$(ver_cut 1-3) KFMIN=5.92.0 QTMIN=5.15.4 diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index c1292fe511..6d45a22f53 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) PVCUT=$(ver_cut 1-3) KFMIN=5.92.0 QTMIN=5.15.4
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 9c13d12241b73ef964af06c8b19f97c771dbc971 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 25 07:25:12 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 25 08:31:22 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c13d122 kde-apps/cantor: python3_10 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-21.08.49..ebuild | 2 +- kde-apps/cantor/cantor-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/cantor/cantor-21.08.49..ebuild b/kde-apps/cantor/cantor-21.08.49..ebuild index 1c301ac9bf..13a7e74c7e 100644 --- a/kde-apps/cantor/cantor-21.08.49..ebuild +++ b/kde-apps/cantor/cantor-21.08.49..ebuild @@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PVCUT=$(ver_cut 1-3) KFMIN=5.84.0 QTMIN=5.15.2 diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 92c286c968..6e8f937832 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PVCUT=$(ver_cut 1-3) KFMIN=5.85.0 QTMIN=5.15.2
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: e87882d2442ed1e266e7b788ec81e382c87a25d6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 3 11:06:58 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 4 19:04:09 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e87882d2 kde-apps/cantor: Drop superfluous optfeature header Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 5f71e54354..1f3d7cef1f 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -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
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 005287b8721073d616f9aa294c81d7d32d0c44c7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 28 15:59:11 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 28 15:59:11 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=005287b8 kde-apps/cantor: Migrate to lua-single.eclass Bug: https://bugs.gentoo.org/752735 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-20.12.49..ebuild | 14 ++ kde-apps/cantor/cantor-.ebuild | 14 ++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/kde-apps/cantor/cantor-20.12.49..ebuild b/kde-apps/cantor/cantor-20.12.49..ebuild index 022dd14d94..c9d06f1a21 100644 --- a/kde-apps/cantor/cantor-20.12.49..ebuild +++ b/kde-apps/cantor/cantor-20.12.49..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="" 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 } diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 022dd14d94..c9d06f1a21 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.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="" 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 }
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 0f0568d89981e2046e3c8d4ae1e7ea876bb77bae Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 17 09:57:47 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 17 09:57:47 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0f0568d8 kde-apps/cantor: Python patch upstreamed Upstream commit c794fb5f0f616ce2d9e4004fc459a1c50f077470 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-20.08.49..ebuild | 3 +-- kde-apps/cantor/cantor-.ebuild | 5 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/kde-apps/cantor/cantor-20.08.49..ebuild b/kde-apps/cantor/cantor-20.08.49..ebuild index ee1c4bf4b3..0c2f9a32b6 100644 --- a/kde-apps/cantor/cantor-20.08.49..ebuild +++ b/kde-apps/cantor/cantor-20.08.49..ebuild @@ -13,8 +13,7 @@ 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/en/cantor -https://edu.kde.org/cantor/"; +HOMEPAGE="https://kde.org/applications/en/cantor https://edu.kde.org/cantor/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 1a6538747c..a55070cb8a 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -13,8 +13,7 @@ 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/en/cantor -https://edu.kde.org/cantor/"; +HOMEPAGE="https://kde.org/applications/en/cantor https://edu.kde.org/cantor/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -74,8 +73,6 @@ RDEPEND="${DEPEND} RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-20.08.3-python.patch" ) - pkg_setup() { use python && python-single-r1_pkg_setup ecm_pkg_setup
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
commit: 48fe47ce614ca6939e222465a7a0f9729d929a7a Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 15 21:01:21 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 15 21:01:54 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=48fe47ce kde-apps/cantor: Update python.patch with upstream review changes Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-20.08.49..ebuild | 2 +- kde-apps/cantor/cantor-.ebuild| 2 +- 08.2-python.patch => cantor-20.08.3-python.patch} | 19 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/kde-apps/cantor/cantor-20.08.49..ebuild b/kde-apps/cantor/cantor-20.08.49..ebuild index d7a34a7ba6..ee1c4bf4b3 100644 --- a/kde-apps/cantor/cantor-20.08.49..ebuild +++ b/kde-apps/cantor/cantor-20.08.49..ebuild @@ -74,7 +74,7 @@ RDEPEND="${DEPEND} RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-20.08.2-python.patch" ) +PATCHES=( "${FILESDIR}/${PN}-20.08.3-python.patch" ) pkg_setup() { use python && python-single-r1_pkg_setup diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index b415fa864f..1a6538747c 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -74,7 +74,7 @@ RDEPEND="${DEPEND} RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-20.08.2-python.patch" ) +PATCHES=( "${FILESDIR}/${PN}-20.08.3-python.patch" ) pkg_setup() { use python && python-single-r1_pkg_setup diff --git a/kde-apps/cantor/files/cantor-20.08.2-python.patch b/kde-apps/cantor/files/cantor-20.08.3-python.patch similarity index 80% rename from kde-apps/cantor/files/cantor-20.08.2-python.patch rename to kde-apps/cantor/files/cantor-20.08.3-python.patch index 0f3c677462..c0dc3804c8 100644 --- a/kde-apps/cantor/files/cantor-20.08.2-python.patch +++ b/kde-apps/cantor/files/cantor-20.08.3-python.patch @@ -1,13 +1,14 @@ -From c09628ae8c08e8ef0e57b801994acd4276b65b02 Mon Sep 17 00:00:00 2001 +From c794fb5f0f616ce2d9e4004fc459a1c50f077470 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner 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, 7 insertions(+), 9 deletions(-) + 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 @@ -44,24 +45,24 @@ index e99e1731..9b6b615e 100644 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..ccf76193 100644 +index 04b4c313..c7868561 100644 --- a/src/backends/python/CMakeLists.txt +++ b/src/backends/python/CMakeLists.txt -@@ -14,7 +14,7 @@ set(PythonServer_SRCS +@@ -14,8 +14,6 @@ set(PythonServer_SRCS pythonserver.cpp ) -include_directories(${PYTHONLIBS3_INCLUDE_DIRS}) -+include_directories(${Python3_INCLUDE_DIRS}) - +- qt5_add_resources(PythonBackend_RSCS python.qrc) ki18n_wrap_ui(PythonBackend_SRCS settings.ui) -@@ -34,7 +34,7 @@ set_target_properties(cantor_pythonserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH + 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_LIBRARIES}) ++target_link_libraries(cantor_pythonserver Python3::Python) if(BUILD_TESTING) add_executable(testpython testpython.cpp settings.cpp)
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
commit: 8f13b51ab1d54cca31f4c8224060810cb1749e73 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 11 20:18:34 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 11 21:22:53 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f13b51a kde-apps/cantor: python3_9 via patch to use CMake's Python3 module Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-20.08.49..ebuild | 7 ++- kde-apps/cantor/cantor-.ebuild| 7 ++- kde-apps/cantor/files/cantor-20.08.2-python.patch | 70 +++ 3 files changed, 80 insertions(+), 4 deletions(-) diff --git a/kde-apps/cantor/cantor-20.08.49..ebuild b/kde-apps/cantor/cantor-20.08.49..ebuild index c807935fdf..2193661feb 100644 --- a/kde-apps/cantor/cantor-20.08.49..ebuild +++ b/kde-apps/cantor/cantor-20.08.49..ebuild @@ -6,7 +6,7 @@ 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 @@ -74,6 +74,8 @@ RDEPEND="${DEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${PN}-20.08.2-python.patch" ) + pkg_setup() { use python && python-single-r1_pkg_setup ecm_pkg_setup @@ -87,10 +89,11 @@ 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 } diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 87d15617ea..8b8ba94e1b 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -6,7 +6,7 @@ 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.75.0 QTMIN=5.15.1 @@ -74,6 +74,8 @@ RDEPEND="${DEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${PN}-20.08.2-python.patch" ) + pkg_setup() { use python && python-single-r1_pkg_setup ecm_pkg_setup @@ -87,10 +89,11 @@ 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 } diff --git a/kde-apps/cantor/files/cantor-20.08.2-python.patch b/kde-apps/cantor/files/cantor-20.08.2-python.patch new file mode 100644 index 00..0f3c677462 --- /dev/null +++ b/kde-apps/cantor/files/cantor-20.08.2-python.patch @@ -0,0 +1,70 @@ +From c09628ae8c08e8ef0e57b801994acd4276b65b02 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 11 Oct 2020 22:47:55 +0200 +Subject: [PATCH] Use CMake FindPython3 module, raises minimum CMake to 3.12 + +--- + CMakeLists.txt | 2 +- + src/backends/CMakeLists.txt| 10 -- + src/backends/python/CMakeLists.txt | 4 ++-- + 3 files changed, 7 insertions(+), 9 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
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 66e30b8c66aadf6f882b9bbae10e2d619bccee37 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 7 13:09:10 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 7 15:05:48 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=66e30b8c kde-apps/cantor: Drop pkg_pretend, use optfeature in pkg_postinst >From now on make sure there is at least one of the optional runtime backends installed if all backend IUSE are disabled. Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-20.08.49..ebuild | 43 + kde-apps/cantor/cantor-.ebuild | 43 + 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/kde-apps/cantor/cantor-20.08.49..ebuild b/kde-apps/cantor/cantor-20.08.49..ebuild index 53ab76f030..c807935fdf 100644 --- a/kde-apps/cantor/cantor-20.08.49..ebuild +++ b/kde-apps/cantor/cantor-20.08.49..ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{7,8} ) PVCUT=$(ver_cut 1-3) KFMIN=5.72.0 QTMIN=5.14.2 -inherit ecm kde.org python-single-r1 +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 @@ -63,32 +63,17 @@ 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 -} - pkg_setup() { use python && python-single-r1_pkg_setup ecm_pkg_setup @@ -108,3 +93,13 @@ src_configure() { ) 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/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index c27bf5f5a5..e1073ed888 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{7,8} ) PVCUT=$(ver_cut 1-3) KFMIN=5.73.0 QTMIN=5.14.2 -inherit ecm kde.org python-single-r1 +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 @@ -63,32 +63,17 @@ 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/late
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: a47cf00ca438045fc0661afb4848b74fb11c8aea Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 30 07:46:24 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 30 07:47:06 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a47cf00c kde-apps/cantor: Add missing DEPEND Upstream commit 7f154553d80ab6433a7124071d555182c3751a9b Closes: https://bugs.gentoo.org/739532 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-20.08.49..ebuild | 1 + kde-apps/cantor/cantor-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-apps/cantor/cantor-20.08.49..ebuild b/kde-apps/cantor/cantor-20.08.49..ebuild index c00a427837..53ab76f030 100644 --- a/kde-apps/cantor/cantor-20.08.49..ebuild +++ b/kde-apps/cantor/cantor-20.08.49..ebuild @@ -25,6 +25,7 @@ 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 diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index be691809a5..c27bf5f5a5 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -25,6 +25,7 @@ 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
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 9934539258bcf5350aaa9b1b469d8af76605873a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 18 08:44:08 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 18 08:48:21 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=99345392 kde-apps/cantor: 20.07.80 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-20.07.80.ebuild | 109 + 1 file changed, 109 insertions(+) diff --git a/kde-apps/cantor/cantor-20.07.80.ebuild b/kde-apps/cantor/cantor-20.07.80.ebuild new file mode 100644 index 00..7843f905d1 --- /dev/null +++ b/kde-apps/cantor/cantor-20.07.80.ebuild @@ -0,0 +1,109 @@ +# 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.72.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=" + >=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) + -DUSE_LIBSPECTRE=$(usex postscript) + $(cmake_use_find_package python PythonLibs3) + $(cmake_use_find_package qalculate Qalculate) + $(cmake_use_find_package R R) + ) + ecm_src_configure +}
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 85efb9376bef822bdc24b6cbcc48e049e8a30947 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 24 16:36:35 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 24 16:36:35 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=85efb937 kde-apps/cantor: Update USE postscript cmake option Upstream commit 156d076bee7ac93fc2db9832750e2e48b73111cb Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 57c232ef4f..710bf0f0ea 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -100,7 +100,7 @@ src_configure() { $(cmake_use_find_package analitza Analitza5) $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) - $(cmake_use_find_package postscript LibSpectre) + -DUSE_LIBSPECTRE=$(usex postscript) $(cmake_use_find_package python PythonLibs3) $(cmake_use_find_package qalculate Qalculate) $(cmake_use_find_package R R)
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 6b1c7e6f7529a93f7fa52ce71b453ae98a8adcef Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 30 15:52:43 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 30 16:05:04 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b1c7e6f kde-apps/cantor: py2 support was dropped upstream Upstream commit a0c253489e34cfb68b1a42cf0ebf2d89d6adf3a2 Closes: https://bugs.gentoo.org/719988 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-20.04.49..ebuild | 1 - kde-apps/cantor/cantor-.ebuild | 1 - 2 files changed, 2 deletions(-) diff --git a/kde-apps/cantor/cantor-20.04.49..ebuild b/kde-apps/cantor/cantor-20.04.49..ebuild index e9b585db06..dcc4a9f803 100644 --- a/kde-apps/cantor/cantor-20.04.49..ebuild +++ b/kde-apps/cantor/cantor-20.04.49..ebuild @@ -97,7 +97,6 @@ src_configure() { use julia && addpredict /proc/self/mem # bug 602894 local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON $(cmake_use_find_package analitza Analitza5) $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index b3bd7c02f2..e42cec7a6b 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -97,7 +97,6 @@ src_configure() { use julia && addpredict /proc/self/mem # bug 602894 local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON $(cmake_use_find_package analitza Analitza5) $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT)
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 54d79529c589b86cceb73ae9c107ceda14e7465c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 24 23:36:59 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 24 23:36:59 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54d79529 kde-apps/cantor: python3_8 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-19.12.49..ebuild | 2 +- kde-apps/cantor/cantor-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/cantor/cantor-19.12.49..ebuild b/kde-apps/cantor/cantor-19.12.49..ebuild index cf7e219445..2268db45d4 100644 --- a/kde-apps/cantor/cantor-19.12.49..ebuild +++ b/kde-apps/cantor/cantor-19.12.49..ebuild @@ -6,7 +6,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) PVCUT=$(ver_cut 1-3) KFMIN=5.63.0 QTMIN=5.12.3 diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 1be8b9bfb5..ff8d9cd58e 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -6,7 +6,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) PVCUT=$(ver_cut 1-3) KFMIN=5.64.0 QTMIN=5.12.3
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 3083c7f020f5292b74796153d81c48843cb10f63 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 18 08:01:51 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 18 08:01:51 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3083c7f0 kde-apps/cantor: Drop broken 19.11.80 beta Closes: https://bugs.gentoo.org/700238 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-19.11.80.ebuild | 114 - 1 file changed, 114 deletions(-) diff --git a/kde-apps/cantor/cantor-19.11.80.ebuild b/kde-apps/cantor/cantor-19.11.80.ebuild deleted file mode 100644 index 3dccb7a1ce..00 --- a/kde-apps/cantor/cantor-19.11.80.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2019 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_{6,7} ) -PVCUT=$(ver_cut 1-3) -KFMIN=5.63.0 -QTMIN=5.12.3 -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=" - >=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=( - -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON - $(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 -} - -src_compile() { - LANG="en_US.utf8" ecm_src_compile -}
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: b235fe6e9f715e2d79c28913d6829e68573d4335 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 17 21:25:25 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 17 21:25:28 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b235fe6e kde-apps/cantor: Add LANG="en_US.utf8" workaround to make 19.11.80 work Closes: https://bugs.gentoo.org/700238 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-19.11.80.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/kde-apps/cantor/cantor-19.11.80.ebuild b/kde-apps/cantor/cantor-19.11.80.ebuild index 7bfa6ea2be..3dccb7a1ce 100644 --- a/kde-apps/cantor/cantor-19.11.80.ebuild +++ b/kde-apps/cantor/cantor-19.11.80.ebuild @@ -108,3 +108,7 @@ src_configure() { ) ecm_src_configure } + +src_compile() { + LANG="en_US.utf8" ecm_src_compile +}
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: ad2c363103c89166c097a1f7fb0bab4ad02e5b3f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 17 21:10:23 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 17 21:14:53 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ad2c3631 kde-apps/cantor: Switch to emake to fix build for now Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-19.11.80.ebuild | 13 +++-- kde-apps/cantor/cantor-19.12.49..ebuild | 13 +++-- kde-apps/cantor/cantor-.ebuild | 13 +++-- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/kde-apps/cantor/cantor-19.11.80.ebuild b/kde-apps/cantor/cantor-19.11.80.ebuild index 545d2cc5cc..7bfa6ea2be 100644 --- a/kde-apps/cantor/cantor-19.11.80.ebuild +++ b/kde-apps/cantor/cantor-19.11.80.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" PYTHON_COMPAT=( python3_{6,7} ) @@ -24,6 +25,12 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # TODO Add Sage Mathematics Software backend (http://www.sagemath.org) DEPEND=" + >=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 @@ -41,12 +48,6 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - >=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 analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) diff --git a/kde-apps/cantor/cantor-19.12.49..ebuild b/kde-apps/cantor/cantor-19.12.49..ebuild index bdee8c1be6..cf7e219445 100644 --- a/kde-apps/cantor/cantor-19.12.49..ebuild +++ b/kde-apps/cantor/cantor-19.12.49..ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" PYTHON_COMPAT=( python3_{6,7} ) @@ -24,6 +25,12 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # TODO Add Sage Mathematics Software backend (http://www.sagemath.org) DEPEND=" + >=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 @@ -41,12 +48,6 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - >=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 analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index bdee8c1be6..cf7e219445 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" PYTHON_COMPAT=( python3_{6,7} ) @@ -24,6 +25,12 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # TODO Add Sage Mathematics Software backend (http://www.sagemath.org) DEPEND=" + >=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 @@ -41,12 +48,6 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - >=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 analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 )
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: ce2d1e9f563107ccd31302d79b0e516e8bc940a4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 17 19:39:06 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 17 19:42:56 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ce2d1e9f kde-apps/cantor: Discount no longer optional, unfortunately botched Cantor relies on a bundled discount-2.2.6 with non-upstreamed patches. Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-19.11.80.ebuild | 4 +--- kde-apps/cantor/cantor-19.12.49..ebuild | 4 +--- kde-apps/cantor/cantor-.ebuild | 4 +--- kde-apps/cantor/metadata.xml| 1 - 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/kde-apps/cantor/cantor-19.11.80.ebuild b/kde-apps/cantor/cantor-19.11.80.ebuild index c42d6a84d8..545d2cc5cc 100644 --- a/kde-apps/cantor/cantor-19.11.80.ebuild +++ b/kde-apps/cantor/cantor-19.11.80.ebuild @@ -18,7 +18,7 @@ https://edu.kde.org/cantor/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+analitza julia lua markdown postscript python qalculate R" +IUSE="+analitza julia lua postscript python qalculate R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -50,7 +50,6 @@ DEPEND=" analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) - markdown? ( >=app-text/discount-2.2.2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= @@ -101,7 +100,6 @@ src_configure() { $(cmake_use_find_package analitza Analitza5) $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) - $(cmake_use_find_package markdown Discount) $(cmake_use_find_package postscript LibSpectre) $(cmake_use_find_package python PythonLibs3) $(cmake_use_find_package qalculate Qalculate) diff --git a/kde-apps/cantor/cantor-19.12.49..ebuild b/kde-apps/cantor/cantor-19.12.49..ebuild index 28e2827ebb..bdee8c1be6 100644 --- a/kde-apps/cantor/cantor-19.12.49..ebuild +++ b/kde-apps/cantor/cantor-19.12.49..ebuild @@ -18,7 +18,7 @@ https://edu.kde.org/cantor/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+analitza julia lua markdown postscript python qalculate R" +IUSE="+analitza julia lua postscript python qalculate R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -50,7 +50,6 @@ DEPEND=" analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) - markdown? ( >=app-text/discount-2.2.2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= @@ -101,7 +100,6 @@ src_configure() { $(cmake_use_find_package analitza Analitza5) $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) - $(cmake_use_find_package markdown Discount) $(cmake_use_find_package postscript LibSpectre) $(cmake_use_find_package python PythonLibs3) $(cmake_use_find_package qalculate Qalculate) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 28e2827ebb..bdee8c1be6 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -18,7 +18,7 @@ https://edu.kde.org/cantor/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+analitza julia lua markdown postscript python qalculate R" +IUSE="+analitza julia lua postscript python qalculate R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -50,7 +50,6 @@ DEPEND=" analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) - markdown? ( >=app-text/discount-2.2.2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= @@ -101,7 +100,6 @@ src_configure() { $(cmake_use_find_package analitza Analitza5) $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) - $(cmake_use_find_package markdown Discount) $(cmake_use_find_package postscript LibSpectre) $(cmake_use_find_package python PythonLibs3) $(cmake_use_find_package qalculate Qalculate) diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml index 23b2f303ad..20e3a5914a 100644 --- a/kde-apps/cantor/metadata.xml +++ b/kde-apps/cantor/metadata.xml @@ -9,7 +9,6 @@ Enable kde-apps/analitza backend support Enable dev-lang/julia backend support Enable sci-libs/libqalculate backend support - Enable Markdown support via app-text/discount
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: dbcd5c2f9cf56d201d92459200f3e3024d84bff2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 9 21:41:39 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 9 21:51:23 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dbcd5c2f kde-apps/cantor: Switch to python3_{5,6,7} Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-19.04.49..ebuild | 24 +--- kde-apps/cantor/cantor-.ebuild | 24 +--- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/kde-apps/cantor/cantor-19.04.49..ebuild b/kde-apps/cantor/cantor-19.04.49..ebuild index 601738f64c..8a32077f6f 100644 --- a/kde-apps/cantor/cantor-19.04.49..ebuild +++ b/kde-apps/cantor/cantor-19.04.49..ebuild @@ -5,9 +5,8 @@ EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" -PYTHON_COMPAT=( python2_7 ) -# FIXME: PYTHON_COMPAT=( python3_{5,6,7} ) -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) ) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 601738f64c..8a32077f6f 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -5,9 +5,8 @@ EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" -PYTHON_COMPAT=( python2_7 ) -# FIXME: PYTHON_COMPAT=( python3_{5,6,7} ) -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_pack
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 9621790813cc9ffcf4507b2e1dc6b1294f61ff17 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 21 11:17:56 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 11:17:56 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=96217908 kde-apps/cantor: Update PYTHON_COMPAT TODO comment Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-19.04.49..ebuild | 2 +- kde-apps/cantor/cantor-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/cantor/cantor-19.04.49..ebuild b/kde-apps/cantor/cantor-19.04.49..ebuild index c814e2a4a3..601738f64c 100644 --- a/kde-apps/cantor/cantor-19.04.49..ebuild +++ b/kde-apps/cantor/cantor-19.04.49..ebuild @@ -6,7 +6,7 @@ EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" PYTHON_COMPAT=( python2_7 ) -# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +# FIXME: PYTHON_COMPAT=( python3_{5,6,7} ) inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index c814e2a4a3..601738f64c 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -6,7 +6,7 @@ EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" PYTHON_COMPAT=( python2_7 ) -# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +# FIXME: PYTHON_COMPAT=( python3_{5,6,7} ) inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing"
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 996ef206e6622304fc75617b991fd7de1323bc83 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 11 19:46:09 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 11 19:46:09 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=996ef206 kde-apps/cantor: Add USE markdown, add missing DEPEND Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-apps/cantor/cantor-.ebuild | 7 +-- kde-apps/cantor/metadata.xml | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 2c26722eb3..060397632e 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"; KEYWORDS="" -IUSE="+analitza julia lua postscript python qalculate R" +IUSE="+analitza julia lua markdown postscript python qalculate R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -35,6 +35,7 @@ DEPEND=" $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep syntax-highlighting) $(add_qt_dep qtgui) $(add_qt_dep qtprintsupport) $(add_qt_dep qtsvg) @@ -44,6 +45,7 @@ DEPEND=" analitza? ( $(add_kdeapps_dep analitza) ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) + markdown? ( >=app-text/discount-2.2.2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= @@ -98,6 +100,7 @@ src_configure() { $(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 qalculate Qalculate) diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml index 20e3a5914a..23b2f303ad 100644 --- a/kde-apps/cantor/metadata.xml +++ b/kde-apps/cantor/metadata.xml @@ -9,6 +9,7 @@ Enable kde-apps/analitza backend support Enable dev-lang/julia backend support Enable sci-libs/libqalculate backend support + Enable Markdown support via app-text/discount Enable dev-lang/R backend support
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 339cab5e58e95c1aae2b80ef15c6807880e45275 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 18 20:44:07 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 18 20:44:07 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=339cab5e kde-apps/cantor: Update pkg_pretend message Package-Manager: Portage-2.3.47, Repoman-2.3.10 kde-apps/cantor/cantor-18.08.0.ebuild | 6 +++--- kde-apps/cantor/cantor-18.08.49..ebuild | 6 +++--- kde-apps/cantor/cantor-.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kde-apps/cantor/cantor-18.08.0.ebuild b/kde-apps/cantor/cantor-18.08.0.ebuild index 388ccd038c..89cadc785d 100644 --- a/kde-apps/cantor/cantor-18.08.0.ebuild +++ b/kde-apps/cantor/cantor-18.08.0.ebuild @@ -63,12 +63,12 @@ pkg_pretend() { ! 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" + 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 flags:" - elog "julia (not stable, bug #613576), R (bug #619534)" + elog "Experimental available USE flag:" + elog "julia (not stable, bug #613576)" elog fi diff --git a/kde-apps/cantor/cantor-18.08.49..ebuild b/kde-apps/cantor/cantor-18.08.49..ebuild index ae9d56c2d2..2c26722eb3 100644 --- a/kde-apps/cantor/cantor-18.08.49..ebuild +++ b/kde-apps/cantor/cantor-18.08.49..ebuild @@ -63,12 +63,12 @@ pkg_pretend() { ! 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" + 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 flags:" - elog "julia (not stable, bug #613576), R (bug #619534)" + elog "Experimental available USE flag:" + elog "julia (not stable, bug #613576)" elog fi diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index ae9d56c2d2..2c26722eb3 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -63,12 +63,12 @@ pkg_pretend() { ! 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" + 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 flags:" - elog "julia (not stable, bug #613576), R (bug #619534)" + elog "Experimental available USE flag:" + elog "julia (not stable, bug #613576)" elog fi
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 6549b674ea7d5b00af860d0a98a2be3e99f4f7ba Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 18 20:41:06 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 18 20:41:06 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6549b674 kde-apps/cantor: Use elog Package-Manager: Portage-2.3.47, Repoman-2.3.10 kde-apps/cantor/cantor-18.08.0.ebuild | 22 +++--- kde-apps/cantor/cantor-18.08.49..ebuild | 22 +++--- kde-apps/cantor/cantor-.ebuild | 22 +++--- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/kde-apps/cantor/cantor-18.08.0.ebuild b/kde-apps/cantor/cantor-18.08.0.ebuild index cd2bf41394..388ccd038c 100644 --- a/kde-apps/cantor/cantor-18.08.0.ebuild +++ b/kde-apps/cantor/cantor-18.08.0.ebuild @@ -61,20 +61,20 @@ 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 - einfo "You have decided to build ${PN} with no backend." - einfo "To have this application functional, please enable one of the backends via USE flag:" - einfo "analitza, lua, python, qalculate" - einfo "Alternatively, install one of these:" - einfo "# emerge sci-mathematics/maxima (bug #619534)" - einfo "# emerge sci-mathematics/octave" - einfo "Experimental available USE flags:" - einfo "julia (not stable, bug #613576), R (bug #619534)" - einfo + 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" + elog "Alternatively, install one of these:" + elog "# emerge sci-mathematics/maxima (bug #619534)" + elog "# emerge sci-mathematics/octave" + elog "Experimental available USE flags:" + elog "julia (not stable, bug #613576), R (bug #619534)" + elog fi if ! has_version virtual/latex-base; then - einfo "For LaTeX support:" - einfo "# emerge virtual/latex-base" + elog "For LaTeX support:" + elog "# emerge virtual/latex-base" fi } diff --git a/kde-apps/cantor/cantor-18.08.49..ebuild b/kde-apps/cantor/cantor-18.08.49..ebuild index 4b71b17f99..ae9d56c2d2 100644 --- a/kde-apps/cantor/cantor-18.08.49..ebuild +++ b/kde-apps/cantor/cantor-18.08.49..ebuild @@ -61,20 +61,20 @@ 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 - einfo "You have decided to build ${PN} with no backend." - einfo "To have this application functional, please enable one of the backends via USE flag:" - einfo "analitza, lua, python, qalculate" - einfo "Alternatively, install one of these:" - einfo "# emerge sci-mathematics/maxima (bug #619534)" - einfo "# emerge sci-mathematics/octave" - einfo "Experimental available USE flags:" - einfo "julia (not stable, bug #613576), R (bug #619534)" - einfo + 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" + elog "Alternatively, install one of these:" + elog "# emerge sci-mathematics/maxima (bug #619534)" + elog "# emerge sci-mathematics/octave" + elog "Experimental available USE flags:" + elog "julia (not stable, bug #613576), R (bug #619534)" + elog fi if ! has_version virtual/latex-base; then - einfo "For LaTeX support:" - einfo "# emerge virtual/latex-base" + elog "For LaTeX support:" + elog "# emerge virtual/latex-base" fi } diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 4b71b17f99..ae9d56c2d2 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -61,20 +61,20 @@ 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 - einfo "You have deci
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: b1d188d4b393c2a3011ca2275f5613c958d475a0 Author: Michael Palimaka gentoo org> AuthorDate: Mon Dec 25 10:18:28 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Dec 25 10:30:25 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b1d188d4 kde-apps/cantor: add new dependency Upstream-commit: 6da5eb1608a8a662838f2c31bd50a340d520e5c1 Package-Manager: Portage-2.3.14, Repoman-2.3.6 kde-apps/cantor/cantor-17.12.49..ebuild | 1 + kde-apps/cantor/cantor-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-apps/cantor/cantor-17.12.49..ebuild b/kde-apps/cantor/cantor-17.12.49..ebuild index 34cd81af7f..44a40244c8 100644 --- a/kde-apps/cantor/cantor-17.12.49..ebuild +++ b/kde-apps/cantor/cantor-17.12.49..ebuild @@ -32,6 +32,7 @@ DEPEND=" $(add_frameworks_dep kparts) $(add_frameworks_dep kpty) $(add_frameworks_dep ktexteditor) + $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_qt_dep qtgui) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 34cd81af7f..44a40244c8 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -32,6 +32,7 @@ DEPEND=" $(add_frameworks_dep kparts) $(add_frameworks_dep kpty) $(add_frameworks_dep ktexteditor) + $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_qt_dep qtgui)
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 7442efc7e21671af93719c3352b89dd9b6d9453b Author: Michael Palimaka gentoo org> AuthorDate: Sat Aug 26 12:41:32 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Aug 26 13:04:27 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7442efc7 kde-apps/cantor: update HOMEPAGE Package-Manager: Portage-2.3.6, Repoman-2.3.3 kde-apps/cantor/cantor-17.08.49..ebuild | 2 +- kde-apps/cantor/cantor-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/cantor/cantor-17.08.49..ebuild b/kde-apps/cantor/cantor-17.08.49..ebuild index 3a2cdcec57..34cd81af7f 100644 --- a/kde-apps/cantor/cantor-17.08.49..ebuild +++ b/kde-apps/cantor/cantor-17.08.49..ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 ) inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" -HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"; +HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"; KEYWORDS="" IUSE="+analitza julia lua postscript python qalculate R" diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 3a2cdcec57..34cd81af7f 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 ) inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" -HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"; +HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"; KEYWORDS="" IUSE="+analitza julia lua postscript python qalculate R"
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 713054ede9b1ca82390816c35142e7c52ca25113 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 12 12:31:49 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 12 12:31:49 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=713054ed kde-apps/cantor: Switch default to USE=analitza Gentoo-bug: 619534 Package-Manager: Portage-2.3.6, Repoman-2.3.3 kde-apps/cantor/cantor-17.08.0.ebuild | 8 +--- kde-apps/cantor/cantor-17.08.49..ebuild | 8 +--- kde-apps/cantor/cantor-.ebuild | 8 +--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/kde-apps/cantor/cantor-17.08.0.ebuild b/kde-apps/cantor/cantor-17.08.0.ebuild index a747766dff..b432e51bfd 100644 --- a/kde-apps/cantor/cantor-17.08.0.ebuild +++ b/kde-apps/cantor/cantor-17.08.0.ebuild @@ -12,7 +12,7 @@ inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"; KEYWORDS="~amd64 ~x86" -IUSE="analitza julia lua postscript python qalculate +R" +IUSE="+analitza julia lua postscript python qalculate R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -62,10 +62,12 @@ pkg_pretend() { ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then einfo "You have decided to build ${PN} with no backend." einfo "To have this application functional, please enable one of the backends via USE flag:" - einfo "analitza, julia, lua, python, qalculate, R" + einfo "analitza, lua, python, qalculate" einfo "Alternatively, install one of these:" - einfo "# emerge sci-mathematics/maxima" + einfo "# emerge sci-mathematics/maxima (bug #619534)" einfo "# emerge sci-mathematics/octave" + einfo "Experimental available USE flags:" + einfo "julia (not stable, bug #613576), R (bug #619534)" einfo fi diff --git a/kde-apps/cantor/cantor-17.08.49..ebuild b/kde-apps/cantor/cantor-17.08.49..ebuild index d789941fbc..3a2cdcec57 100644 --- a/kde-apps/cantor/cantor-17.08.49..ebuild +++ b/kde-apps/cantor/cantor-17.08.49..ebuild @@ -12,7 +12,7 @@ inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"; KEYWORDS="" -IUSE="analitza julia lua postscript python qalculate +R" +IUSE="+analitza julia lua postscript python qalculate R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -62,10 +62,12 @@ pkg_pretend() { ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then einfo "You have decided to build ${PN} with no backend." einfo "To have this application functional, please enable one of the backends via USE flag:" - einfo "analitza, julia, lua, python, qalculate, R" + einfo "analitza, lua, python, qalculate" einfo "Alternatively, install one of these:" - einfo "# emerge sci-mathematics/maxima" + einfo "# emerge sci-mathematics/maxima (bug #619534)" einfo "# emerge sci-mathematics/octave" + einfo "Experimental available USE flags:" + einfo "julia (not stable, bug #613576), R (bug #619534)" einfo fi diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index d789941fbc..3a2cdcec57 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -12,7 +12,7 @@ inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"; KEYWORDS="" -IUSE="analitza julia lua postscript python qalculate +R" +IUSE="+analitza julia lua postscript python qalculate R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -62,10 +62,12 @@ pkg_pretend() { ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then einfo "You have decided to build ${PN} with no backend." einfo "To have this application functional, please enable one of the backends via USE flag:" - einfo "analitza, julia, lua, python, qalculate, R" + einfo "analitza, lua, python, qalculate" einfo "Alternatively, install one of these:" - einfo "# emerge sci-mathematics/maxima" + einfo "# emerge sci-mathematics/maxima (bug #619534)" einfo "# emerge sci-mathematics/octave" + einfo
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: d7ddd1f18c6b25891cd1ab613b16475988fe0a48 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed May 24 09:32:31 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed May 24 09:32:31 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7ddd1f1 kde-apps/cantor: Patch upstreamed Reported-by: Frank Hellmuth yahoo.de> Gentoo-bug: 619510 Package-Manager: Portage-2.3.5, Repoman-2.3.1 kde-apps/cantor/cantor-.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 9423f1..d789941fbc 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -55,8 +55,6 @@ RDEPEND="${DEPEND}" RESTRICT+=" test" -PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch ) - pkg_pretend() { kde5_pkg_pretend
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 0a3e5f1ec6bf5dfbf84abc78dd6e6f36ffee17d4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 13 14:30:44 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 13 14:30:44 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a3e5f1e kde-apps/cantor: Fix RDEPEND Package-Manager: portage-2.3.3 kde-apps/cantor/cantor-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index fb71acbf56..bff025a191 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -52,7 +52,7 @@ DEPEND=" python? ( ${PYTHON_DEPS} ) R? ( dev-lang/R ) " -RDEPEND="${RDEPEND}" +RDEPEND="${DEPEND}" RESTRICT+=" test"
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/files/, kde-apps/cantor/
commit: cdd2944054be300c0cec172702aa1d3d24e273b1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 13 14:26:08 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 13 14:26:08 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cdd29440 kde-apps/cantor: Patch upstreamed, fix RDEPEND Package-Manager: portage-2.3.3 kde-apps/cantor/cantor-16.12.49..ebuild| 7 +- .../files/cantor-16.12.2-julia-kf-5.31.patch | 190 - 2 files changed, 2 insertions(+), 195 deletions(-) diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild b/kde-apps/cantor/cantor-16.12.49..ebuild index d5da0c7aa1..bff025a191 100644 --- a/kde-apps/cantor/cantor-16.12.49..ebuild +++ b/kde-apps/cantor/cantor-16.12.49..ebuild @@ -52,14 +52,11 @@ DEPEND=" python? ( ${PYTHON_DEPS} ) R? ( dev-lang/R ) " -RDEPEND="${RDEPEND}" +RDEPEND="${DEPEND}" RESTRICT+=" test" -PATCHES=( - "${FILESDIR}"/${PN}-16.12.2-bashism.patch - "${FILESDIR}"/${PN}-16.12.2-julia-kf-5.31.patch -) +PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch ) pkg_pretend() { kde5_pkg_pretend diff --git a/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch b/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch deleted file mode 100644 index 425c61eb48..00 --- a/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 45322d9f58f50df3d4d5755d4199e579f6fd8646 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 11 Feb 2017 22:46:35 +0100 -Subject: [PATCH] [julia] Fix build with -fno-operator-names - -REVIEW: 129942 - src/backends/julia/juliaexpression.cpp | 6 +++--- - src/backends/julia/juliaextensions.cpp | 4 ++-- - src/backends/julia/juliahighlighter.cpp| 4 ++-- - src/backends/julia/juliakeywords.cpp | 10 +- - src/backends/julia/juliaserver/juliaserver.cpp | 4 ++-- - src/backends/julia/juliaserver/main.cpp| 4 ++-- - src/backends/julia/juliasession.cpp| 4 ++-- - 7 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/src/backends/julia/juliaexpression.cpp b/src/backends/julia/juliaexpression.cpp -index 27cdd85..618200d 100644 a/src/backends/julia/juliaexpression.cpp -+++ b/src/backends/julia/juliaexpression.cpp -@@ -40,7 +40,7 @@ void JuliaExpression::evaluate() - - // Plots integration - m_plot_filename.clear(); --if (juliaSession->integratePlots() and checkPlotShowingCommands()) { -+if (juliaSession->integratePlots() && checkPlotShowingCommands()) { - // Simply add plot saving command to the end of execution - QStringList inlinePlotFormats; - inlinePlotFormats << QLatin1String("svg"); -@@ -73,8 +73,8 @@ void JuliaExpression::finalize() - setResult(new Cantor::TextResult(juliaSession->getOutput())); - setStatus(Cantor::Expression::Error); - } else { --if (not m_plot_filename.isEmpty() --and QFileInfo(m_plot_filename).exists()) { -+if (!m_plot_filename.isEmpty() -+&& QFileInfo(m_plot_filename).exists()) { - // If we have plot in result, show it - setResult( - new Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename))); -diff --git a/src/backends/julia/juliaextensions.cpp b/src/backends/julia/juliaextensions.cpp -index 4585c6f..ad5e3a9 100644 a/src/backends/julia/juliaextensions.cpp -+++ b/src/backends/julia/juliaextensions.cpp -@@ -138,7 +138,7 @@ QString JuliaPlotExtension::plotFunction2d( - { - auto new_left = left; - auto new_right = right; --if (new_left.isEmpty() and new_right.isEmpty()) { -+if (new_left.isEmpty() && new_right.isEmpty()) { - new_left = QLatin1String("-1"); - new_right = QLatin1String("1"); - } else if (new_left.isEmpty()) { -@@ -165,7 +165,7 @@ QString JuliaPlotExtension::plotFunction3d( - { - - auto update_interval = [](Interval &interval) { --if (interval.first.isEmpty() and interval.second.isEmpty()) { -+if (interval.first.isEmpty() && interval.second.isEmpty()) { - interval.first = QLatin1String("-1"); - interval.second = QLatin1String("1"); - } else if (interval.first.isEmpty()) { -diff --git a/src/backends/julia/juliahighlighter.cpp b/src/backends/julia/juliahighlighter.cpp -index 4795361..f7d3622 100644 a/src/backends/julia/juliahighlighter.cpp -+++ b/src/backends/julia/juliahighlighter.cpp -@@ -98,7 +98,7 @@ void JuliaHighlighter::highlightBlock(const QString &text) - while (pos < text.length()) { - // Trying to close current environments - bool triggered = false; --for (int i = 0; i < flags.size() and not triggered; i++) { -+for (int i = 0; i < flags.size() && !triggered; i++) { - int flag = flags[i]; - QRegExp ®exp = regexps_
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/files/, kde-apps/cantor/
commit: 20cd86b3fed9b5f581f98be73397f3e63f44c8ed Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 11 21:49:09 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 11 22:50:52 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=20cd86b3 kde-apps/cantor: Fix build with -fno-operator-names Simplify check for LaTeX support. Package-Manager: portage-2.3.3 kde-apps/cantor/cantor-16.12.49..ebuild| 9 +- kde-apps/cantor/cantor-.ebuild | 4 +- .../files/cantor-16.12.2-julia-kf-5.31.patch | 190 + 3 files changed, 198 insertions(+), 5 deletions(-) diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild b/kde-apps/cantor/cantor-16.12.49..ebuild index d78de977bd..d5da0c7aa1 100644 --- a/kde-apps/cantor/cantor-16.12.49..ebuild +++ b/kde-apps/cantor/cantor-16.12.49..ebuild @@ -56,7 +56,10 @@ RDEPEND="${RDEPEND}" RESTRICT+=" test" -PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-16.12.2-bashism.patch + "${FILESDIR}"/${PN}-16.12.2-julia-kf-5.31.patch +) pkg_pretend() { kde5_pkg_pretend @@ -72,9 +75,9 @@ pkg_pretend() { einfo fi - if ! has_version virtual/latex-base || ! has_version dev-texlive/texlive-genericrecommended; then + if ! has_version virtual/latex-base; then einfo "For LaTeX support:" - einfo "# emerge virtual/latex-base dev-texlive/texlive-genericrecommended" + einfo "# emerge virtual/latex-base" fi } diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index d78de977bd..fb71acbf56 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -72,9 +72,9 @@ pkg_pretend() { einfo fi - if ! has_version virtual/latex-base || ! has_version dev-texlive/texlive-genericrecommended; then + if ! has_version virtual/latex-base; then einfo "For LaTeX support:" - einfo "# emerge virtual/latex-base dev-texlive/texlive-genericrecommended" + einfo "# emerge virtual/latex-base" fi } diff --git a/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch b/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch new file mode 100644 index 00..425c61eb48 --- /dev/null +++ b/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch @@ -0,0 +1,190 @@ +From 45322d9f58f50df3d4d5755d4199e579f6fd8646 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 11 Feb 2017 22:46:35 +0100 +Subject: [PATCH] [julia] Fix build with -fno-operator-names + +REVIEW: 129942 +--- + src/backends/julia/juliaexpression.cpp | 6 +++--- + src/backends/julia/juliaextensions.cpp | 4 ++-- + src/backends/julia/juliahighlighter.cpp| 4 ++-- + src/backends/julia/juliakeywords.cpp | 10 +- + src/backends/julia/juliaserver/juliaserver.cpp | 4 ++-- + src/backends/julia/juliaserver/main.cpp| 4 ++-- + src/backends/julia/juliasession.cpp| 4 ++-- + 7 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/src/backends/julia/juliaexpression.cpp b/src/backends/julia/juliaexpression.cpp +index 27cdd85..618200d 100644 +--- a/src/backends/julia/juliaexpression.cpp b/src/backends/julia/juliaexpression.cpp +@@ -40,7 +40,7 @@ void JuliaExpression::evaluate() + + // Plots integration + m_plot_filename.clear(); +-if (juliaSession->integratePlots() and checkPlotShowingCommands()) { ++if (juliaSession->integratePlots() && checkPlotShowingCommands()) { + // Simply add plot saving command to the end of execution + QStringList inlinePlotFormats; + inlinePlotFormats << QLatin1String("svg"); +@@ -73,8 +73,8 @@ void JuliaExpression::finalize() + setResult(new Cantor::TextResult(juliaSession->getOutput())); + setStatus(Cantor::Expression::Error); + } else { +-if (not m_plot_filename.isEmpty() +-and QFileInfo(m_plot_filename).exists()) { ++if (!m_plot_filename.isEmpty() ++&& QFileInfo(m_plot_filename).exists()) { + // If we have plot in result, show it + setResult( + new Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename))); +diff --git a/src/backends/julia/juliaextensions.cpp b/src/backends/julia/juliaextensions.cpp +index 4585c6f..ad5e3a9 100644 +--- a/src/backends/julia/juliaextensions.cpp b/src/backends/julia/juliaextensions.cpp +@@ -138,7 +138,7 @@ QString JuliaPlotExtension::plotFunction2d( + { + auto new_left = left; + auto new_right = right; +-if (new_left.isEmpty() and new_right.isEmpty()) { ++if (new_left.isEmpty() && new_right.isEmpty()) { + new_left = QLatin1String("-1"); + new_right = QLatin1String("1"); + }
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
commit: 17df09aa6b27fc8df525472ce8d227ae7f4834f1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 11 21:03:50 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 11 21:03:50 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=17df09aa kde-apps/cantor: Fix bashism Gentoo-bug: 596940 Thanks-to: Michael Palimaka (kensington) Package-Manager: portage-2.3.3 kde-apps/cantor/cantor-16.12.49..ebuild| 2 ++ kde-apps/cantor/cantor-.ebuild | 2 ++ kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 + 3 files changed, 17 insertions(+) diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild b/kde-apps/cantor/cantor-16.12.49..ebuild index 8952906c50..0db7d4c646 100644 --- a/kde-apps/cantor/cantor-16.12.49..ebuild +++ b/kde-apps/cantor/cantor-16.12.49..ebuild @@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}" RESTRICT+=" test" +PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch ) + pkg_pretend() { kde5_pkg_pretend diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 8952906c50..0db7d4c646 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}" RESTRICT+=" test" +PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch ) + pkg_pretend() { kde5_pkg_pretend diff --git a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch new file mode 100644 index 00..424ca4d15a --- /dev/null +++ b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake +index 6303417..6494884 100644 +--- a/cmake/FindR.cmake b/cmake/FindR.cmake +@@ -31,7 +31,7 @@ IF(R_EXECUTABLE) + OUTPUT_VARIABLE R_INCLUDE_DIR) + ELSE(WIN32) + EXECUTE_PROCESS( +-COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR" ++COMMAND ${R_EXECUTABLE} CMD sh -c "printf $R_INCLUDE_DIR" + OUTPUT_VARIABLE R_INCLUDE_DIR) + ENDIF(WIN32) + ENDIF(NOT R_INCLUDE_DIR)
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 0620af39e75e562bddfc750b7a5c18e5a05d8b14 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 11 21:15:03 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 11 21:15:03 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0620af39 kde-apps/cantor: Add einfo about LaTeX support Gentoo-bug: 603608 Reported-by: Emmanuel Lepage Vallee gmail.com> Package-Manager: portage-2.3.3 kde-apps/cantor/cantor-16.12.49..ebuild | 6 ++ kde-apps/cantor/cantor-.ebuild | 6 ++ 2 files changed, 12 insertions(+) diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild b/kde-apps/cantor/cantor-16.12.49..ebuild index 0db7d4c646..d78de977bd 100644 --- a/kde-apps/cantor/cantor-16.12.49..ebuild +++ b/kde-apps/cantor/cantor-16.12.49..ebuild @@ -69,6 +69,12 @@ pkg_pretend() { einfo "Alternatively, install one of these:" einfo "# emerge sci-mathematics/maxima" einfo "# emerge sci-mathematics/octave" + einfo + fi + + if ! has_version virtual/latex-base || ! has_version dev-texlive/texlive-genericrecommended; then + einfo "For LaTeX support:" + einfo "# emerge virtual/latex-base dev-texlive/texlive-genericrecommended" fi } diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 0db7d4c646..d78de977bd 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -69,6 +69,12 @@ pkg_pretend() { einfo "Alternatively, install one of these:" einfo "# emerge sci-mathematics/maxima" einfo "# emerge sci-mathematics/octave" + einfo + fi + + if ! has_version virtual/latex-base || ! has_version dev-texlive/texlive-genericrecommended; then + einfo "For LaTeX support:" + einfo "# emerge virtual/latex-base dev-texlive/texlive-genericrecommended" fi }
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: c6ae7f86ed58c4da14b3e3569b224d29ceed8c7f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 11 21:01:11 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 11 21:01:11 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6ae7f86 kde-apps/cantor: Fix sandbox violation Gentoo-bug: 602894 Thanks-to: Vadim A. Misbakh-Soloviov Package-Manager: portage-2.3.3 kde-apps/cantor/cantor-16.12.49..ebuild | 2 ++ kde-apps/cantor/cantor-.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild b/kde-apps/cantor/cantor-16.12.49..ebuild index 1d2916dc6a..8952906c50 100644 --- a/kde-apps/cantor/cantor-16.12.49..ebuild +++ b/kde-apps/cantor/cantor-16.12.49..ebuild @@ -84,6 +84,8 @@ src_prepare() { } src_configure() { + use julia && addpredict /proc/self/mem # bug 602894 + local mycmakeargs=( $(cmake-utils_use_find_package analitza Analitza5) $(cmake-utils_use_find_package julia Julia) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 1d2916dc6a..8952906c50 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -84,6 +84,8 @@ src_prepare() { } src_configure() { + use julia && addpredict /proc/self/mem # bug 602894 + local mycmakeargs=( $(cmake-utils_use_find_package analitza Analitza5) $(cmake-utils_use_find_package julia Julia)
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: dd5b8564144e4a678f62e07d1149fb8728079a7d Author: Johannes Huber gentoo org> AuthorDate: Thu Feb 2 10:35:10 2017 + Commit: Johannes Huber gentoo org> CommitDate: Thu Feb 2 10:35:35 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dd5b8564 kde-apps/cantor: Drop bogus dependency Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/cantor/cantor-16.12.49..ebuild | 6 ++ kde-apps/cantor/cantor-.ebuild | 6 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild b/kde-apps/cantor/cantor-16.12.49..ebuild index 4a6bbb9..1d2916d 100644 --- a/kde-apps/cantor/cantor-16.12.49..ebuild +++ b/kde-apps/cantor/cantor-16.12.49..ebuild @@ -19,7 +19,7 @@ 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*') -RDEPEND=" +DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -52,9 +52,7 @@ RDEPEND=" python? ( ${PYTHON_DEPS} ) R? ( dev-lang/R ) " -DEPEND="${RDEPEND} - dev-cpp/eigen:2 -" +RDEPEND="${RDEPEND}" RESTRICT+=" test" diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 4a6bbb9..1d2916d 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -19,7 +19,7 @@ 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*') -RDEPEND=" +DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -52,9 +52,7 @@ RDEPEND=" python? ( ${PYTHON_DEPS} ) R? ( dev-lang/R ) " -DEPEND="${RDEPEND} - dev-cpp/eigen:2 -" +RDEPEND="${RDEPEND}" RESTRICT+=" test"
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 006ba5e1a8c0c3e0e96e77cdec9a31e49bad0a81 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jan 5 13:58:37 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jan 5 13:59:30 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=006ba5e1 kde-apps/cantor: add subslot dep for sci-libs/libqalculate Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/cantor/cantor-16.12.49..ebuild | 2 +- kde-apps/cantor/cantor-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild b/kde-apps/cantor/cantor-16.12.49..ebuild index d9d1859..4a6bbb9 100644 --- a/kde-apps/cantor/cantor-16.12.49..ebuild +++ b/kde-apps/cantor/cantor-16.12.49..ebuild @@ -46,7 +46,7 @@ RDEPEND=" lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln - sci-libs/libqalculate + sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( ${PYTHON_DEPS} ) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index d9d1859..4a6bbb9 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -46,7 +46,7 @@ RDEPEND=" lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln - sci-libs/libqalculate + sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( ${PYTHON_DEPS} )
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 08d68abcb2f11d1aadce657088aeab918036a90d Author: Michael Palimaka gentoo org> AuthorDate: Wed Nov 30 14:21:34 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Nov 30 14:21:37 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=08d68abc kde-apps/cantor: remove empty lines in pkg_pretend The empty lines were useful in separating output when this message was in pkg_postinst, but pkg_pretend doesn't suffer from the same problem. Package-Manager: portage-2.3.2 kde-apps/cantor/cantor-16.12.49..ebuild | 2 -- kde-apps/cantor/cantor-.ebuild | 2 -- 2 files changed, 4 deletions(-) diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild b/kde-apps/cantor/cantor-16.12.49..ebuild index 022066a..1a63794 100644 --- a/kde-apps/cantor/cantor-16.12.49..ebuild +++ b/kde-apps/cantor/cantor-16.12.49..ebuild @@ -63,14 +63,12 @@ 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 - einfo einfo "You have decided to build ${PN} with no backend." einfo "To have this application functional, please enable one of the backends via USE flag:" einfo "analitza, julia, lua, python, qalculate, R" einfo "Alternatively, install one of these:" einfo "# emerge sci-mathematics/maxima" einfo "# emerge sci-mathematics/octave" - einfo fi } diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 022066a..1a63794 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -63,14 +63,12 @@ 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 - einfo einfo "You have decided to build ${PN} with no backend." einfo "To have this application functional, please enable one of the backends via USE flag:" einfo "analitza, julia, lua, python, qalculate, R" einfo "Alternatively, install one of these:" einfo "# emerge sci-mathematics/maxima" einfo "# emerge sci-mathematics/octave" - einfo fi }
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 81006f8284b08a2b5097da883709f268dfa535d5 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Nov 26 23:32:15 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Nov 27 11:30:46 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=81006f82 kde-apps/cantor: Fix DEPENDs, add USE=julia, pkg_postinst -> pkg_pretend Better warn before the emerge than afterwards. Add two runtime backends to pkg_pretend message. Gentoo-bug: 598926 Package-Manager: portage-2.3.0 kde-apps/cantor/cantor-16.12.49..ebuild | 40 + kde-apps/cantor/cantor-.ebuild | 40 + kde-apps/cantor/metadata.xml| 1 + 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild b/kde-apps/cantor/cantor-16.12.49..ebuild index ed84d7b..022066a 100644 --- a/kde-apps/cantor/cantor-16.12.49..ebuild +++ b/kde-apps/cantor/cantor-16.12.49..ebuild @@ -13,7 +13,7 @@ inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"; KEYWORDS="" -IUSE="analitza lua postscript python qalculate +R" +IUSE="analitza julia lua postscript python qalculate +R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -26,8 +26,8 @@ RDEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kio) $(add_frameworks_dep knewstuff) $(add_frameworks_dep kparts) @@ -36,11 +36,13 @@ RDEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) $(add_qt_dep qtxmlpatterns) analitza? ( $(add_kdeapps_dep analitza) ) + julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln @@ -51,10 +53,26 @@ RDEPEND=" R? ( dev-lang/R ) " DEPEND="${RDEPEND} - >=dev-cpp/eigen-2.0.3:2 + dev-cpp/eigen:2 " -RESTRICT="test" +RESTRICT+=" test" + +pkg_pretend() { + kde5_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 + einfo + einfo "You have decided to build ${PN} with no backend." + einfo "To have this application functional, please enable one of the backends via USE flag:" + einfo "analitza, julia, lua, python, qalculate, R" + einfo "Alternatively, install one of these:" + einfo "# emerge sci-mathematics/maxima" + einfo "# emerge sci-mathematics/octave" + einfo + fi +} pkg_setup() { use python && python_setup @@ -72,6 +90,7 @@ src_prepare() { src_configure() { local mycmakeargs=( $(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 postscript LibSpectre) $(cmake-utils_use_find_package python PythonLibs) @@ -80,16 +99,3 @@ src_configure() { ) kde5_src_configure } - -pkg_postinst() { - kde5_pkg_postinst - - if ! use analitza && ! use lua && ! use python && ! use qalculate && ! use R; then - echo - ewarn "You have decided to build ${PN} with no backend." - ewarn "To have this application functional, please do one of below:" - ewarn "# emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'lua', 'python', 'qalculate' or 'R' USE flag enabled" - ewarn "# emerge -vaDu sci-mathematics/maxima" - echo - fi -} diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index ed84d7b..022066a 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -13,7 +13,7 @@ inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"; KEYWORDS="" -IUSE="analitza lua postscript python qalculate +R" +IUSE="analitza julia lua postscript python qalculate +R" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -26,8 +26,8 @@ RDEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kcras
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/files/
commit: 06f62d794bf9c815d90c4a062a4c0b590e9fcaf8 Author: Johannes Huber gentoo org> AuthorDate: Fri Apr 8 17:32:49 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Apr 8 17:32:49 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=06f62d79 kde-apps/cantor: Remove unused patch Package-Manager: portage-2.2.28 kde-apps/cantor/files/cantor-15.12.3-tests.patch | 49 1 file changed, 49 deletions(-) diff --git a/kde-apps/cantor/files/cantor-15.12.3-tests.patch b/kde-apps/cantor/files/cantor-15.12.3-tests.patch deleted file mode 100644 index 5cea78d..000 --- a/kde-apps/cantor/files/cantor-15.12.3-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ a/src/backends/maxima/CMakeLists.txt 2016-03-21 02:16:05.549024821 +0100 -+++ b/src/backends/maxima/CMakeLists.txt 2016-03-21 02:22:07.951014021 +0100 -@@ -21,12 +21,14 @@ - target_link_libraries(cantor_maximabackend KF5::Pty) - endif(NOT WIN32) - -+if (BUILD_TESTING) - add_executable( testmaxima testmaxima.cpp) - target_link_libraries( testmaxima - cantorlibs - cantortest - ${QTTEST_LIBRARY} - ) -+endif() - - install( FILES cantor_maxima.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} ) - install( FILES keywords.xml cantor-initmaxima.lisp DESTINATION ${KDE_INSTALL_DATADIR}/cantor/maximabackend) a/src/backends/sage/CMakeLists.txt 2016-03-21 01:23:19.251791138 +0100 -+++ b/src/backends/sage/CMakeLists.txt 2016-03-21 01:27:16.300827617 +0100 -@@ -17,12 +17,14 @@ - - target_link_libraries( cantor_sagebackend KF5::Pty) - -+if (BUILD_TESTING) - add_executable( testsage testsage.cpp) - target_link_libraries( testsage - ${QT_QTTEST_LIBRARY} - cantorlibs - cantortest - ) -+endif() - - install( FILES cantor_sage.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} ) - install( FILES keywords.xml DESTINATION ${KDE_INSTALL_DATADIR}/cantor/sagebackend) a/src/backends/python2/CMakeLists.txt 2016-03-21 01:28:39.055793038 +0100 -+++ b/src/backends/python2/CMakeLists.txt 2016-03-21 01:35:01.451012440 +0100 -@@ -20,10 +20,12 @@ - cantor_pythonbackend - ) - -+if (BUILD_TESTING) - add_executable(testpython2 testpython2.cpp) - target_link_libraries(testpython2 ${QT_QTTEST_LIBRARY} cantorlibs cantortest) - - add_test(NAME testpython2 COMMAND testpython2) -+endif() - - install(FILES cantor_python2.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}) - install(FILES python2backend.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 04811fd320ec1859d95872782585f1860149eb2a Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Mar 30 10:33:54 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Mar 30 18:19:06 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=04811fd3 kde-apps/cantor: Patch upstreamed Package-Manager: portage-2.2.27 kde-apps/cantor/cantor-16.04.49..ebuild | 9 - kde-apps/cantor/cantor-.ebuild | 9 - 2 files changed, 18 deletions(-) diff --git a/kde-apps/cantor/cantor-16.04.49..ebuild b/kde-apps/cantor/cantor-16.04.49..ebuild index 3cdcedc..7f99167 100644 --- a/kde-apps/cantor/cantor-16.04.49..ebuild +++ b/kde-apps/cantor/cantor-16.04.49..ebuild @@ -56,8 +56,6 @@ DEPEND="${RDEPEND} RESTRICT="test" -PATCHES=( "${FILESDIR}/${PN}-15.12.3-tests.patch" ) - pkg_setup() { use python && python_setup kde5_pkg_setup @@ -69,13 +67,6 @@ src_prepare() { # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo sed -e "/^find_package(PythonLibs3)/ s/^/#/" \ -i src/backends/CMakeLists.txt || die - - if ! use test ; then - sed -e "/add_subdirectory(test)/ s/^/#DONT/" \ - -i src/lib/CMakeLists.txt || die - sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \ - -i src/backends/python3/CMakeLists.txt || die - fi } src_configure() { diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 3cdcedc..7f99167 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -56,8 +56,6 @@ DEPEND="${RDEPEND} RESTRICT="test" -PATCHES=( "${FILESDIR}/${PN}-15.12.3-tests.patch" ) - pkg_setup() { use python && python_setup kde5_pkg_setup @@ -69,13 +67,6 @@ src_prepare() { # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo sed -e "/^find_package(PythonLibs3)/ s/^/#/" \ -i src/backends/CMakeLists.txt || die - - if ! use test ; then - sed -e "/add_subdirectory(test)/ s/^/#DONT/" \ - -i src/lib/CMakeLists.txt || die - sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \ - -i src/backends/python3/CMakeLists.txt || die - fi } src_configure() {
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 1d1c8b964068df13c56bedacd32b042e54d40f0e Author: Michael Palimaka gentoo org> AuthorDate: Fri Jun 12 19:05:22 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Jun 12 19:05:22 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d1c8b96 [kde-apps/cantor] kde-base -> kde-apps. Package-Manager: portage-2.2.20 kde-apps/cantor/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml index 0bed71d..60d8fee 100644 --- a/kde-apps/cantor/metadata.xml +++ b/kde-apps/cantor/metadata.xml @@ -3,7 +3,7 @@ kde - Enable kde-base/analitza backend support + Enable kde-apps/analitza backend support Enable sci-libs/libqalculate backend support Enable dev-lang/R backend support
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: 47db1e38d043d3040b18c01445ab6f7b70ce7005 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Apr 26 22:16:46 2015 + Commit: Manuel Rüger gentoo org> CommitDate: Sun May 3 09:41:03 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=47db1e38 [kde-apps/cantor] Frameworks merged to master Dropped python3 support, build system requires fixing Package-Manager: portage-2.2.18 kde-apps/cantor/cantor-.ebuild | 62 +++--- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 2f572fe..2ac8976 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -4,20 +4,42 @@ EAPI=5 -KDE_HANDBOOK="optional" +KDE_HANDBOOK="true" +KDE_TEST="true" PYTHON_COMPAT=( python2_7 ) -inherit kde4-base python-single-r1 +# FIXME: PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) +inherit kde5 python-r1 -DESCRIPTION="KDE4 interface for doing mathematics and scientific computing" +DESCRIPTION="Interface for doing mathematics and scientific computing" HOMEPAGE="http://www.kde.org/applications/education/cantor http://edu.kde.org/cantor"; KEYWORDS="" -IUSE="analitza debug postscript python qalculate +R" +IUSE="analitza lua 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*') RDEPEND=" - analitza? ( $(add_kdebase_dep analitza) ) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kpty) + $(add_frameworks_dep ktexteditor) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + analitza? ( $(add_kdeapps_dep analitza) ) + lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate @@ -25,7 +47,6 @@ RDEPEND=" postscript? ( app-text/libspectre ) python? ( ${PYTHON_DEPS} ) R? ( dev-lang/R ) - dev-qt/qtxmlpatterns:4 " DEPEND="${RDEPEND} >=dev-cpp/eigen-2.0.3:2 @@ -34,29 +55,36 @@ DEPEND="${RDEPEND} RESTRICT="test" pkg_setup() { - use python && python-single-r1_pkg_setup - kde4-base_pkg_setup + use python && python_setup + kde5_pkg_setup +} + +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() { local mycmakeargs=( - $(cmake-utils_use_with analitza) - $(cmake-utils_use_with postscript LibSpectre) - $(cmake-utils_use_with python PythonLibs) - $(cmake-utils_use_with qalculate) - $(cmake-utils_use_with R) + $(cmake-utils_use_find_package analitza Analitza5) + $(cmake-utils_use_find_package lua LuaJIT) + $(cmake-utils_use_find_package postscript LibSpectre) + $(cmake-utils_use_find_package python PythonLibs) + $(cmake-utils_use_find_package qalculate) + $(cmake-utils_use_find_package R) ) - kde4-base_src_configure + kde5_src_configure } pkg_postinst() { - kde4-base_pkg_postinst + kde5_pkg_postinst - if ! use analitza && ! use python && ! use qalculate && ! use R; then + if ! use analitza && ! use lua && ! use python && ! use qalculate && ! use R; then echo ewarn "You have decided to build ${PN} with no backend." ewarn "To have this application functional, please do one of below:" - ewarn "# emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'python', 'qalculate' or 'R' USE flag enabled" + ewarn "# emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'lua', 'python', 'qalculate' or 'R' USE flag enabled" ewarn "# emerge -vaDu sci-mathematics/maxima" echo fi
[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
commit: aa1aacb334375e2dab4b943237676847849726ad Author: Michael Palimaka gentoo org> AuthorDate: Thu Dec 4 10:44:26 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Dec 4 10:44:34 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=aa1aacb3 [kde-apps/cantor] Cantor is still KDE4-based, so use KDE4 Analitza. Package-Manager: portage-2.2.15 --- kde-apps/cantor/cantor-14.11.97.ebuild | 2 +- kde-apps/cantor/cantor-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/cantor/cantor-14.11.97.ebuild b/kde-apps/cantor/cantor-14.11.97.ebuild index 742301e..1f251be 100644 --- a/kde-apps/cantor/cantor-14.11.97.ebuild +++ b/kde-apps/cantor/cantor-14.11.97.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # TODO Add Sage Mathematics Software backend (http://www.sagemath.org) RDEPEND=" - analitza? ( $(add_kdeapps_dep analitza) ) + analitza? ( $(add_kdebase_dep analitza) ) qalculate? ( sci-libs/cln sci-libs/libqalculate diff --git a/kde-apps/cantor/cantor-.ebuild b/kde-apps/cantor/cantor-.ebuild index 54dc97d..33897eb 100644 --- a/kde-apps/cantor/cantor-.ebuild +++ b/kde-apps/cantor/cantor-.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # TODO Add Sage Mathematics Software backend (http://www.sagemath.org) RDEPEND=" - analitza? ( $(add_kdeapps_dep analitza) ) + analitza? ( $(add_kdebase_dep analitza) ) qalculate? ( sci-libs/cln sci-libs/libqalculate