[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
Date: Tue, 27 Feb 2024 21:25:14 +0000 (UTC)	[thread overview]
Message-ID: <1709069107.a8a2c6b0ca807167546763f592dc0eca142020f4.sam@gentoo> (raw)

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)

next             reply	other threads:[~2024-02-27 21:25 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-27 21:25 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-19 15:59 [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/ Andreas Sturmlechner
2025-05-03 19:45 Sam James
2025-05-03  6:31 Sam James
2025-05-03  6:31 Sam James
2024-02-27 21:36 Sam James
2024-02-27 21:26 Sam James
2024-02-23  8:54 Sam James
2023-08-06 10:04 Andreas Sturmlechner
2023-03-22 18:55 Andreas Sturmlechner
2022-07-03 23:13 Andreas Sturmlechner
2021-08-25  9:00 Andreas Sturmlechner
2021-04-04 19:21 Andreas Sturmlechner
2020-12-28 16:00 Andreas Sturmlechner
2020-10-17  9:58 Andreas Sturmlechner
2020-09-07 15:07 Andreas Sturmlechner
2020-08-30 19:02 Andreas Sturmlechner
2020-07-18  8:57 Andreas Sturmlechner
2020-05-24 17:27 Andreas Sturmlechner
2020-04-30 16:05 Andreas Sturmlechner
2019-11-24 23:51 Andreas Sturmlechner
2019-11-18  8:20 Andreas Sturmlechner
2019-11-17 21:25 Andreas Sturmlechner
2019-11-17 21:15 Andreas Sturmlechner
2019-11-17 19:43 Andreas Sturmlechner
2019-05-09 22:07 Andreas Sturmlechner
2019-04-21 11:18 Andreas Sturmlechner
2018-10-11 19:46 Andreas Sturmlechner
2018-08-18 20:51 Andreas Sturmlechner
2018-08-18 20:51 Andreas Sturmlechner
2017-12-25 10:30 Michael Palimaka
2017-08-26 13:04 Michael Palimaka
2017-08-12 12:32 Andreas Sturmlechner
2017-05-24  9:32 Andreas Sturmlechner
2017-02-13 14:31 Andreas Sturmlechner
2017-02-11 21:25 Andreas Sturmlechner
2017-02-11 21:25 Andreas Sturmlechner
2017-02-02 10:35 Johannes Huber
2017-01-05 13:59 Michael Palimaka
2016-11-30 14:21 Michael Palimaka
2016-11-27 11:30 Michael Palimaka
2016-03-30 18:19 Michael Palimaka
2015-06-12 19:06 Michael Palimaka
2015-05-03 16:38 Manuel Rüger
2014-12-04 10:44 Michael Palimaka

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ec59607c7 dfblob:58ec0f5fa dfblob:ec59607c7 dfblob:58ec0f5fa
dfblob:a79facb10 dfblob:d124392bd dfblob:a79facb10 dfblob:d124392bd )
 OR (
bs:"[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1709069107.a8a2c6b0ca807167546763f592dc0eca142020f4.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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