public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2016-04-20  3:21 Michał Górny
  0 siblings, 0 replies; 20+ messages in thread
From: Michał Górny @ 2016-04-20  3:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4698cbdc66a4740e84718fb999a76fb1ea77a29d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 03:19:48 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 03:20:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4698cbdc

kde-apps/cantor: Fix analitza category

 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 59453ab..632627c 100644
--- a/kde-apps/cantor/metadata.xml
+++ b/kde-apps/cantor/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2016-11-30 14:20 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2016-11-30 14:20 UTC (permalink / raw
  To: gentoo-commits

commit:     656ea1f50c74b74e8b31bf4c355c18e612a2bfa6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 26 23:59:31 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 14:20:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=656ea1f5

kde-apps/cantor: Add missing DEPENDs, improve backends einfo

Gentoo-bug: 598926

Package-Manager: portage-2.3.0

 kde-apps/cantor/cantor-16.08.3.ebuild | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/kde-apps/cantor/cantor-16.08.3.ebuild b/kde-apps/cantor/cantor-16.08.3.ebuild
index d5fb0a6..ace0c65 100644
--- a/kde-apps/cantor/cantor-16.08.3.ebuild
+++ b/kde-apps/cantor/cantor-16.08.3.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	$(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,6 +37,7 @@ 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)
@@ -54,7 +56,21 @@ DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-2.0.3:2
 "
 
-RESTRICT="test"
+RESTRICT+=" test"
+
+pkg_pretend() {
+	kde5_pkg_pretend
+
+	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
+		! use analitza && ! 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, R"
+		einfo "Alternatively, install one of these:"
+		einfo "    # emerge sci-mathematics/maxima"
+		einfo "    # emerge sci-mathematics/octave"
+	fi
+}
 
 pkg_setup() {
 	use python && python_setup
@@ -80,16 +96,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
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2017-02-02 10:28 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2017-02-02 10:28 UTC (permalink / raw
  To: gentoo-commits

commit:     34c7a2e04b138e3a9c20c94a4dbddc9365297583
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 10:28:21 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 10:28:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c7a2e0

kde-apps/cantor: Drop bogus dependency

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/cantor/cantor-16.08.3.ebuild | 8 +++-----
 kde-apps/cantor/cantor-16.12.1.ebuild | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/kde-apps/cantor/cantor-16.08.3.ebuild b/kde-apps/cantor/cantor-16.08.3.ebuild
index c93a443..7ca2b54 100644
--- a/kde-apps/cantor/cantor-16.08.3.ebuild
+++ b/kde-apps/cantor/cantor-16.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -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.0.3:2
-"
+REPEND="${DEPEND}"
 
 RESTRICT+=" test"
 

diff --git a/kde-apps/cantor/cantor-16.12.1.ebuild b/kde-apps/cantor/cantor-16.12.1.ebuild
index a6e74d9..bd14dca 100644
--- a/kde-apps/cantor/cantor-16.12.1.ebuild
+++ b/kde-apps/cantor/cantor-16.12.1.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="${DEPEND}"
 
 RESTRICT+=" test"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2017-02-11 23:35 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2017-02-11 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     40dd87b57b14c0f695529c786e59404e648f83a1
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 23:34:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40dd87b5

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.2.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild b/kde-apps/cantor/cantor-16.12.2.ebuild
index a1f359a35e..19314488a8 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.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; then
+		einfo "For LaTeX support:"
+		einfo "    # emerge virtual/latex-base"
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2017-02-11 23:35 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2017-02-11 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     91df9cfebbc0ac58b663856f13a087305738c4a7
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 23:34:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91df9cfe

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.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild b/kde-apps/cantor/cantor-16.12.2.ebuild
index ffa0d358d8..96540cab7f 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2017-02-18 12:48 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2017-02-18 12:48 UTC (permalink / raw
  To: gentoo-commits

commit:     2158d2bb75b0563a504e4c844c8837eaa90bb6ca
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 12:40:17 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 12:47:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2158d2bb

kde-apps/cantor: Drop accidentally introduced live ebuild

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-9999.ebuild | 107 -------------------------------------
 1 file changed, 107 deletions(-)

diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
deleted file mode 100644
index fb71acbf56..0000000000
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-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"
-
-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)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep ktexteditor)
-	$(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
-		sci-libs/libqalculate:=
-	)
-	postscript? ( app-text/libspectre )
-	python? ( ${PYTHON_DEPS} )
-	R? ( dev-lang/R )
-"
-RDEPEND="${RDEPEND}"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
-
-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 "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
-
-	if ! has_version virtual/latex-base; then
-		einfo "For LaTeX support:"
-		einfo "    # emerge virtual/latex-base"
-	fi
-}
-
-pkg_setup() {
-	use python && python_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=(
-		$(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)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package R R)
-	)
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2017-08-12 12:16 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2017-08-12 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     2b71517f6172e1e6230b1b9857aa5fe7a9fbca5b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 12:12:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 12:15:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b71517f

kde-apps/cantor: Switched default to USE=analitza

Gentoo-bug: 619534
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 kde-apps/cantor/cantor-17.04.3.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kde-apps/cantor/cantor-17.04.3.ebuild b/kde-apps/cantor/cantor-17.04.3.ebuild
index 871d6529b36..11af79af47d 100644
--- a/kde-apps/cantor/cantor-17.04.3.ebuild
+++ b/kde-apps/cantor/cantor-17.04.3.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} )"
 
