public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
Date: Sun, 17 Nov 2019 19:43:36 +0000 (UTC)	[thread overview]
Message-ID: <1574019776.ce2d1e9f563107ccd31302d79b0e516e8bc940a4.asturm@gentoo> (raw)

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	other threads:[~2019-11-17 19:43 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-17 19:43 Andreas Sturmlechner [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-27 21:25 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-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

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=1574019776.ce2d1e9f563107ccd31302d79b0e516e8bc940a4.asturm@gentoo \
    --to=asturm@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