gentoo resync : 24.12.2018

4 files changed, 23 insertions, 19 deletions

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 5a41643c08dc..aae9d65497ab 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
-DIST cantor-18.04.3.tar.xz 2179372 BLAKE2B 1f6055359d239bd3f49d4a95975a13db710bb7aabb708b3e045aebc2b95ae8d9ab875486ea6735104d8df6bf53bfdccc6349e627e7ab32596bb0cfda83db31a0 SHA512 2493d2570f69d0f27489dd86b48a11fa454c4b0d42b821a52ee6489ed6914af826b94a152098144cda40122ddf98d7b121b03c2e4e4b46dc85db83643873d2bb
 DIST cantor-18.08.3.tar.xz 2181020 BLAKE2B 43ce8e60d44d07c1a74219dad3322d23cea89eb9ba199c240d7e95473a79dcaa2a8a2ea08e05a04da00e6bc2fce6cef70b3266c28dd6f9424401bf87b1bfb6a8 SHA512 b6a3bfcc6dce8792fcad9bcaec6b30dfe50ab42b0781a3d33477b2fee1773c20400f4de069176bcf3ae6bfb232a32aa0d5f2e6e9059706f9da6aa65f63a018ec
-EBUILD cantor-18.04.3.ebuild 3179 BLAKE2B f65cd049ec6997ea90b23d95ceb780f253abba21471f951cf42c1e9f6d5800261743ff40307c754486ce50f976da3ece31acfa28573bd75ad2834dc86002962b SHA512 6f6c02bceb62668e6deae92804f6de12a842234a8bc2597f65b93f202ae756f18fc91ab4fda4bc82d396030bdc9bbe8b76cb425386293a2f09676c5d12740e49
-EBUILD cantor-18.08.3.ebuild 3152 BLAKE2B fbf3781010d0fd31c56184ff566bb8ad893d83d9191198213ed97d31d465025c148fb59e000e7510a83332b340563b34ebff23d04ed896982040e6d2d47ede96 SHA512 303a109555f83638c17af5871e1abde198dcef4fa10c35ec2695c17e18a8c73ace16255192d855383957c780ac6d8db2133ef7fcb9df2877385e672441e12949
-MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
+DIST cantor-18.12.0.tar.xz 2240772 BLAKE2B 0d6627f8f41b5cfb211e732ad173a1926396f5c59fb4e4b3c5dccf35fbb9d95ecf0e4cdd16bffbae04615dcb933b1e7da050e6fe2655749d6e334d627ffc8f74 SHA512 d1d2daad69bd982da0ae2b82512e0fe3d15a93406c7d24d28e8587514518e4bebe5f807a0c0eafccefbafae06701dd5cff7fe876f863792ff9a98e355d9aae77
+EBUILD cantor-18.08.3.ebuild 3150 BLAKE2B a846548bd1968dc13764e210aeb76da431594ff42948dc5ac99335e0f94a35450b48992e9e03e23333e612d71c9def189fb84282945057fe46d33cf5f5cac0e3 SHA512 9ebd1fd3b01e929b089eb9e802ae630acbbb30d2179f73962dbbae326d797d7c8efad1f3a4f8063592d54d0793d4b65065fd50cad42591f360881b5cd6c26c04
+EBUILD cantor-18.12.0.ebuild 3297 BLAKE2B dcf0eb5c2c36a2ecf9d6af0749557a6c7f355fa6e2af558b372b6c8118576ff3e9cd14bc528b7acf63d17ab6235a44dcecec5579535f6c6b82061793a9604a84 SHA512 7f50755f3d9a365cbe81bb16a950beb74e008b42349dfd081362adadaa87f9ca69555b51ac12b78d6185b73696c9892ecc55308cfff365eb6d53eb04f2af68b5
+MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
diff --git a/kde-apps/cantor/cantor-18.08.3.ebuild b/kde-apps/cantor/cantor-18.08.3.ebuild
index 0b8b96cfd68b..5b1f787720bd 100644
--- a/kde-apps/cantor/cantor-18.08.3.ebuild
+++ b/kde-apps/cantor/cantor-18.08.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5 python-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"
 HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+analitza julia lua postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cantor/cantor-18.04.3.ebuild b/kde-apps/cantor/cantor-18.12.0.ebuild
index 255635b2326d..4406f96ddb16 100644
--- a/kde-apps/cantor/cantor-18.04.3.ebuild
+++ b/kde-apps/cantor/cantor-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,8 @@ inherit kde5 python-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"
 HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"
-KEYWORDS="amd64 x86"
-IUSE="+analitza julia lua postscript python qalculate R"
+KEYWORDS="~amd64 ~x86"
+IUSE="+analitza julia lua markdown postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -35,6 +35,7 @@ DEPEND="
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep syntax-highlighting)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtsvg)
@@ -44,6 +45,7 @@ DEPEND="
 	analitza? ( $(add_kdeapps_dep analitza) )
 	julia? ( dev-lang/julia )
 	lua? ( dev-lang/luajit:2 )
+	markdown? ( >=app-text/discount-2.2.2 )
 	qalculate? (
 		sci-libs/cln
 		sci-libs/libqalculate:=
@@ -61,20 +63,20 @@ pkg_pretend() {
 
 	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
 		! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
-		einfo "You have decided to build ${PN} with no backend."
-		einfo "To have this application functional, please enable one of the backends via USE flag:"
-		einfo "    analitza, lua, python, qalculate"
-		einfo "Alternatively, install one of these:"
-		einfo "    # emerge sci-mathematics/maxima (bug #619534)"
-		einfo "    # emerge sci-mathematics/octave"
-		einfo "Experimental available USE flags:"
-		einfo "    julia (not stable, bug #613576), R (bug #619534)"
-		einfo
+		elog "You have decided to build ${PN} with no backend."
+		elog "To have this application functional, please enable one of the backends via USE flag:"
+		elog "    analitza, lua, python, qalculate, R"
+		elog "Alternatively, install one of these:"
+		elog "    # emerge sci-mathematics/maxima (bug #619534)"
+		elog "    # emerge sci-mathematics/octave"
+		elog "Experimental available USE flag:"
+		elog "    julia (not stable, bug #613576)"
+		elog
 	fi
 
 	if ! has_version virtual/latex-base; then
-		einfo "For LaTeX support:"
-		einfo "    # emerge virtual/latex-base"
+		elog "For LaTeX support:"
+		elog "    # emerge virtual/latex-base"
 	fi
 }
 
@@ -98,6 +100,7 @@ src_configure() {
 		$(cmake-utils_use_find_package analitza Analitza5)
 		$(cmake-utils_use_find_package julia Julia)
 		$(cmake-utils_use_find_package lua LuaJIT)
+		$(cmake-utils_use_find_package markdown Discount)
 		$(cmake-utils_use_find_package postscript LibSpectre)
 		$(cmake-utils_use_find_package python PythonLibs)
 		$(cmake-utils_use_find_package qalculate Qalculate)
diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml
index 20e3a5914aa1..23b2f303adc2 100644
--- a/kde-apps/cantor/metadata.xml
+++ b/kde-apps/cantor/metadata.xml
@@ -9,6 +9,7 @@
 		<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>