[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     99ff45c7f04abfce13ac35a131d5f8fbc16d518e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 15:52:29 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:20:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ff45c7

sci-visualization/labplot: 2.8.0 version bump, IUSE="serial,telemetry"

See also: https://labplot.kde.org/2020/09/16/labplot-2-8-released/

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-visualization/labplot/Manifest                        |  1 +
 .../labplot/{labplot-9999.ebuild => labplot-2.8.0.ebuild} | 15 +++++++++------
 sci-visualization/labplot/labplot-9999.ebuild             | 15 +++++++++------
 sci-visualization/labplot/metadata.xml                    |  1 +
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 25663789074..cf534d93927 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1 +1,2 @@
 DIST labplot-2.7.0.tar.xz 13306532 BLAKE2B 044f6f1e552b6ccbd56791e39af240c97f0c572fae66ede0bbc13e172a88b652b0c42182fa4f6742b386dfd9c17f3041180841fe531387a9f44bd9b00adb8c09 SHA512 73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a
+DIST labplot-2.8.0.tar.xz 13117804 BLAKE2B 14836a2b34e095f997d42b907717e34198ec3ec9ed3477cdcdac4dcef03c999e401d0ff87160f46bf218730f180f5bf966fce3cefa27c89aba7732e7122f8e99 SHA512 b96a758813a411801ca65082aab54857b2da77a705ea939f2ae49d6d75a3c472b666e61c501283482c7736975b1f589bf0710028a36b237ae2df9e56ac04f0e5

diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-2.8.0.ebuild
similarity index 85%
copy from sci-visualization/labplot/labplot-9999.ebuild
copy to sci-visualization/labplot/labplot-2.8.0.ebuild
index d876c81c2fc..4378d86efff 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-2.8.0.ebuild
@@ -1,12 +1,12 @@
-# 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"
@@ -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 d876c81c2fc..4378d86efff 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -1,12 +1,12 @@
-# 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"
@@ -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 150390b1984..5b1410adb0e 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>