gentoo resync : 18.11.2019

2 files changed, 37 insertions, 32 deletions

diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 6d4285557d86..6acdfbc0d554 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,4 @@
 DIST labplot-2.6.0.tar.xz 12360732 BLAKE2B f6259de30deb0adb4ddd47f0401fe8753a277aa01ade27c220ec832eb7f6c3e568c765085d2567529799777c9fe2442da777bd4089e5f488cc1aefb25a61d5a8 SHA512 6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af
 EBUILD labplot-2.6.0.ebuild 1978 BLAKE2B 859218fe15061bedf882dbeb981e66fd72bb022e1ed97f37047fac8def0f41a6c1ce7abd2c14af9720c8fbb25c12fab5c5c74284b4556685f336d69063b0c077 SHA512 f9b390e17fbfee58e33691d12ad4bd3833e0ea77382ab6d1421a2c343dc33d1c39632064b333e078b4e44a6e301830bcc39162370832bcbd4b02ed8b76023803
-EBUILD labplot-9999.ebuild 1969 BLAKE2B c4d5e397d8ef72dd9665ee34bdad0e382ee120309ea624046b88864a45cf35bc42e12edd9f2b5b6ecbaf2ce58f5f98ec1ea2001cab6282f643d675708e9503e1 SHA512 0d4707bebf1b76766fe0469ce17782faf2b347f1c76fd3c4c9f05d2c5554fe631b27a228fb5879c5bc5570dd979e0b771e7db1380108c9fd1385d9dc290a1366
+EBUILD labplot-9999.ebuild 2180 BLAKE2B 45009029c4154100ed8282362b51c5357b2f8fe3d33273a2223aaf5519d4ebacc347ea867dacf2ebacdedfd7c93691aa543f2f88045a470cdb038530a1c3fb4d SHA512 19a077019ff6078f9c8c75c749c6102d7b0972c2b6a93dbd95465bc84ba73d4ed686f8b264d98bb9097f496deccd82ddb991bfdd8727dac23ce503612cb66729
 MISC metadata.xml 864 BLAKE2B 08fc970f0e9804d36cc5ccbd2b08ee9dbfac30322e5cf56b0253ac3665bced133c2d28d27c64a47cc1faa0f310e6acf8b3f8b774174cab3a2b78da1cf1f0de79 SHA512 04ad431c7e59b54a713c34f35baf3e16b585e45784a39de7bd2a42deea36f27b96d1ea27d1b7bf052934d8f02d57370663c393219fba39bffe6d4d74e07868d0
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index ba890ab34c73..69ec65373d7f 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -3,16 +3,21 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
 HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
-KEYWORDS=""
+SLOT="5"
 IUSE="cantor fftw fits hdf5 libcerf netcdf root"
 
 # not packaged: dev-qt/qtmqtt, bug 683994
@@ -21,33 +26,33 @@ BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtserialport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtserialport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	>=sci-libs/gsl-1.15:=
 	cantor? (
-		$(add_frameworks_dep kparts)
-		$(add_frameworks_dep kservice)
-		$(add_kdeapps_dep cantor)
+		>=kde-frameworks/kparts-${KFMIN}:5
+		>=kde-frameworks/kservice-${KFMIN}:5
+		>=kde-apps/cantor-19.08.0:5
 	)
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:= )
@@ -74,5 +79,5 @@ src_configure() {
 		-DENABLE_MQTT=OFF
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }