gentoo resync : 01.12.2017

3 files changed, 2 insertions, 112 deletions

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 37de4c2ae645..4500ba493886 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,8 +1,6 @@
 AUX cantor-16.12.2-bashism.patch 466 BLAKE2B 44e67660315f213cceeb06456a2c38d653b515f99f16e3e02e8f4e3a771354abab701946efc63c07eadf65bdd3cef59646a0562c697189ea119830d4529c636b SHA512 c04ef31c1351f2babf247154a25d191c1374f245a01da886c7141449c92d49d273075c72a369e9129db696417d7f85c7475cc0b615a3b438b7aa576116127393
 DIST cantor-16.12.3.tar.xz 378460 SHA256 888677129bf30474a2f2bfe46931770f411cf8823c944e90ba4ea16d9d4eefdb SHA512 e6401d5472797894931b4c1c0a4cda7e900ede0d9c5e7d1b5a2ff518741f7f62a7f6187b5081edb231f47c1de163aa537cc195e381334ed60890eb6c73374768 WHIRLPOOL d0dbd031450ed730fdcb382a6aba778e0b9928ada3fe7c144012e95a521d53f1c13fe34bbbc6d2339e10cdf60f464327f9583e1bbbd10c1ecc6f2f43d308df33
-DIST cantor-17.04.3.tar.xz 1060096 SHA256 3c24ae740de7dff3f8d062cc27c6f6ad7d40538a96997e93a4df437f05839b51 SHA512 a721c6f615c4bb8f22fbd4014e8f3a96e480acef3ffcd1ef81eae71853a487c3a248c4d433c845407d6c46b26e20707f76a00cc214e82cb489087adf8205ecbc WHIRLPOOL e1a4f9f412750af5cb923dc0107bd3593cbd5e23258e516403a5da9889ebce380998b02edc248c481424adf33249930077e0daf1986faf5d938d12cab7123318
 DIST cantor-17.08.3.tar.xz 1062400 SHA256 3c59c8ac854930d19ec2345853cf613904d43df491e8efc44cb9d0cf3b0de77b SHA512 92d40921b4121e7053381f071eaf08ba2a5bfdd42272ff749db726aa300878561b8079118a0ea61173269abb04fa1cbfeb8dba27da8701ecd2b17876c64a108b WHIRLPOOL 447a1dd4c8c089eadc9402b9493a8fc176abc0db4e63fac626015f574893900685f730119718d37942fa78686559a29ee9ed7dec7c3ba17f5f7b8eb40aeb4c95
 EBUILD cantor-16.12.3.ebuild 3151 BLAKE2B c53fa28f4d88114caf131e2655392d7c17885d41515d4dc182b31749041235869b65ebc31c053b85926eec0227d9b8da1eae03c5809c9a11bc29a899c3a3fb0e SHA512 c1a1f20d839bccefe81d5189865324c917a46b3f2acaea8583310950e9f9eb16cc6f0b8f675f10148bce92554ff8c2f235dce8bf347ccee5838e5d4ef5c464b8
-EBUILD cantor-17.04.3.ebuild 3197 BLAKE2B 2979aa1baf9fa88dd2c0cce99c9d7c170dce6928d17529744ecf33b4b35d9b3fd906ba8002387262155c9e56add5d9fc0e6f93753ab2273d5049a9bb15420832 SHA512 b71d4198990f4d21a20ca5c6ca401392556f2fffac30788271ac29c50bf71b9646323044a037c43778231f9ed23c9a2f642e2c2a304540b9eb59dd94863604ba
-EBUILD cantor-17.08.3.ebuild 3145 BLAKE2B 420a8c3c9207b983bd5bc20ae6faccee694d0a2e38b01b0e6b87d500412dee4f4f04fc1e3b6d4883ef77052489588cbdafde2f84862cf6073e98cf2aae45e43b SHA512 0356c7dc7d0b18ba7156095a743c63472a1dae86f799d0774030e84e3ea53a907a2463862b3c66419084d322991335651a8ee16081c1ac9350b233b58d98c829
+EBUILD cantor-17.08.3.ebuild 3143 BLAKE2B 0d62ce2827824722dfae67bdb336f3e8cab3286d531d760dd94475fba809d4d23c76cf02860cc43df394f7b4e5d71a6e54ac80b3142d6496b1609aea6cfcd9d3 SHA512 e4e6b053a23b08a21775b42a7e6022c9c57245570d3d252a9b486bfa419f17e072b2907218731a41538cf44555b260d07206dd7f891891e8210717bddbb0c5e0
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-17.04.3.ebuild b/kde-apps/cantor/cantor-17.04.3.ebuild
deleted file mode 100644
index 1ecb202beba4..000000000000
--- a/kde-apps/cantor/cantor-17.04.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 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"
-
-PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
-
-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
-		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
-	fi
-
-	if ! has_version virtual/latex-base; then
-		einfo "For LaTeX support:"
-		einfo "    # 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-17.08.3.ebuild b/kde-apps/cantor/cantor-17.08.3.ebuild
index 1aa548e3c436..32330c726d08 100644
--- a/kde-apps/cantor/cantor-17.08.3.ebuild
+++ b/kde-apps/cantor/cantor-17.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} )"