| 1 |
commit: ce2d1e9f563107ccd31302d79b0e516e8bc940a4 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 17 19:39:06 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 17 19:42:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ce2d1e9f |
| 7 |
|
| 8 |
kde-apps/cantor: Discount no longer optional, unfortunately botched |
| 9 |
|
| 10 |
Cantor relies on a bundled discount-2.2.6 with non-upstreamed patches. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-apps/cantor/cantor-19.11.80.ebuild | 4 +--- |
| 16 |
kde-apps/cantor/cantor-19.12.49.9999.ebuild | 4 +--- |
| 17 |
kde-apps/cantor/cantor-9999.ebuild | 4 +--- |
| 18 |
kde-apps/cantor/metadata.xml | 1 - |
| 19 |
4 files changed, 3 insertions(+), 10 deletions(-) |
| 20 |
|
| 21 |
diff --git a/kde-apps/cantor/cantor-19.11.80.ebuild b/kde-apps/cantor/cantor-19.11.80.ebuild |
| 22 |
index c42d6a84d8..545d2cc5cc 100644 |
| 23 |
--- a/kde-apps/cantor/cantor-19.11.80.ebuild |
| 24 |
+++ b/kde-apps/cantor/cantor-19.11.80.ebuild |
| 25 |
@@ -18,7 +18,7 @@ https://edu.kde.org/cantor/" |
| 26 |
LICENSE="GPL-2" # TODO: CHECK |
| 27 |
SLOT="5" |
| 28 |
KEYWORDS="~amd64 ~arm64 ~x86" |
| 29 |
-IUSE="+analitza julia lua markdown postscript python qalculate R" |
| 30 |
+IUSE="+analitza julia lua postscript python qalculate R" |
| 31 |
|
| 32 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 33 |
|
| 34 |
@@ -50,7 +50,6 @@ DEPEND=" |
| 35 |
analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) |
| 36 |
julia? ( dev-lang/julia ) |
| 37 |
lua? ( dev-lang/luajit:2 ) |
| 38 |
- markdown? ( >=app-text/discount-2.2.2 ) |
| 39 |
qalculate? ( |
| 40 |
sci-libs/cln |
| 41 |
sci-libs/libqalculate:= |
| 42 |
@@ -101,7 +100,6 @@ src_configure() { |
| 43 |
$(cmake_use_find_package analitza Analitza5) |
| 44 |
$(cmake_use_find_package julia Julia) |
| 45 |
$(cmake_use_find_package lua LuaJIT) |
| 46 |
- $(cmake_use_find_package markdown Discount) |
| 47 |
$(cmake_use_find_package postscript LibSpectre) |
| 48 |
$(cmake_use_find_package python PythonLibs3) |
| 49 |
$(cmake_use_find_package qalculate Qalculate) |
| 50 |
|
| 51 |
diff --git a/kde-apps/cantor/cantor-19.12.49.9999.ebuild b/kde-apps/cantor/cantor-19.12.49.9999.ebuild |
| 52 |
index 28e2827ebb..bdee8c1be6 100644 |
| 53 |
--- a/kde-apps/cantor/cantor-19.12.49.9999.ebuild |
| 54 |
+++ b/kde-apps/cantor/cantor-19.12.49.9999.ebuild |
| 55 |
@@ -18,7 +18,7 @@ https://edu.kde.org/cantor/" |
| 56 |
LICENSE="GPL-2" # TODO: CHECK |
| 57 |
SLOT="5" |
| 58 |
KEYWORDS="" |
| 59 |
-IUSE="+analitza julia lua markdown postscript python qalculate R" |
| 60 |
+IUSE="+analitza julia lua postscript python qalculate R" |
| 61 |
|
| 62 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 63 |
|
| 64 |
@@ -50,7 +50,6 @@ DEPEND=" |
| 65 |
analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) |
| 66 |
julia? ( dev-lang/julia ) |
| 67 |
lua? ( dev-lang/luajit:2 ) |
| 68 |
- markdown? ( >=app-text/discount-2.2.2 ) |
| 69 |
qalculate? ( |
| 70 |
sci-libs/cln |
| 71 |
sci-libs/libqalculate:= |
| 72 |
@@ -101,7 +100,6 @@ src_configure() { |
| 73 |
$(cmake_use_find_package analitza Analitza5) |
| 74 |
$(cmake_use_find_package julia Julia) |
| 75 |
$(cmake_use_find_package lua LuaJIT) |
| 76 |
- $(cmake_use_find_package markdown Discount) |
| 77 |
$(cmake_use_find_package postscript LibSpectre) |
| 78 |
$(cmake_use_find_package python PythonLibs3) |
| 79 |
$(cmake_use_find_package qalculate Qalculate) |
| 80 |
|
| 81 |
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild |
| 82 |
index 28e2827ebb..bdee8c1be6 100644 |
| 83 |
--- a/kde-apps/cantor/cantor-9999.ebuild |
| 84 |
+++ b/kde-apps/cantor/cantor-9999.ebuild |
| 85 |
@@ -18,7 +18,7 @@ https://edu.kde.org/cantor/" |
| 86 |
LICENSE="GPL-2" # TODO: CHECK |
| 87 |
SLOT="5" |
| 88 |
KEYWORDS="" |
| 89 |
-IUSE="+analitza julia lua markdown postscript python qalculate R" |
| 90 |
+IUSE="+analitza julia lua postscript python qalculate R" |
| 91 |
|
| 92 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 93 |
|
| 94 |
@@ -50,7 +50,6 @@ DEPEND=" |
| 95 |
analitza? ( >=kde-apps/analitza-${PVCUT}:5 ) |
| 96 |
julia? ( dev-lang/julia ) |
| 97 |
lua? ( dev-lang/luajit:2 ) |
| 98 |
- markdown? ( >=app-text/discount-2.2.2 ) |
| 99 |
qalculate? ( |
| 100 |
sci-libs/cln |
| 101 |
sci-libs/libqalculate:= |
| 102 |
@@ -101,7 +100,6 @@ src_configure() { |
| 103 |
$(cmake_use_find_package analitza Analitza5) |
| 104 |
$(cmake_use_find_package julia Julia) |
| 105 |
$(cmake_use_find_package lua LuaJIT) |
| 106 |
- $(cmake_use_find_package markdown Discount) |
| 107 |
$(cmake_use_find_package postscript LibSpectre) |
| 108 |
$(cmake_use_find_package python PythonLibs3) |
| 109 |
$(cmake_use_find_package qalculate Qalculate) |
| 110 |
|
| 111 |
diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml |
| 112 |
index 23b2f303ad..20e3a5914a 100644 |
| 113 |
--- a/kde-apps/cantor/metadata.xml |
| 114 |
+++ b/kde-apps/cantor/metadata.xml |
| 115 |
@@ -9,7 +9,6 @@ |
| 116 |
<flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag> |
| 117 |
<flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend support</flag> |
| 118 |
<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag> |
| 119 |
- <flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag> |
| 120 |
<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag> |
| 121 |
</use> |
| 122 |
</pkgmetadata> |
Archives