gentoo resync : 02.08.2019

3 files changed, 2 insertions, 114 deletions

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 2a39f459bec7..5edecb6a9941 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,3 @@
-DIST cantor-18.12.3.tar.xz 2515580 BLAKE2B caff71f7ec631129424f3b6e9e28b22007faaab607260359d9b3bf12f6478d773a953c9e6b918601ea74eaee6056e5b11264745e73409b3b616c8f61ec35818e SHA512 196d47adef9cb35c1816efa0a88dcf904ac7b91176bde779f84c40315732bbc1196c21dff4a6c363cbf6fc4785aaa512590638a965c79c50574b264a4d7beccf
 DIST cantor-19.04.3.tar.xz 2523496 BLAKE2B 59b7267eb8ac13aefc25e706bfb29e7430a59ecd7e92c69ff76032cbdf199cc9eee017f71bd2f0736e05dde09963de1926849d77678d15af6d1599795ff7402b SHA512 bfbb598e7fb4c61bddad0ef91802107a268121493146e7105d0c41450e3803b26b40363cc8fa69990f309aadb3bfefacb3fbb7dda75a3f274d70506c53d79ad4
-EBUILD cantor-18.12.3.ebuild 3298 BLAKE2B bf3d895ae40ceaeb3c7fa185e6494c9ea405933137dd73f2edde10b372876fbcce155dadc8e65bba8d4a415d589521f58e48c054915373fd35636cf39a34ef50 SHA512 c960a12488ad409d206e1defb77a6949f3ae1ce2dba495f07bed66c5475882f359ac8b55ce397dd14b06d4f4abf8329d269c8dfe63598543865c6d68e4b4e6dc
-EBUILD cantor-19.04.3.ebuild 3100 BLAKE2B 47c92eefa0775dcfa0bf8176de0d7a6b2b9331e90d1e002a0f89ba026ecba26bbc44b367d4bee2da9ab7fac2fe95272e21094022f93f4d13561e1cc1d1985ad6 SHA512 a7f31794496dc315acd4869c09e65dc9fc6b7b80d487aa5d07c9e12dc8d50a3d674b02331319fe0858a4282fe73c3b0267f3b5916d0ff107ff164249da937eb3
+EBUILD cantor-19.04.3.ebuild 3097 BLAKE2B 7639582ccc8ee7deac6a31587cec28db2550422a434478acc1490a9592f9277f319709dd30b76f665dba1626da7d9cfe4afdcea9ab65b5775648a1ed24f6aa0e SHA512 fdccbcec18ebbe1190a9b65df5f705b1dd937f7ee7497efca6f3cdaf7a480a66bde22c5cf9ab1e8f3bf8e52bae17536a13195ee67c9096e542f15bf5251f0bc3
 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
deleted file mode 100644
index 4a1b35d0f98b..000000000000
--- a/kde-apps/cantor/cantor-18.12.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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://www.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
-}
diff --git a/kde-apps/cantor/cantor-19.04.3.ebuild b/kde-apps/cantor/cantor-19.04.3.ebuild
index 181b280d4be7..fca31777aba3 100644
--- a/kde-apps/cantor/cantor-19.04.3.ebuild
+++ b/kde-apps/cantor/cantor-19.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-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"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+analitza julia lua markdown postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"