* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2014-12-04 10:44 Michael Palimaka
0 siblings, 0 replies; 41+ messages in thread
From: Michael Palimaka @ 2014-12-04 10:44 UTC (permalink / raw
To: gentoo-commits
commit: aa1aacb334375e2dab4b943237676847849726ad
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 4 10:44:26 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 4 10:44:34 2014 +0000
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-9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 54dc97d..33897eb 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2015-05-03 16:38 Manuel Rüger
0 siblings, 0 replies; 41+ messages in thread
From: Manuel Rüger @ 2015-05-03 16:38 UTC (permalink / raw
To: gentoo-commits
commit: 47db1e38d043d3040b18c01445ab6f7b70ce7005
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Apr 26 22:16:46 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun May 3 09:41:03 2015 +0000
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-9999.ebuild | 62 +++++++++++++++++++++++++++-----------
1 file changed, 45 insertions(+), 17 deletions(-)
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 2f572fe..2ac8976 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2015-06-12 19:06 Michael Palimaka
0 siblings, 0 replies; 41+ messages in thread
From: Michael Palimaka @ 2015-06-12 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 1d1c8b964068df13c56bedacd32b042e54d40f0e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 19:05:22 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 19:05:22 2015 +0000
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 @@
<pkgmetadata>
<herd>kde</herd>
<use>
- <flag name="analitza">Enable <pkg>kde-base/analitza</pkg> backend support</flag>
+ <flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag>
<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
</use>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2016-03-30 18:19 Michael Palimaka
0 siblings, 0 replies; 41+ messages in thread
From: Michael Palimaka @ 2016-03-30 18:19 UTC (permalink / raw
To: gentoo-commits
commit: 04811fd320ec1859d95872782585f1860149eb2a
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Mar 30 10:33:54 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 18:19:06 2016 +0000
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.9999.ebuild | 9 ---------
kde-apps/cantor/cantor-9999.ebuild | 9 ---------
2 files changed, 18 deletions(-)
diff --git a/kde-apps/cantor/cantor-16.04.49.9999.ebuild b/kde-apps/cantor/cantor-16.04.49.9999.ebuild
index 3cdcedc..7f99167 100644
--- a/kde-apps/cantor/cantor-16.04.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-16.04.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 3cdcedc..7f99167 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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() {
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2016-11-27 11:30 Michael Palimaka
0 siblings, 0 replies; 41+ messages in thread
From: Michael Palimaka @ 2016-11-27 11:30 UTC (permalink / raw
To: gentoo-commits
commit: 81006f8284b08a2b5097da883709f268dfa535d5
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 26 23:32:15 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:30:46 2016 +0000
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.9999.ebuild | 40 +++++++++++++++++------------
kde-apps/cantor/cantor-9999.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.9999.ebuild b/kde-apps/cantor/cantor-16.12.49.9999.ebuild
index ed84d7b..022066a 100644
--- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-16.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index ed84d7b..022066a 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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/metadata.xml b/kde-apps/cantor/metadata.xml
index 632627c..20e3a59 100644
--- a/kde-apps/cantor/metadata.xml
+++ b/kde-apps/cantor/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag>
+ <flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend support</flag>
<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
</use>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2016-11-30 14:21 Michael Palimaka
0 siblings, 0 replies; 41+ messages in thread
From: Michael Palimaka @ 2016-11-30 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 08d68abcb2f11d1aadce657088aeab918036a90d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 14:21:34 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 14:21:37 2016 +0000
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.9999.ebuild | 2 --
kde-apps/cantor/cantor-9999.ebuild | 2 --
2 files changed, 4 deletions(-)
diff --git a/kde-apps/cantor/cantor-16.12.49.9999.ebuild b/kde-apps/cantor/cantor-16.12.49.9999.ebuild
index 022066a..1a63794 100644
--- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-16.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 022066a..1a63794 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2017-01-05 13:59 Michael Palimaka
0 siblings, 0 replies; 41+ messages in thread
From: Michael Palimaka @ 2017-01-05 13:59 UTC (permalink / raw
To: gentoo-commits
commit: 006ba5e1a8c0c3e0e96e77cdec9a31e49bad0a81
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 5 13:58:37 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 13:59:30 2017 +0000
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.9999.ebuild | 2 +-
kde-apps/cantor/cantor-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-16.12.49.9999.ebuild b/kde-apps/cantor/cantor-16.12.49.9999.ebuild
index d9d1859..4a6bbb9 100644
--- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-16.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index d9d1859..4a6bbb9 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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} )
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2017-02-02 10:35 Johannes Huber
0 siblings, 0 replies; 41+ messages in thread
From: Johannes Huber @ 2017-02-02 10:35 UTC (permalink / raw
To: gentoo-commits
commit: dd5b8564144e4a678f62e07d1149fb8728079a7d
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 10:35:10 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 10:35:35 2017 +0000
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.9999.ebuild | 6 ++----
kde-apps/cantor/cantor-9999.ebuild | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/kde-apps/cantor/cantor-16.12.49.9999.ebuild b/kde-apps/cantor/cantor-16.12.49.9999.ebuild
index 4a6bbb9..1d2916d 100644
--- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-16.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 4a6bbb9..1d2916d 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2017-02-11 21:25 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2017-02-11 21:25 UTC (permalink / raw
To: gentoo-commits
commit: c6ae7f86ed58c4da14b3e3569b224d29ceed8c7f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 21:01:11 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 21:01:11 2017 +0000
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.9999.ebuild | 2 ++
kde-apps/cantor/cantor-9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/kde-apps/cantor/cantor-16.12.49.9999.ebuild b/kde-apps/cantor/cantor-16.12.49.9999.ebuild
index 1d2916dc6a..8952906c50 100644
--- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-16.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 1d2916dc6a..8952906c50 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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)
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2017-02-11 21:25 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2017-02-11 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 0620af39e75e562bddfc750b7a5c18e5a05d8b14
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 21:15:03 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 21:15:03 2017 +0000
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 <elv1313 <AT> gmail.com>
Package-Manager: portage-2.3.3
kde-apps/cantor/cantor-16.12.49.9999.ebuild | 6 ++++++
kde-apps/cantor/cantor-9999.ebuild | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/kde-apps/cantor/cantor-16.12.49.9999.ebuild b/kde-apps/cantor/cantor-16.12.49.9999.ebuild
index 0db7d4c646..d78de977bd 100644
--- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-16.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 0db7d4c646..d78de977bd 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2017-02-13 14:31 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2017-02-13 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 0a3e5f1ec6bf5dfbf84abc78dd6e6f36ffee17d4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 14:30:44 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 14:30:44 2017 +0000
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-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index fb71acbf56..bff025a191 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="
python? ( ${PYTHON_DEPS} )
R? ( dev-lang/R )
"
-RDEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
RESTRICT+=" test"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2017-05-24 9:32 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2017-05-24 9:32 UTC (permalink / raw
To: gentoo-commits
commit: d7ddd1f18c6b25891cd1ab613b16475988fe0a48
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 09:32:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 24 09:32:31 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7ddd1f1
kde-apps/cantor: Patch upstreamed
Reported-by: Frank Hellmuth <fhellmuth <AT> yahoo.de>
Gentoo-bug: 619510
Package-Manager: Portage-2.3.5, Repoman-2.3.1
kde-apps/cantor/cantor-9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 11119423f1..d789941fbc 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -55,8 +55,6 @@ RDEPEND="${DEPEND}"
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
-
pkg_pretend() {
kde5_pkg_pretend
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2017-08-12 12:32 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2017-08-12 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 713054ede9b1ca82390816c35142e7c52ca25113
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 12:31:49 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 12:31:49 2017 +0000
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.9999.ebuild | 8 +++++---
kde-apps/cantor/cantor-9999.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.9999.ebuild b/kde-apps/cantor/cantor-17.08.49.9999.ebuild
index d789941fbc..3a2cdcec57 100644
--- a/kde-apps/cantor/cantor-17.08.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-17.08.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index d789941fbc..3a2cdcec57 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2017-08-26 13:04 Michael Palimaka
0 siblings, 0 replies; 41+ messages in thread
From: Michael Palimaka @ 2017-08-26 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 7442efc7e21671af93719c3352b89dd9b6d9453b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 12:41:32 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 13:04:27 2017 +0000
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.9999.ebuild | 2 +-
kde-apps/cantor/cantor-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-17.08.49.9999.ebuild b/kde-apps/cantor/cantor-17.08.49.9999.ebuild
index 3a2cdcec57..34cd81af7f 100644
--- a/kde-apps/cantor/cantor-17.08.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-17.08.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 3a2cdcec57..34cd81af7f 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2017-12-25 10:30 Michael Palimaka
0 siblings, 0 replies; 41+ messages in thread
From: Michael Palimaka @ 2017-12-25 10:30 UTC (permalink / raw
To: gentoo-commits
commit: b1d188d4b393c2a3011ca2275f5613c958d475a0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 10:18:28 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 10:30:25 2017 +0000
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.9999.ebuild | 1 +
kde-apps/cantor/cantor-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/kde-apps/cantor/cantor-17.12.49.9999.ebuild b/kde-apps/cantor/cantor-17.12.49.9999.ebuild
index 34cd81af7f..44a40244c8 100644
--- a/kde-apps/cantor/cantor-17.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-17.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 34cd81af7f..44a40244c8 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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)
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2018-08-18 20:51 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2018-08-18 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 6549b674ea7d5b00af860d0a98a2be3e99f4f7ba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 20:41:06 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 20:41:06 2018 +0000
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.9999.ebuild | 22 +++++++++++-----------
kde-apps/cantor/cantor-9999.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.9999.ebuild b/kde-apps/cantor/cantor-18.08.49.9999.ebuild
index 4b71b17f99..ae9d56c2d2 100644
--- a/kde-apps/cantor/cantor-18.08.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-18.08.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 4b71b17f99..ae9d56c2d2 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2018-08-18 20:51 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2018-08-18 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 339cab5e58e95c1aae2b80ef15c6807880e45275
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 20:44:07 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 20:44:07 2018 +0000
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.9999.ebuild | 6 +++---
kde-apps/cantor/cantor-9999.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.9999.ebuild b/kde-apps/cantor/cantor-18.08.49.9999.ebuild
index ae9d56c2d2..2c26722eb3 100644
--- a/kde-apps/cantor/cantor-18.08.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-18.08.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index ae9d56c2d2..2c26722eb3 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2018-10-11 19:46 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2018-10-11 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 996ef206e6622304fc75617b991fd7de1323bc83
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 19:46:09 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 19:46:09 2018 +0000
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 <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
kde-apps/cantor/cantor-9999.ebuild | 7 +++++--
kde-apps/cantor/metadata.xml | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 2c26722eb3..060397632e 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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 @@
<flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag>
<flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend support</flag>
<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
+ <flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2019-04-21 11:18 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2019-04-21 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 9621790813cc9ffcf4507b2e1dc6b1294f61ff17
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 11:17:56 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 11:17:56 2019 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-19.04.49.9999.ebuild | 2 +-
kde-apps/cantor/cantor-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-19.04.49.9999.ebuild b/kde-apps/cantor/cantor-19.04.49.9999.ebuild
index c814e2a4a3..601738f64c 100644
--- a/kde-apps/cantor/cantor-19.04.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-19.04.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index c814e2a4a3..601738f64c 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2019-05-09 22:07 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2019-05-09 22:07 UTC (permalink / raw
To: gentoo-commits
commit: dbcd5c2f9cf56d201d92459200f3e3024d84bff2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 9 21:41:39 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 9 21:51:23 2019 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-19.04.49.9999.ebuild | 24 +++++++++---------------
kde-apps/cantor/cantor-9999.ebuild | 24 +++++++++---------------
2 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/kde-apps/cantor/cantor-19.04.49.9999.ebuild b/kde-apps/cantor/cantor-19.04.49.9999.ebuild
index 601738f64c..8a32077f6f 100644
--- a/kde-apps/cantor/cantor-19.04.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-19.04.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 601738f64c..8a32077f6f 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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)
)
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2019-11-17 19:43 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2019-11-17 19:43 UTC (permalink / raw
To: gentoo-commits
commit: ce2d1e9f563107ccd31302d79b0e516e8bc940a4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 19:39:06 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 19:42:56 2019 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-19.11.80.ebuild | 4 +---
kde-apps/cantor/cantor-19.12.49.9999.ebuild | 4 +---
kde-apps/cantor/cantor-9999.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.9999.ebuild b/kde-apps/cantor/cantor-19.12.49.9999.ebuild
index 28e2827ebb..bdee8c1be6 100644
--- a/kde-apps/cantor/cantor-19.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-19.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 28e2827ebb..bdee8c1be6 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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 @@
<flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag>
<flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend support</flag>
<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
- <flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2019-11-17 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2019-11-17 21:15 UTC (permalink / raw
To: gentoo-commits
commit: ad2c363103c89166c097a1f7fb0bab4ad02e5b3f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 21:10:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 21:14:53 2019 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-19.11.80.ebuild | 13 +++++++------
kde-apps/cantor/cantor-19.12.49.9999.ebuild | 13 +++++++------
kde-apps/cantor/cantor-9999.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.9999.ebuild b/kde-apps/cantor/cantor-19.12.49.9999.ebuild
index bdee8c1be6..cf7e219445 100644
--- a/kde-apps/cantor/cantor-19.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-19.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index bdee8c1be6..cf7e219445 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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 )
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2019-11-17 21:25 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2019-11-17 21:25 UTC (permalink / raw
To: gentoo-commits
commit: b235fe6e9f715e2d79c28913d6829e68573d4335
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 21:25:25 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 21:25:28 2019 +0000
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 <asturm <AT> 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
+}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2019-11-18 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2019-11-18 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 3083c7f020f5292b74796153d81c48843cb10f63
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 08:01:51 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 08:01:51 2019 +0000
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 <asturm <AT> 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..0000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2019-11-24 23:51 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2019-11-24 23:51 UTC (permalink / raw
To: gentoo-commits
commit: 54d79529c589b86cceb73ae9c107ceda14e7465c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 23:36:59 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 23:36:59 2019 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-19.12.49.9999.ebuild | 2 +-
kde-apps/cantor/cantor-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-19.12.49.9999.ebuild b/kde-apps/cantor/cantor-19.12.49.9999.ebuild
index cf7e219445..2268db45d4 100644
--- a/kde-apps/cantor/cantor-19.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-19.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 1be8b9bfb5..ff8d9cd58e 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2020-04-30 16:05 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2020-04-30 16:05 UTC (permalink / raw
To: gentoo-commits
commit: 6b1c7e6f7529a93f7fa52ce71b453ae98a8adcef
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 15:52:43 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 16:05:04 2020 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-20.04.49.9999.ebuild | 1 -
kde-apps/cantor/cantor-9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-20.04.49.9999.ebuild b/kde-apps/cantor/cantor-20.04.49.9999.ebuild
index e9b585db06..dcc4a9f803 100644
--- a/kde-apps/cantor/cantor-20.04.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-20.04.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index b3bd7c02f2..e42cec7a6b 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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)
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2020-05-24 17:27 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2020-05-24 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 85efb9376bef822bdc24b6cbcc48e049e8a30947
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:36:35 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 24 16:36:35 2020 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 57c232ef4f..710bf0f0ea 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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)
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2020-07-18 8:57 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2020-07-18 8:57 UTC (permalink / raw
To: gentoo-commits
commit: 9934539258bcf5350aaa9b1b469d8af76605873a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 08:44:08 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 08:48:21 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=99345392
kde-apps/cantor: 20.07.80 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 0000000000..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
+}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2020-08-30 19:02 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2020-08-30 19:02 UTC (permalink / raw
To: gentoo-commits
commit: a47cf00ca438045fc0661afb4848b74fb11c8aea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 07:46:24 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 07:47:06 2020 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-20.08.49.9999.ebuild | 1 +
kde-apps/cantor/cantor-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/kde-apps/cantor/cantor-20.08.49.9999.ebuild b/kde-apps/cantor/cantor-20.08.49.9999.ebuild
index c00a427837..53ab76f030 100644
--- a/kde-apps/cantor/cantor-20.08.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-20.08.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index be691809a5..c27bf5f5a5 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2020-09-07 15:07 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2020-09-07 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 66e30b8c66aadf6f882b9bbae10e2d619bccee37
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 13:09:10 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 15:05:48 2020 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-20.08.49.9999.ebuild | 43 +++++++++++++----------------
kde-apps/cantor/cantor-9999.ebuild | 43 +++++++++++++----------------
2 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/kde-apps/cantor/cantor-20.08.49.9999.ebuild b/kde-apps/cantor/cantor-20.08.49.9999.ebuild
index 53ab76f030..c807935fdf 100644
--- a/kde-apps/cantor/cantor-20.08.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-20.08.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index c27bf5f5a5..e1073ed888 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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/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
+}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2020-10-17 9:58 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2020-10-17 9:58 UTC (permalink / raw
To: gentoo-commits
commit: 0f0568d89981e2046e3c8d4ae1e7ea876bb77bae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 09:57:47 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 09:57:47 2020 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-20.08.49.9999.ebuild | 3 +--
kde-apps/cantor/cantor-9999.ebuild | 5 +----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/kde-apps/cantor/cantor-20.08.49.9999.ebuild b/kde-apps/cantor/cantor-20.08.49.9999.ebuild
index ee1c4bf4b3..0c2f9a32b6 100644
--- a/kde-apps/cantor/cantor-20.08.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-20.08.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 1a6538747c..a55070cb8a 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2020-12-28 16:00 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2020-12-28 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 005287b8721073d616f9aa294c81d7d32d0c44c7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 15:59:11 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 15:59:11 2020 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-20.12.49.9999.ebuild | 14 ++++++++++----
kde-apps/cantor/cantor-9999.ebuild | 14 ++++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/kde-apps/cantor/cantor-20.12.49.9999.ebuild b/kde-apps/cantor/cantor-20.12.49.9999.ebuild
index 022dd14d94..c9d06f1a21 100644
--- a/kde-apps/cantor/cantor-20.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-20.12.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 022dd14d94..c9d06f1a21 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2021-04-04 19:21 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 19:21 UTC (permalink / raw
To: gentoo-commits
commit: e87882d2442ed1e266e7b788ec81e382c87a25d6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 3 11:06:58 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 19:04:09 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e87882d2
kde-apps/cantor: Drop superfluous optfeature header
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 5f71e54354..1f3d7cef1f 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2021-08-25 9:00 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2021-08-25 9:00 UTC (permalink / raw
To: gentoo-commits
commit: 9c13d12241b73ef964af06c8b19f97c771dbc971
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 25 07:25:12 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 25 08:31:22 2021 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-21.08.49.9999.ebuild | 2 +-
kde-apps/cantor/cantor-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-21.08.49.9999.ebuild b/kde-apps/cantor/cantor-21.08.49.9999.ebuild
index 1c301ac9bf..13a7e74c7e 100644
--- a/kde-apps/cantor/cantor-21.08.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-21.08.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 92c286c968..6e8f937832 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2022-07-03 23:13 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2022-07-03 23:13 UTC (permalink / raw
To: gentoo-commits
commit: 0bf117ea67643099a6d9e7a59d197e011400a5dd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 3 23:12:53 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 23:12:53 2022 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-22.04.49.9999.ebuild | 2 +-
kde-apps/cantor/cantor-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-22.04.49.9999.ebuild b/kde-apps/cantor/cantor-22.04.49.9999.ebuild
index c1292fe511..6d45a22f53 100644
--- a/kde-apps/cantor/cantor-22.04.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-22.04.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index c1292fe511..6d45a22f53 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2023-03-22 18:55 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2023-03-22 18:55 UTC (permalink / raw
To: gentoo-commits
commit: d472f1c478a11a34cdc6e329ad695806de4be356
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 00:26:43 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 18:54:40 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d472f1c4
kde-apps/cantor: Drop obsolete Python3_EXECUTABLE cmakearg
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 197e583fe7..a6d0b84bc6 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2023-08-06 10:04 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2023-08-06 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 31848b855c95c137b95d72bdb8fbc2c3e337ca4f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 09:36:02 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 09:36:02 2023 +0000
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 <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 715a9e4f50..0cc0e1b8ab 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2024-02-23 8:54 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2024-02-23 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 2b9f0c114be8ddd8ff6c88805f2ecd8aa04e6ffe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 08:54:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 08:54:49 2024 +0000
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 <sam <AT> 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.9999.ebuild | 5 +++++
kde-apps/cantor/cantor-9999.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.9999.ebuild b/kde-apps/cantor/cantor-24.02.49.9999.ebuild
index 3e6f3ced91..a79facb107 100644
--- a/kde-apps/cantor/cantor-24.02.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-24.02.49.9999.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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 3e6f3ced91..a79facb107 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.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
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2024-02-27 21:25 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2024-02-27 21:25 UTC (permalink / raw
To: gentoo-commits
commit: a8a2c6b0ca807167546763f592dc0eca142020f4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 21:22:53 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 21:25:07 2024 +0000
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 <sam <AT> 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.9999.ebuild | 12 +++++++-----
kde-apps/cantor/cantor-9999.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.9999.ebuild b/kde-apps/cantor/cantor-24.02.49.9999.ebuild
index a79facb107..d124392bdc 100644
--- a/kde-apps/cantor/cantor-24.02.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-24.02.49.9999.ebuild
@@ -19,12 +19,14 @@ HOMEPAGE="https://apps.kde.org/cantor/ https://edu.kde.org/cantor/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-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-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index a79facb107..d124392bdc 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -19,12 +19,14 @@ HOMEPAGE="https://apps.kde.org/cantor/ https://edu.kde.org/cantor/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-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)
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2024-02-27 21:26 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2024-02-27 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 68cf45d028f20b6d496bc025468d136b6db5bbc7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 21:25:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 21:25:44 2024 +0000
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 <sam <AT> 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 @@
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
<use>
- <flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag>
+ <!-- <flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag> -->
<flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend support</flag>
<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
@ 2024-02-27 21:36 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2024-02-27 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 45e19555a4d055428601d489551531a38b96c111
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 21:36:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 21:36:31 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=45e19555
kde-apps/cantor: drop 24.01.95
Signed-off-by: Sam James <sam <AT> 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..0000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 41+ messages in thread
end of thread, other threads:[~2024-02-27 21:36 UTC | newest]
Thread overview: 41+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-04 10:44 [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2015-05-03 16:38 Manuel Rüger
2015-06-12 19:06 Michael Palimaka
2016-03-30 18:19 Michael Palimaka
2016-11-27 11:30 Michael Palimaka
2016-11-30 14:21 Michael Palimaka
2017-01-05 13:59 Michael Palimaka
2017-02-02 10:35 Johannes Huber
2017-02-11 21:25 Andreas Sturmlechner
2017-02-11 21:25 Andreas Sturmlechner
2017-02-13 14:31 Andreas Sturmlechner
2017-05-24 9:32 Andreas Sturmlechner
2017-08-12 12:32 Andreas Sturmlechner
2017-08-26 13:04 Michael Palimaka
2017-12-25 10:30 Michael Palimaka
2018-08-18 20:51 Andreas Sturmlechner
2018-08-18 20:51 Andreas Sturmlechner
2018-10-11 19:46 Andreas Sturmlechner
2019-04-21 11:18 Andreas Sturmlechner
2019-05-09 22:07 Andreas Sturmlechner
2019-11-17 19:43 Andreas Sturmlechner
2019-11-17 21:15 Andreas Sturmlechner
2019-11-17 21:25 Andreas Sturmlechner
2019-11-18 8:20 Andreas Sturmlechner
2019-11-24 23:51 Andreas Sturmlechner
2020-04-30 16:05 Andreas Sturmlechner
2020-05-24 17:27 Andreas Sturmlechner
2020-07-18 8:57 Andreas Sturmlechner
2020-08-30 19:02 Andreas Sturmlechner
2020-09-07 15:07 Andreas Sturmlechner
2020-10-17 9:58 Andreas Sturmlechner
2020-12-28 16:00 Andreas Sturmlechner
2021-04-04 19:21 Andreas Sturmlechner
2021-08-25 9:00 Andreas Sturmlechner
2022-07-03 23:13 Andreas Sturmlechner
2023-03-22 18:55 Andreas Sturmlechner
2023-08-06 10:04 Andreas Sturmlechner
2024-02-23 8:54 Sam James
2024-02-27 21:25 Sam James
2024-02-27 21:26 Sam James
2024-02-27 21:36 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox