Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

3 files changed, 111 insertions, 2 deletions

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 5a7550f6a01b..c2072886d0db 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,3 +1,5 @@
+DIST cantor-18.08.3.tar.xz 2181020 BLAKE2B 43ce8e60d44d07c1a74219dad3322d23cea89eb9ba199c240d7e95473a79dcaa2a8a2ea08e05a04da00e6bc2fce6cef70b3266c28dd6f9424401bf87b1bfb6a8 SHA512 b6a3bfcc6dce8792fcad9bcaec6b30dfe50ab42b0781a3d33477b2fee1773c20400f4de069176bcf3ae6bfb232a32aa0d5f2e6e9059706f9da6aa65f63a018ec
 DIST cantor-18.12.3.tar.xz 2515580 BLAKE2B caff71f7ec631129424f3b6e9e28b22007faaab607260359d9b3bf12f6478d773a953c9e6b918601ea74eaee6056e5b11264745e73409b3b616c8f61ec35818e SHA512 196d47adef9cb35c1816efa0a88dcf904ac7b91176bde779f84c40315732bbc1196c21dff4a6c363cbf6fc4785aaa512590638a965c79c50574b264a4d7beccf
-EBUILD cantor-18.12.3.ebuild 3302 BLAKE2B 8cd86278ea82296f055ab507a6fad90a7a0f84079b9cedc03906c2336a0c462e024dba7bbbb696e7d7495159270cbccf78a23167ae52b271ad285f93af8a121b SHA512 378d8e3c63e0ab1b32c6d98ba0c3f0cf33557d6d224591328617ff22011bce56550c16c42610b3adba690897a6a9081e3e04b36d78a32e0f8068a731dbe5fa44
+EBUILD cantor-18.08.3.ebuild 3150 BLAKE2B a846548bd1968dc13764e210aeb76da431594ff42948dc5ac99335e0f94a35450b48992e9e03e23333e612d71c9def189fb84282945057fe46d33cf5f5cac0e3 SHA512 9ebd1fd3b01e929b089eb9e802ae630acbbb30d2179f73962dbbae326d797d7c8efad1f3a4f8063592d54d0793d4b65065fd50cad42591f360881b5cd6c26c04
+EBUILD cantor-18.12.3.ebuild 3304 BLAKE2B 453c67d40c99d5c5297d616bf1477d7a027b4955fa257191fb9868464f76e0c22d072b53bebbbfc7cd439e9ed9675ca361e8121fc8145e1c2cfb20b4f1689820 SHA512 e8259b18cb4f849d27036d1469f1981c9bc625a688b3ff73c00a4173a92c71181e06f025909cd20b6e42ee3bf6f51c33bd76ce37b9a377d376465a0951585a46
 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
new file mode 100644
index 000000000000..5b1f787720bd
--- /dev/null
+++ b/kde-apps/cantor/cantor-18.08.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+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"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	analitza? ( $(add_kdeapps_dep analitza) )
+	julia? ( dev-lang/julia )
+	lua? ( dev-lang/luajit:2 )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate:=
+	)
+	postscript? ( app-text/libspectre )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+pkg_pretend() {
+	kde5_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_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
+	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
+		-i src/backends/CMakeLists.txt || die
+}
+
+src_configure() {
+	use julia && addpredict /proc/self/mem # bug 602894
+
+	local mycmakeargs=(
+		$(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 postscript LibSpectre)
+		$(cmake-utils_use_find_package python PythonLibs)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package R R)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/cantor/cantor-18.12.3.ebuild b/kde-apps/cantor/cantor-18.12.3.ebuild
index 00d954723634..9cb906caa1d9 100644
--- a/kde-apps/cantor/cantor-18.12.3.ebuild
+++ b/kde-apps/cantor/cantor-18.12.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 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+analitza julia lua markdown postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"