@@ -64,10 +64,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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2017-10-07 21:39 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2017-10-07 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     6c8b183c919f327c0e9169d6958476aae1148dc9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 21:39:14 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 21:39:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8b183c

kde-apps/cantor: Set SRC_URI

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 kde-apps/cantor/cantor-16.12.3.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.3.ebuild b/kde-apps/cantor/cantor-16.12.3.ebuild
index 215bc594b2d..14332980db5 100644
--- a/kde-apps/cantor/cantor-16.12.3.ebuild
+++ b/kde-apps/cantor/cantor-16.12.3.ebuild
@@ -11,6 +11,8 @@ 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"
+SRC_URI="mirror://kde/Attic/applications/${PV}/src/${P}.tar.xz"
+
 KEYWORDS="amd64 x86"
 IUSE="analitza julia lua postscript python qalculate +R"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2017-11-30  2:07 Thomas Deutschmann
  0 siblings, 0 replies; 20+ messages in thread
From: Thomas Deutschmann @ 2017-11-30  2:07 UTC (permalink / raw
  To: gentoo-commits

commit:     80f82f74003c2a395697b88c662603632e8c8e41
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 01:58:19 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 02:07:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f82f74

kde-apps/cantor: x86 stable (bug #637292)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 kde-apps/cantor/cantor-17.08.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/cantor/cantor-17.08.3.ebuild b/kde-apps/cantor/cantor-17.08.3.ebuild
index 1aa548e3c43..67f9e206bf9 100644
--- a/kde-apps/cantor/cantor-17.08.3.ebuild
+++ b/kde-apps/cantor/cantor-17.08.3.ebuild
@@ -11,7 +11,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"
+KEYWORDS="~amd64 x86"
 IUSE="+analitza julia lua postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2019-05-09 22:08 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2019-05-09 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6cba2808cb4d28157f57ef7c8dbfb22b39dfc002
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 22:07:16 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May  9 22:08:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cba2808

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.1.ebuild | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/kde-apps/cantor/cantor-19.04.1.ebuild b/kde-apps/cantor/cantor-19.04.1.ebuild
index 774b4d25871..181b280d4be 100644
--- a/kde-apps/cantor/cantor-19.04.1.ebuild
+++ b/kde-apps/cantor/cantor-19.04.1.ebuild
@@ -5,9 +5,8 @@ EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-# FIXME: PYTHON_COMPAT=( 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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2020-04-30 15:59 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2020-04-30 15:59 UTC (permalink / raw
  To: gentoo-commits

commit:     d6be985ba9a87757f165f1aa1fec390bc0ed6317
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 15:58:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6be985b

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.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/cantor/cantor-20.04.0.ebuild b/kde-apps/cantor/cantor-20.04.0.ebuild
index 700b05426a6..eac655834a2 100644
--- a/kde-apps/cantor/cantor-20.04.0.ebuild
+++ b/kde-apps/cantor/cantor-20.04.0.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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2020-08-30  7:58 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2020-08-30  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     74847f2cb771bbb0f1d648c1b5b62c0aa3c1b86d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 07:49:12 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 07:58:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74847f2c

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.04.3.ebuild => cantor-20.04.3-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/cantor/cantor-20.04.3.ebuild b/kde-apps/cantor/cantor-20.04.3-r1.ebuild
similarity index 99%
rename from kde-apps/cantor/cantor-20.04.3.ebuild
rename to kde-apps/cantor/cantor-20.04.3-r1.ebuild
index 0980ffdc295..fa579218619 100644
--- a/kde-apps/cantor/cantor-20.04.3.ebuild
+++ b/kde-apps/cantor/cantor-20.04.3-r1.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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2020-12-29 19:54 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2020-12-29 19:54 UTC (permalink / raw
  To: gentoo-commits

commit:     1316e9572318eef731d853e32bfae5ad15c648f3
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: Tue Dec 29 19:54:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1316e957

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.0.ebuild | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/kde-apps/cantor/cantor-20.12.0.ebuild b/kde-apps/cantor/cantor-20.12.0.ebuild
index f8c2cd2064c..066493ac4f7 100644
--- a/kde-apps/cantor/cantor-20.12.0.ebuild
+++ b/kde-apps/cantor/cantor-20.12.0.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="~amd64 ~arm64 ~x86"
 IUSE="+analitza julia lua postscript python qalculate R"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
 
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+# TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
 DEPEND="
 	app-text/poppler[qt5]
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -50,7 +51,7 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
 	julia? ( dev-lang/julia )
-	lua? ( dev-lang/luajit:2 )
+	lua? ( ${LUA_DEPS} )
 	qalculate? (
 		sci-libs/cln
 		sci-libs/libqalculate:=
@@ -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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2021-12-09 17:12 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2021-12-09 17:12 UTC (permalink / raw
  To: gentoo-commits

commit:     717efa239563ffc48719540b8a7a38709416d6b4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 17:11:57 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 17:12:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=717efa23

kde-apps/cantor: Tarball respun

Closes: https://bugs.gentoo.org/828610
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/cantor/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index b14b2c608407..5c612ae7737c 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,2 +1,2 @@
 DIST cantor-21.08.3.tar.xz 9190432 BLAKE2B fb701abadad15ca4579f54bb6d5504dd5d791c2090181c957493b001e61cd1ec6737c314db3929e7b2b6b4503e368235ce24b57a93bd5ceae572f9c555088545 SHA512 9ecfd88016138dc6e15afcf034f53907e706fb5eb972174198c22f061d3feb0b4ffa9698c5f6b4caafe3ef102e7554ae2ed125ac46850f509e35000f8ee02a0b
-DIST cantor-21.12.0.tar.xz 9184724 BLAKE2B 86ffd1974723c3fcdbec0a634001c7270ee564c9f5e911b00243144d003cc0ed9f0b520430bf6706a51e78f4afb590f4924818679f07351985543037fc629c62 SHA512 f57470be31ec5499cb7018b9ac8e595cd252d1f5dba540b1b34402679c175fe3ab87453206754ace01f2051a3ef183b8e5f2eb6197ea100ecf1a745763d69ec5
+DIST cantor-21.12.0.tar.xz 9185684 BLAKE2B 03491e4992e68c0106382a412bb74ce6a0b9440680a38d911572cbea2013c7ea97a631f328016eaa579138a2b5e16f9be69339dbe300de766b25679230553280 SHA512 ce1cb1f5b97584247337838e886f169f2e8f85fb9738f82b797c7584bec4976aaddac206fe63c3c63848cf3f5a458dd136f9b5113c5873547109cd54c521c70d


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2023-03-23 16:26 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2023-03-23 16:26 UTC (permalink / raw
  To: gentoo-commits

commit:     e439dec91ed2212c57c2f84aaf5920e88c89eb81
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: Thu Mar 23 16:26:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e439dec9

kde-apps/cantor: Drop unused Python3_EXECUTABLE cmakearg

Closes: https://bugs.gentoo.org/881785
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/cantor/cantor-22.08.3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/cantor/cantor-22.08.3.ebuild b/kde-apps/cantor/cantor-22.08.3.ebuild
index 8caa0867b857..25ff7f64cda3 100644
--- a/kde-apps/cantor/cantor-22.08.3.ebuild
+++ b/kde-apps/cantor/cantor-22.08.3.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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2023-03-23 19:58 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2023-03-23 19:58 UTC (permalink / raw
  To: gentoo-commits

commit:     da879b291872bb4ed9481283a35229dd8859382a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 19:55:44 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 19:55:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da879b29

kde-apps/cantor: Drop unused Python3_EXECUTABLE cmakearg

Bug: https://bugs.gentoo.org/881785
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/cantor/cantor-22.12.3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/cantor/cantor-22.12.3.ebuild b/kde-apps/cantor/cantor-22.12.3.ebuild
index b1a1ba2ad2e9..bfca5766e56e 100644
--- a/kde-apps/cantor/cantor-22.12.3.ebuild
+++ b/kde-apps/cantor/cantor-22.12.3.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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2024-01-09 22:22 Andreas K. Hüttel
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas K. Hüttel @ 2024-01-09 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     8e225a87533a354a6a990aecf76f059131bdf4fd
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 22:21:49 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 22:22:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e225a87

kde-apps/cantor: Apply MAKEOPTS="-j1" workaround

Bug: https://bugs.gentoo.org/915679
Bug: https://bugs.gentoo.org/919576
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 kde-apps/cantor/cantor-23.08.4.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kde-apps/cantor/cantor-23.08.4.ebuild b/kde-apps/cantor/cantor-23.08.4.ebuild
index 7496795f83b3..b5bcc0a8995a 100644
--- a/kde-apps/cantor/cantor-23.08.4.ebuild
+++ b/kde-apps/cantor/cantor-23.08.4.ebuild
@@ -100,6 +100,10 @@ src_configure() {
 	ecm_src_configure
 }
 
+src_compile() {
+	MAKEOPTS="-j1" ecm_src_compile
+}
+
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "Maxima backend" sci-mathematics/maxima


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2024-02-23  8:56 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2024-02-23  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     df182f2891606e757be3e8406a69f4a0e53ee324
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 08:55:40 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 08:55:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df182f28

kde-apps/cantor: -j1 workaround

Bug: https://bugs.gentoo.org/919576
Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-apps/cantor/cantor-23.08.5.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kde-apps/cantor/cantor-23.08.5.ebuild b/kde-apps/cantor/cantor-23.08.5.ebuild
index 1ed45d01c1aa..0883cbce2dd2 100644
--- a/kde-apps/cantor/cantor-23.08.5.ebuild
+++ b/kde-apps/cantor/cantor-23.08.5.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] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2024-04-23  6:33 Arthur Zamarin
  0 siblings, 0 replies; 20+ messages in thread
From: Arthur Zamarin @ 2024-04-23  6:33 UTC (permalink / raw
  To: gentoo-commits

commit:     9435d842afbe54e4341ebc7dcf685e2db67b6314
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 06:31:56 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 06:31:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9435d842

kde-apps/cantor: Stabilize 24.02.2 amd64, #930370

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 kde-apps/cantor/cantor-24.02.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/cantor/cantor-24.02.2.ebuild b/kde-apps/cantor/cantor-24.02.2.ebuild
index 70ff80fb3c6c..99c7ff02df92 100644
--- a/kde-apps/cantor/cantor-24.02.2.ebuild
+++ b/kde-apps/cantor/cantor-24.02.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://apps.kde.org/cantor/ https://edu.kde.org/cantor/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 # TODO: restore +analitza once cantor is ported to Qt6
 IUSE="julia lua postscript python qalculate R"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/
@ 2024-06-17 18:49 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2024-06-17 18:49 UTC (permalink / raw
  To: gentoo-commits

commit:     0d9b617056fb02bf2505fc2d4ebbdf86f4800b08
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 18:12:24 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 18:49:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9b6170

kde-apps/cantor: drop 23.08.5, 24.02.2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/cantor/Manifest              |   2 -
 kde-apps/cantor/cantor-23.08.5.ebuild | 115 ---------------------------------
 kde-apps/cantor/cantor-24.02.2.ebuild | 117 ----------------------------------
 kde-apps/cantor/metadata.xml          |   2 +-
 4 files changed, 1 insertion(+), 235 deletions(-)

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 13996e0f03d7..c0f51d4de73c 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,3 +1 @@
-DIST cantor-23.08.5.tar.xz 9287344 BLAKE2B cf47910558f702a4a5a1ca4e045a422b2806e523a58c9071682360160cdceb41a6a954682e1eaa57148fedd1ea1be363ec81b3c7d764e985e3f26f39a06214a0 SHA512 0eb3ba85120def88a7f85c0bb445d5ed580a969e02ff503d811916588aef5e015d7873c33dfacb58a8bd88a06a18ca5e321b2a5567e910afdd85054fa79ede09
-DIST cantor-24.02.2.tar.xz 9301760 BLAKE2B eea8758fd3caa011b75bd3e34531d0af7fea77b9d97a4528a49a1fa18c34808738e8a9ec44fb526965ce03217591f5c572d234d8587dc2e63c3fae4ac746c9c8 SHA512 98647569ef979a88941e5cd3e77653b36209b2c20333a9af4f369d4bf9d702d53bbe458bc6a935b99b8ed51e90437523ec9c9373ef180a06b34202806b31598b
 DIST cantor-24.05.1.tar.xz 9198092 BLAKE2B 21555d041eb49eaf61b1a198aa3b63775c160a9084c6ac581b37f9c560743312744405b4756bffcbe140dcee07d72c75f4edf4449b94a74beda28b899d3e1203 SHA512 f24ad62b1478f9cb3754a7b9ed522e230450a2c41e89adef3a02b457f9bddc75bc068e2cd658082a669e2e52a12e08427124b13b8f26af25d330fa970a427aeb

diff --git a/kde-apps/cantor/cantor-23.08.5.ebuild b/kde-apps/cantor/cantor-23.08.5.ebuild
deleted file mode 100644
index 9034cb42d96b..000000000000
--- a/kde-apps/cantor/cantor-23.08.5.ebuild
+++ /dev/null
@@ -1,115 +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.106.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"
-IUSE="+analitza 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)
-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
-	analitza? ( >=kde-apps/analitza-${PVCUT}: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 )
-"
-RDEPEND="${DEPEND}
-	!analitza? ( !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=(
-		$(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 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
-}

diff --git a/kde-apps/cantor/cantor-24.02.2.ebuild b/kde-apps/cantor/cantor-24.02.2.ebuild
deleted file mode 100644
index 99c7ff02df92..000000000000
--- a/kde-apps/cantor/cantor-24.02.2.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.115.0
-QTMIN=5.15.12
-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
-}

diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml
index 1053a5e0c0bb..fc575ef6c35a 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] 20+ messages in thread

end of thread, other threads:[~2024-06-17 18:50 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-17 18:49 [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-04-23  6:33 Arthur Zamarin
2024-02-23  8:56 Sam James
2024-01-09 22:22 Andreas K. Hüttel
2023-03-23 19:58 Andreas Sturmlechner
2023-03-23 16:26 Andreas Sturmlechner
2021-12-09 17:12 Andreas Sturmlechner
2020-12-29 19:54 Andreas Sturmlechner
2020-08-30  7:58 Andreas Sturmlechner
2020-04-30 15:59 Andreas Sturmlechner
2019-05-09 22:08 Andreas Sturmlechner
2017-11-30  2:07 Thomas Deutschmann
2017-10-07 21:39 Andreas Sturmlechner
2017-08-12 12:16 Andreas Sturmlechner
2017-02-18 12:48 Andreas Sturmlechner
2017-02-11 23:35 Andreas Sturmlechner
2017-02-11 23:35 Andreas Sturmlechner
2017-02-02 10:28 Johannes Huber
2016-11-30 14:20 Michael Palimaka
2016-04-20  3:21 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox