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>

Reply via email to