gentoo resync : 25.11.2020

4 files changed, 25 insertions, 18 deletions

diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index e28eff01a708..0b3cd1c74bee 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,4 @@
-DIST labplot-2.7.0.tar.xz 13306532 BLAKE2B 044f6f1e552b6ccbd56791e39af240c97f0c572fae66ede0bbc13e172a88b652b0c42182fa4f6742b386dfd9c17f3041180841fe531387a9f44bd9b00adb8c09 SHA512 73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a
-EBUILD labplot-2.7.0.ebuild 2180 BLAKE2B bdfc006342f37984afb3ee2518b40f039db75ed17235cf1daecb358527f36496d43eee2f3e4bc979ad50201fd154205ea02c05f9d26dc0a9e4d54847ee9d08c5 SHA512 b040383dda9e4f1b62a36b045a18724083bc4c0fdaa9398132e06253e3786e363fbbfe3d33d88f103a562364e0709b9bebaa3e761c45e39ba400c84e59c110d6
-EBUILD labplot-9999.ebuild 2180 BLAKE2B bdfc006342f37984afb3ee2518b40f039db75ed17235cf1daecb358527f36496d43eee2f3e4bc979ad50201fd154205ea02c05f9d26dc0a9e4d54847ee9d08c5 SHA512 b040383dda9e4f1b62a36b045a18724083bc4c0fdaa9398132e06253e3786e363fbbfe3d33d88f103a562364e0709b9bebaa3e761c45e39ba400c84e59c110d6
-MISC metadata.xml 864 BLAKE2B 08fc970f0e9804d36cc5ccbd2b08ee9dbfac30322e5cf56b0253ac3665bced133c2d28d27c64a47cc1faa0f310e6acf8b3f8b774174cab3a2b78da1cf1f0de79 SHA512 04ad431c7e59b54a713c34f35baf3e16b585e45784a39de7bd2a42deea36f27b96d1ea27d1b7bf052934d8f02d57370663c393219fba39bffe6d4d74e07868d0
+DIST labplot-2.8.1.tar.xz 13203288 BLAKE2B 59699faf0abe3355ab996321203c829b3aff5d7943c2688e955c0a84807a47a1e665d630dd052d6e3c005dc78cf7c613a87ccf5ce6cc2498bb694d9de838780a SHA512 9e03e70a1c0f167626583b2480b3d00743221ae5121e4f9cdc5170f292804fb41b03369c53bc729c006c61adb446ef05496f9789a3c89ffbb3bf51bcdc79c7ba
+EBUILD labplot-2.8.1.ebuild 2318 BLAKE2B 19afffe584982eff59a846e2e21db39311416a020a9727cf32aaabe1d12eba625105382376056f3e1f81dc8c12035b9041a6c5cf965f2a93333aa38f5804e7d0 SHA512 fd2f68e5cb18384bd4ce3847b9bfca0862fb82903928b9bcb9bf9322a6a4c703a9e0a3a564ceea976a5dcb772025714046af67beba86e480bcfacc838e9424e5
+EBUILD labplot-9999.ebuild 2318 BLAKE2B 19afffe584982eff59a846e2e21db39311416a020a9727cf32aaabe1d12eba625105382376056f3e1f81dc8c12035b9041a6c5cf965f2a93333aa38f5804e7d0 SHA512 fd2f68e5cb18384bd4ce3847b9bfca0862fb82903928b9bcb9bf9322a6a4c703a9e0a3a564ceea976a5dcb772025714046af67beba86e480bcfacc838e9424e5
+MISC metadata.xml 968 BLAKE2B 559e66667254b34ec3d884d6fe1d04a08ecd5b47cda991a98771caef3dca44c2fed9b01509b82e74a5051a9b96724654108729050f70ea9bc78621fa8109d69d SHA512 da2eeb9e282fcadd6fcf51e9071619d6d1fe6ca5fa9c19bb19ff6337be48fcf0f5b394c5aab6d66580dbdd3ebfe4dc4bec5dd59cd66572b0e0554d2c14df00e9
diff --git a/sci-visualization/labplot/labplot-2.7.0.ebuild b/sci-visualization/labplot/labplot-2.8.1.ebuild
index fcf591f4a89e..4378d86effff 100644
--- a/sci-visualization/labplot/labplot-2.7.0.ebuild
+++ b/sci-visualization/labplot/labplot-2.8.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 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"
+HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/en/labplot2"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="cantor fftw fits hdf5 libcerf netcdf root"
+IUSE="cantor fftw fits hdf5 libcerf netcdf root serial telemetry"
 
 # not packaged: dev-qt/qtmqtt, bug 683994
 BDEPEND="
@@ -30,7 +30,6 @@ DEPEND="
 	>=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
@@ -50,7 +49,7 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	>=sci-libs/gsl-1.15:=
 	cantor? (
-		>=kde-apps/cantor-19.08.0:5
+		>=kde-apps/cantor-19.12.0:5
 		>=kde-frameworks/kparts-${KFMIN}:5
 		>=kde-frameworks/kservice-${KFMIN}:5
 	)
@@ -63,6 +62,8 @@ DEPEND="
 		app-arch/lz4
 		sys-libs/zlib
 	)
+	serial? ( >=dev-qt/qtserialport-${QTMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -75,6 +76,8 @@ src_configure() {
 		-DENABLE_LIBCERF=$(usex libcerf)
 		-DENABLE_NETCDF=$(usex netcdf)
 		-DENABLE_ROOT=$(usex root)
+		-DENABLE_QTSERIALPORT=$(usex serial)
+		$(cmake_use_find_package telemetry KUserFeedback)
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_MQTT=OFF
 	)
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index fcf591f4a89e..4378d86effff 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 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"
+HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/en/labplot2"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="cantor fftw fits hdf5 libcerf netcdf root"
+IUSE="cantor fftw fits hdf5 libcerf netcdf root serial telemetry"
 
 # not packaged: dev-qt/qtmqtt, bug 683994
 BDEPEND="
@@ -30,7 +30,6 @@ DEPEND="
 	>=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
@@ -50,7 +49,7 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	>=sci-libs/gsl-1.15:=
 	cantor? (
-		>=kde-apps/cantor-19.08.0:5
+		>=kde-apps/cantor-19.12.0:5
 		>=kde-frameworks/kparts-${KFMIN}:5
 		>=kde-frameworks/kservice-${KFMIN}:5
 	)
@@ -63,6 +62,8 @@ DEPEND="
 		app-arch/lz4
 		sys-libs/zlib
 	)
+	serial? ( >=dev-qt/qtserialport-${QTMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -75,6 +76,8 @@ src_configure() {
 		-DENABLE_LIBCERF=$(usex libcerf)
 		-DENABLE_NETCDF=$(usex netcdf)
 		-DENABLE_ROOT=$(usex root)
+		-DENABLE_QTSERIALPORT=$(usex serial)
+		$(cmake_use_find_package telemetry KUserFeedback)
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_MQTT=OFF
 	)
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 150390b19845..5b1410adb0ef 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -18,5 +18,6 @@
 		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
 		<flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
 		<flag name="root">Enable support for CERN's ROOT file type</flag>
+		<flag name="serial">Enable support for RS232 serial ports using <pkg>dev-qt/qtserialport</pkg></flag>
 	</use>
 </pkgmetadata>