gentoo resync : 18.11.2019

2 files changed, 38 insertions, 33 deletions

diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 65083c555571..bbdffa2a4a5f 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 2541240 BLAKE2B 1823aee42d3311c24b7f4addf6b369a6165da05f56f81ca1ceec24fe9dd127c6454e95baab23c33c68a08fbf49079bc58751cc064d7c53c2e62eb355314f0e59 SHA512 f9a089297c288bd4013da68b9388407f990aa20f508b759bd1839a85a714728fe2322daa198c522869285b64c02b84a587f605b4f1e8cc22b9c0aafc3138fd35
+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.2.ebuild 3098 BLAKE2B 215bdb75c7d5700d7f678e10190fdd0c947a5236185815d29894c15b2b78d4dd70b9792c8be1d06a9cd55c693ed4ea170834ed32292a3296834098fa685e5bd1 SHA512 43dab3d04ce55b485ecdb66aec8e67d8d9081d1042901cef22f1c367c036368e0d0221405fdf49505516b0f47235eaa83ca9caa4d785fb8f3508fbd4075a520b
+EBUILD cantor-19.08.3.ebuild 3335 BLAKE2B dfb86f4287ae1be7ddde92961e903c14d8e14ecee98e8f9e50210005909fa493526ad0a5e9cb74ce13b9f6ef224ae03b4bd141486d9be92c532c1281f70f6a0f SHA512 35cb996029b9ea6caef2cdc1cd64eb3b925bd77645ae0344069a163ab8cd4ebb9a91fa73dd76f304eb749471bf63095df9e22bd0bf8aea4071429a758e111a1e
 MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
diff --git a/kde-apps/cantor/cantor-19.08.2.ebuild b/kde-apps/cantor/cantor-19.08.3.ebuild
index 060865172386..777069dfce34 100644
--- a/kde-apps/cantor/cantor-19.08.2.ebuild
+++ b/kde-apps/cantor/cantor-19.08.3.ebuild
@@ -3,13 +3,18 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
 PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-single-r1
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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/cantor https://edu.kde.org/cantor/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+analitza julia lua markdown postscript python qalculate R"
 
@@ -17,30 +22,30 @@ 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) )
+	>=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
+	>=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
+	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
 	julia? ( dev-lang/julia )
 	lua? ( dev-lang/luajit:2 )
 	markdown? ( >=app-text/discount-2.2.2 )
@@ -51,7 +56,7 @@ DEPEND="
 	postscript? ( app-text/libspectre )
 	python? (
 		${PYTHON_DEPS}
-		$(add_qt_dep qtdbus)
+		>=dev-qt/qtdbus-${QTMIN}:5
 	)
 	R? ( dev-lang/R )
 "
@@ -60,7 +65,7 @@ RDEPEND="${DEPEND}"
 RESTRICT+=" test"
 
 pkg_pretend() {
-	kde5_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
@@ -83,7 +88,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
@@ -100,5 +105,5 @@ src_configure() {
 		$(cmake-utils_use_find_package qalculate Qalculate)
 		$(cmake-utils_use_find_package R R)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }