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)

Reply via email to