gentoo resync : 28.04.2019

3 files changed, 114 insertions, 2 deletions

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 5a7550f6a01b..36ef32226185 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,3 +1,5 @@
 DIST cantor-18.12.3.tar.xz 2515580 BLAKE2B caff71f7ec631129424f3b6e9e28b22007faaab607260359d9b3bf12f6478d773a953c9e6b918601ea74eaee6056e5b11264745e73409b3b616c8f61ec35818e SHA512 196d47adef9cb35c1816efa0a88dcf904ac7b91176bde779f84c40315732bbc1196c21dff4a6c363cbf6fc4785aaa512590638a965c79c50574b264a4d7beccf
-EBUILD cantor-18.12.3.ebuild 3302 BLAKE2B 8cd86278ea82296f055ab507a6fad90a7a0f84079b9cedc03906c2336a0c462e024dba7bbbb696e7d7495159270cbccf78a23167ae52b271ad285f93af8a121b SHA512 378d8e3c63e0ab1b32c6d98ba0c3f0cf33557d6d224591328617ff22011bce56550c16c42610b3adba690897a6a9081e3e04b36d78a32e0f8068a731dbe5fa44
+DIST cantor-19.04.0.tar.xz 2523240 BLAKE2B fb03c56228fa326cfe31937396852cc80b1d826f79b73c629319efe68a2819e395a34063a558e12d1107561555b33be9b37f45007e5e759abde29d26885b62ed SHA512 affed3d29e6af9a98ea60400c8ab3d8835d60f47f960d1453c6173ebe2eab0146b625269d66380e2ffd4c5a1bf7326b56750a0d4acb2aeed1627be8c6d0818e2
+EBUILD cantor-18.12.3.ebuild 3298 BLAKE2B bf3d895ae40ceaeb3c7fa185e6494c9ea405933137dd73f2edde10b372876fbcce155dadc8e65bba8d4a415d589521f58e48c054915373fd35636cf39a34ef50 SHA512 c960a12488ad409d206e1defb77a6949f3ae1ce2dba495f07bed66c5475882f359ac8b55ce397dd14b06d4f4abf8329d269c8dfe63598543865c6d68e4b4e6dc
+EBUILD cantor-19.04.0.ebuild 3296 BLAKE2B 592a4d65efbb21a218024d79f564c9765cbac2b2fe5433185682ea1182aa5d31e49fdbcebee01ec590748f1059ef55fa02771a80cd321dbd00ac5370230ac70e SHA512 aa1a47bb0ae4140cb4e1dde7501f163808ea11664905bf02bccccdcf08f913a330d7df89f9651ef66ffcf27e8ccad7db3e8cfbfcc4d4618ca23fa4b2c4946baa
 MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
diff --git a/kde-apps/cantor/cantor-18.12.3.ebuild b/kde-apps/cantor/cantor-18.12.3.ebuild
index 00d954723634..4a1b35d0f98b 100644
--- a/kde-apps/cantor/cantor-18.12.3.ebuild
+++ b/kde-apps/cantor/cantor-18.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 PYTHON_COMPAT=( python2_7 )
-# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+# FIXME: PYTHON_COMPAT=( python{2_7,3_5} )
 inherit kde5 python-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"
diff --git a/kde-apps/cantor/cantor-19.04.0.ebuild b/kde-apps/cantor/cantor-19.04.0.ebuild
new file mode 100644
index 000000000000..5066ab170988
--- /dev/null
+++ b/kde-apps/cantor/cantor-19.04.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+# FIXME: PYTHON_COMPAT=( python{2_7,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Interface for doing mathematics and scientific computing"
+HOMEPAGE="https://kde.org/applications/education/cantor https://edu.kde.org/cantor/"
+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)
+# 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_frameworks_dep syntax-highlighting)
+	$(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 )
+	markdown? ( >=app-text/discount-2.2.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 markdown Discount)
+		$(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
+}