gentoo auto-resync : 12:07:2023 - 16:32:45

5 files changed, 108 insertions, 4 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 5d58a3eac5c8..23314c842cf9 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index adacb70f3492..7f274e01fdba 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,5 +1,7 @@
 AUX labplot-2.9.0-discount-3.patch 3386 BLAKE2B 8b9fba76ca24665279bf96e8875a22d7a841cadd84f0a154ee010d2aa0078520403331589b94528b3816cb6cda8c7b1a369374971e08b9756436c827dbc80702 SHA512 43fa587c33ec12346535cfb8ce6ce2a5faa303ffa9cf574cb6bcd4764142bbb76a04f1f9ea73e82c9a0ade14c6d6cba1644f5a4551ea34a3d3d69fedef481d96
+DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da
 DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45
+EBUILD labplot-2.10.1.ebuild 2738 BLAKE2B a4758433b5bdc90622cab5af349e57d534b057db0132f44ac1159bf6c05784af03ca669e917573c8b8834d9be38f7bdfa62a379c9a5417a8a22a1779f5c8636e SHA512 13988d5c4ee66443c78f0b329456eb92716d2197662f01619b5278f31d191321f19bc965e3ba4ab5c8761791a7f40c1f6811083d5a56762dcb35eee122f98676
 EBUILD labplot-2.9.0-r1.ebuild 2686 BLAKE2B 5abbe320bcbcb9252f6e1dc4d0ff2f1571f207c42a1cf5a8bc98d4e4eaa0b848df71120a50b51d96e60f2ebba50d65502db0b813ea0b4b4d75d5de12bfa44431 SHA512 84e2d132876bf0cabdc9835847200e4ea296abb3a3fb10c61c30e3d3b0c9656b882d9cd6acb790b0db237e23327dd382aa366b034a08aa48b50cf29e20f61caa
-EBUILD labplot-9999.ebuild 2637 BLAKE2B d8c77c21eefdbb37279497934706cdcebd5042265ea17fed65f50cad02a3a6a34ab033f9a9fe520d58c6c31952eb870a881e7c908bef2f91b2186bca12850eb0 SHA512 ba9f08569c72ad6be1952583a41f2d3e04831d96c45f641ded28183636091b5056afaed614603ac37a8bb3027bb4e406e532a7f93051fe8a76e844a63ece5838
-MISC metadata.xml 1328 BLAKE2B 7c5afcd644eb98a6afdaba264e24e225e44075e223c47e10922f2aa7ea4658ad34b6f3a55e82a72109413da8bd41df55c2aeb02d93db12ae154acf116d300706 SHA512 ac715b846c70cf31d8a3f92c291848fb9f6c3e571f3cdadc9670c2eb3211ebf2e96dae4263232544506f2cf4db2bb408beeea2cb322f1ac56c179048bd77ba20
+EBUILD labplot-9999.ebuild 2738 BLAKE2B a4758433b5bdc90622cab5af349e57d534b057db0132f44ac1159bf6c05784af03ca669e917573c8b8834d9be38f7bdfa62a379c9a5417a8a22a1779f5c8636e SHA512 13988d5c4ee66443c78f0b329456eb92716d2197662f01619b5278f31d191321f19bc965e3ba4ab5c8761791a7f40c1f6811083d5a56762dcb35eee122f98676
+MISC metadata.xml 1455 BLAKE2B ccc8422453061ab92164dd78226e60a06d242f47a6e51e391f20d868e8a07dbe1f67a7fc7bec2bb173acbe8b6097258b2fbf2bcd41502d3a8bdaf98de94a3235 SHA512 50aa6fdfbd7f3aa88cc16bb5fdfd58e746a7a42f659d2803699fadf41f31cfbfeaa84ad186c0701e9115e6fa12450638cfc3124d914b3d52ef8bcb3240eccb36
diff --git a/sci-visualization/labplot/labplot-2.10.1.ebuild b/sci-visualization/labplot/labplot-2.10.1.ebuild
new file mode 100644
index 000000000000..57d676f568d6
--- /dev/null
+++ b/sci-visualization/labplot/labplot-2.10.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.88.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
+HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/labplot2/"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="cantor excel fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry"
+
+DEPEND="
+	app-text/poppler
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${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? (
+		>=kde-apps/cantor-19.12.0:5
+		>=kde-frameworks/kparts-${KFMIN}:5
+		>=kde-frameworks/kservice-${KFMIN}:5
+	)
+	excel? ( dev-libs/qxlsx:= )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:= )
+	hdf5? ( sci-libs/hdf5:= )
+	libcerf? ( sci-libs/libcerf )
+	markdown? ( app-text/discount:= )
+	matio? ( sci-libs/matio:= )
+	netcdf? ( sci-libs/netcdf:= )
+	origin? ( sci-libs/liborigin:2 )
+	root? (
+		app-arch/lz4
+		sys-libs/zlib
+	)
+	serial? ( >=dev-qt/qtserialport-${QTMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}"
+# not packaged: dev-qt/qtmqtt, bug 683994
+BDEPEND="
+	sys-devel/bison
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MQTT=OFF # not packaged
+		-DENABLE_READSTAT=OFF # not packaged
+		-DENABLE_VECTOR_BLF=OFF # not packaged
+		-DENABLE_CANTOR=$(usex cantor)
+		-DENABLE_EXCEL=$(usex excel)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_FITS=$(usex fits)
+		-DENABLE_HDF5=$(usex hdf5)
+		-DENABLE_LIBCERF=$(usex libcerf)
+		-DENABLE_DISCOUNT=$(usex markdown)
+		-DENABLE_MATIO=$(usex matio)
+		-DENABLE_NETCDF=$(usex netcdf)
+		-DENABLE_LIBORIGIN=$(usex origin)
+		-DENABLE_ROOT=$(usex root)
+		-DENABLE_QTSERIALPORT=$(usex serial)
+		$(cmake_use_find_package telemetry KUserFeedback)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	ecm_src_configure
+}
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index c45f80b7f620..57d676f568d6 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -13,13 +13,13 @@ inherit ecm kde.org
 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
 HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/labplot2/"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="cantor fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry"
+IUSE="cantor excel fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry"
 
 DEPEND="
 	app-text/poppler
@@ -50,6 +50,7 @@ DEPEND="
 		>=kde-frameworks/kparts-${KFMIN}:5
 		>=kde-frameworks/kservice-${KFMIN}:5
 	)
+	excel? ( dev-libs/qxlsx:= )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -76,7 +77,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_MQTT=OFF # not packaged
 		-DENABLE_READSTAT=OFF # not packaged
+		-DENABLE_VECTOR_BLF=OFF # not packaged
 		-DENABLE_CANTOR=$(usex cantor)
+		-DENABLE_EXCEL=$(usex excel)
 		-DENABLE_FFTW=$(usex fftw)
 		-DENABLE_FITS=$(usex fits)
 		-DENABLE_HDF5=$(usex hdf5)
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 56f3440302e0..96a92087bc72 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -18,6 +18,7 @@
 	</upstream>
 	<use>
 		<flag name="cantor">Enable support for different open-source computer algebra systems via <pkg>kde-apps/cantor</pkg></flag>
+		<flag name="excel">Enable support for importing/exporting Microsoft Excel files (.xlsx) via <pkg>dev-libs/qxlsx</pkg></flag>
 		<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="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>