gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 116 deletions

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index c859665064f5..189b9d9fad7b 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,3 @@
-DIST cantor-19.08.3.tar.xz 2538816 BLAKE2B e2445835eb6ffb368b50fab2089642a28ee3548bf572d3265b152696a4d45e1deb984793bae2819361132097f5dd19ea98ddcd7643c3675a8fd7c3f2fe3518a0 SHA512 1dc545c2c122d0303d418c757d7f4079250354e4326f2ec0d4796de343d00beb580ab47945ecc6ea491f4cd893bbfe6fced7eeb0ab8e3122000b4c75912ca807
-DIST cantor-19.12.2.tar.xz 9010060 BLAKE2B cb76bab97ce29771c3945b911472ed242224c2312c36ccd44eeaeab0b027fc75642f0bafbc39b67c67f1f31c3079cf40fc9a2090cc489ce6ec642f948f4857de SHA512 bc13824d41d6752700b6881eeb1316e422dc2908c7d628dd1401e348b74690e0acf3b6d6b096a7034ecb09a91b96f4c9b30d00b160bb994ffaf065287e81fcbc
-EBUILD cantor-19.08.3.ebuild 3284 BLAKE2B dcc251814d6078991e75f8c7bed3aaddb4f55d4a8fa9cc5f47448acecb644d07bc096ec38c0fe327e7e7cec44baa98178e7907b9c2f558728c794e08b2a73511 SHA512 4ebdd3ec3b7545c633dfd686f7f643ef70d74a7994ddbed6d5979a203c2886f2231b052a2818d4f1fe7f1c76ac8b83bb43bbd8fa7339d282c887f3d041c79da4
-EBUILD cantor-19.12.2.ebuild 3235 BLAKE2B 86c2e67f8ac45824d17e7aec04964cd6139c930d1c0d08c1913854418bd408bfc9a851afb9b0b68e9dc85ff27ff3e834912f90bc0426d295b893b02993604fbd SHA512 95899daf607cba2f3bf273f8f09326e88ae6dc5d3cfa1e2f3c02b8bed6e89dcd5dc7326f8aef006890545a406437f230b0da21e947743b56f2c1b38235f8fa62
-MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
+DIST cantor-19.12.3.tar.xz 9014164 BLAKE2B d88c820a36806facc76197ba2e29fece503fba2e3bafe5d856c64243b6d098babc4ae6da082e7c07f20b499f9ed2373aeccfbb5dcede196214d8a2c582de302a SHA512 83324f7a1702b5ed5d74ecab7664b653b8f318b03b6c856c7a70133b2aaf0927cf8b16a8ba9e27a7224d4d8d5900f1dcdbc89e70f40871f000db29f6f072668a
+EBUILD cantor-19.12.3.ebuild 3232 BLAKE2B 355da99f32dcd0e54ba5177b5ee820beb6e033fbe33bbef3851d3d78a4c473a5e1d71c5b784f28010d4f0f2a74ecbec088c2c23f67e213fbdba58e5885b7ad85 SHA512 6fb45433174cecf2654fd25b2ce8867fcdc619b21a4d20d2f72bb144dfbe51548f0d9cad3bc73560a7cbc275b9aa04c67fc12033850d08364878f509301de0b4
+MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-19.08.3.ebuild b/kde-apps/cantor/cantor-19.08.3.ebuild
deleted file mode 100644
index 33ced1b63d6d..000000000000
--- a/kde-apps/cantor/cantor-19.08.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://kde.org/applications/education/cantor 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"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	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:=
-	)
-	postscript? ( app-text/libspectre )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-qt/qtdbus-${QTMIN}:5
-	)
-	R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-pkg_pretend() {
-	ecm_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
-		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
-		elog "For LaTeX support:"
-		elog "    # emerge virtual/latex-base"
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	use julia && addpredict /proc/self/mem # bug 602894
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
-		$(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)
-		$(cmake_use_find_package R R)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/cantor/cantor-19.12.2.ebuild b/kde-apps/cantor/cantor-19.12.3.ebuild
index 33a7be46e6a5..8ea8b81d79df 100644
--- a/kde-apps/cantor/cantor-19.12.2.ebuild
+++ b/kde-apps/cantor/cantor-19.12.3.ebuild
@@ -18,7 +18,7 @@ https://edu.kde.org/cantor/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+analitza julia lua postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml
index 23b2f303adc2..20e3a5914aa1 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>