gentoo resync : 15.12.2019

5 files changed, 114 insertions, 137 deletions

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index bbdffa2a4a5f..a800e5ddaed4 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,6 +1,5 @@
-AUX cantor-19.04.3-missing-header.patch 566 BLAKE2B a95a8b12bde8d3281f4732f789f38d7c21ce12a441b6ae8f78bcd23cf37bd3402121410df83c87b0ffb2e332bb6736fe45036a2afe89ea46dfa127a07f5400d2 SHA512 f8bdcb555b0f3e7d2400d7eb23a3b08ab6e5dbf3cfaa0756928135ca372a9c41afdeeae20a5b4a12ab75f1a0f334e87a3ac6cf168e09b3ab449040412825e789
-DIST cantor-19.04.3.tar.xz 2523496 BLAKE2B 59b7267eb8ac13aefc25e706bfb29e7430a59ecd7e92c69ff76032cbdf199cc9eee017f71bd2f0736e05dde09963de1926849d77678d15af6d1599795ff7402b SHA512 bfbb598e7fb4c61bddad0ef91802107a268121493146e7105d0c41450e3803b26b40363cc8fa69990f309aadb3bfefacb3fbb7dda75a3f274d70506c53d79ad4
 DIST cantor-19.08.3.tar.xz 2538816 BLAKE2B e2445835eb6ffb368b50fab2089642a28ee3548bf572d3265b152696a4d45e1deb984793bae2819361132097f5dd19ea98ddcd7643c3675a8fd7c3f2fe3518a0 SHA512 1dc545c2c122d0303d418c757d7f4079250354e4326f2ec0d4796de343d00beb580ab47945ecc6ea491f4cd893bbfe6fced7eeb0ab8e3122000b4c75912ca807
-EBUILD cantor-19.04.3.ebuild 3150 BLAKE2B ffafb3942ad7ba176937c38c223f0f3ffb092697b7427bbc6915270f9ce0a24ecfff1d14c01b63c1c0864209843f05386bc8ab79c3ae2a13b1574cac0be38ce5 SHA512 b5e25ad41aa9cb2ddd0fa922df2ed999050701c6acb9a43db28a6ef1f54d92b33ca40b635469b9d2650cdbedebf9ea70b03406ff5d1e61c95cbb1b80c46916ba
-EBUILD cantor-19.08.3.ebuild 3335 BLAKE2B dfb86f4287ae1be7ddde92961e903c14d8e14ecee98e8f9e50210005909fa493526ad0a5e9cb74ce13b9f6ef224ae03b4bd141486d9be92c532c1281f70f6a0f SHA512 35cb996029b9ea6caef2cdc1cd64eb3b925bd77645ae0344069a163ab8cd4ebb9a91fa73dd76f304eb749471bf63095df9e22bd0bf8aea4071429a758e111a1e
+DIST cantor-19.12.0.tar.xz 9015328 BLAKE2B 2ba2f387945765b2b214d3f702b3c36f0a677bcad061ebf9aff2dc63fe6bb5d75aaca0acaf17ba3acb184694ecfc824225d0b68ab2f8881e128693006bcc686b SHA512 d8373c25ad4582938362d393498c96a2e82a15c0c492c6f403d096991950f608e71f2398217824783ee028665e042d755254aed4ed40135edd4f8464b918317d
+EBUILD cantor-19.08.3.ebuild 3332 BLAKE2B f99bace88703a265ddeb8301c81ac293f2ce0be27c2bc2eadddf575f81156f0a3ce78a0f047eca6cee5e203c4dfe47eca739a5d552550a6b0e2baeeb88c0eb0f SHA512 20b76760a6c62ca2710e4a2e237bef045b997d6be9fe2814601c1f2777a4f5d9049a6952ad138370eda52b2d5c458d51053558a59976068f8067758b8ccf6927
+EBUILD cantor-19.12.0.ebuild 3235 BLAKE2B d1892917817ae00554a2d20526d16bd7fa90cec970ebf5b03d82037b830ecccce4195848ab60b982dcdba648708fe30222b28f608adb9dc96be88d04fb7b1fd2 SHA512 629e2fa389f9c65ff3556ddca285b808aefc3f6ff9e0c2128600dd3be5f9d6aaf37ded0f0dbf97a0f7e3a8b9d2975f922dfb387f7caa6ff39e85e942e331a755
 MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
diff --git a/kde-apps/cantor/cantor-19.04.3.ebuild b/kde-apps/cantor/cantor-19.04.3.ebuild
deleted file mode 100644
index 306541dd15aa..000000000000
--- a/kde-apps/cantor/cantor-19.04.3.ebuild
+++ /dev/null
@@ -1,106 +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=( python3_{5,6,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"
-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="
-	$(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}
-		$(add_qt_dep qtdbus)
-	)
-	R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
-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-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	use julia && addpredict /proc/self/mem # bug 602894
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
-		$(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 PythonLibs3)
-		$(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.08.3.ebuild b/kde-apps/cantor/cantor-19.08.3.ebuild
index 777069dfce34..e246fa0117a6 100644
--- a/kde-apps/cantor/cantor-19.08.3.ebuild
+++ b/kde-apps/cantor/cantor-19.08.3.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+analitza julia lua markdown postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cantor/cantor-19.12.0.ebuild b/kde-apps/cantor/cantor-19.12.0.ebuild
new file mode 100644
index 000000000000..a1a2fbf6a5b4
--- /dev/null
+++ b/kde-apps/cantor/cantor-19.12.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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/org.kde.cantor
+https://edu.kde.org/cantor/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~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)
+DEPEND="
+	>=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
+	>=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
+	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
+	julia? ( dev-lang/julia )
+	lua? ( dev-lang/luajit: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 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/files/cantor-19.04.3-missing-header.patch b/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch
deleted file mode 100644
index 3844b6bcc54d..000000000000
--- a/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6a49ffa048f619752d32ff9b85a03c8cbcb448b7 Mon Sep 17 00:00:00 2001
-From: Nikita Sirgienko <warquark@gmail.com>
-Date: Sun, 21 Jul 2019 02:00:46 +0300
-Subject: Try to fix build error in stable-kf5-qt5 #7
-
----
- src/cantor.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-(limited to 'src/cantor.h')
-
-diff --git a/src/cantor.h b/src/cantor.h
-index 0352753..bbf8f6e 100644
---- a/src/cantor.h
-+++ b/src/cantor.h
-@@ -25,6 +25,8 @@
- #include <KParts/MainWindow>
- 
- #include <QList>
-+#include <QStringList>
-+#include <QMap>
- 
- class QTabWidget;
- class KTextEdit;
--- 
-cgit v1.1