From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 12659138334 for ; Sun, 17 Nov 2019 19:43:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B760CE07A7; Sun, 17 Nov 2019 19:43:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 907ADE07A7 for ; Sun, 17 Nov 2019 19:43:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27F1434CF2A for ; Sun, 17 Nov 2019 19:43:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5A9F85C for ; Sun, 17 Nov 2019 19:43:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1574019776.ce2d1e9f563107ccd31302d79b0e516e8bc940a4.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/cantor/cantor-19.11.80.ebuild kde-apps/cantor/cantor-19.12.49.9999.ebuild kde-apps/cantor/cantor-9999.ebuild kde-apps/cantor/metadata.xml X-VCS-Directories: kde-apps/cantor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ce2d1e9f563107ccd31302d79b0e516e8bc940a4 X-VCS-Branch: master Date: Sun, 17 Nov 2019 19:43:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 151f7df6-ebe6-4bb1-88bc-5fcfc12e4118 X-Archives-Hash: c281907f0b3696d0ca569b7a160d1493 commit: ce2d1e9f563107ccd31302d79b0e516e8bc940a4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 17 19:39:06 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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 @@ Enable kde-apps/analitza backend support Enable dev-lang/julia backend support Enable sci-libs/libqalculate backend support - Enable Markdown support via app-text/discount Enable dev-lang/R backend support