gentoo auto-resync : 01:09:2024 - 12:01:15

4 files changed, 120 insertions, 6 deletions

diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 3849077a8961..39bf6b186e4d 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,6 @@
 DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da
+DIST labplot-2.11.1.tar.xz 24180904 BLAKE2B c2b94db140ca47f648f2b7e82956a88fa36819aa666430d69b0c328d46a254e0fe9991d4ea61581c4c8da0f44694b2016471090a166e8beeb378f1e02eb6b2c7 SHA512 51a039c7eec5a2e104079b1dc7bfe1ecdc2c4e3327bcfbdc99e1b2fbae2b2be5db3a1a2c319e30d41a7cfcf177be756e8e3bb05d9a58c8418e43900dfad6b3b1
 EBUILD labplot-2.10.1.ebuild 2750 BLAKE2B 1f2e880ed5cd3081c212bbdda2b4895ec842859941629f810dc2bdf997280ddc8f3dd18384cce47a12c47e1371e2d9b469002d5872247b9bd2b6a197ae38dab3 SHA512 4b0da65263d30f4e46675d22fd99a0f04ad4d5c4bacb86a9f36652452196bb1e3f4bc6c5be36301a8f1a0074a8bb402e59c9a42be55cb1c9be17bb22f5e210ab
-EBUILD labplot-9999.ebuild 3091 BLAKE2B eb1a39f40650692c32479c5f7306526e84aa7040d708c57fe18a8f1778d5c8c7a5d0dacb57b4f5ec56f81e48bbfc6775a5d3a4a8e71edeb0eaafb085239949e4 SHA512 4a64d9e39434bb72e9016b13fb3a4334f1a906bed728aa36c28a8391b41835fbd050f62a22c736f68d1f7303dbb8b9a9858dfef17c933a030ae134ae2641c073
-MISC metadata.xml 1845 BLAKE2B bb7aca45e956abdcb37ae99b188fd56f24df36ecd9d5bcd3f657cc3fc6f952d8f5038627a6385f45199e22e1a0a70718b10628b6975d41c01a013291639ec154 SHA512 5af43fdb00656214370302db18d2b22acde9b5b80c6e5aa6a30c46791590224e324a4c350af2d7978b4f3694fdd78ce3df71bfeacc6b67cf8f0d39d6c687f6dd
+EBUILD labplot-2.11.1.ebuild 3088 BLAKE2B b5064f21859f7b8675726f0e3ad0341f2e8aace1d55d3e3e678e7f500d519e395de86da2e933ffdec39753e388b7407b5972b4f9f3b35de4319963e7252e2678 SHA512 ef03c3af60d22613fdb8c3023ed51e25bd734edefa7ad3dbd9d20e1db3184b8fb19ff682e19d988d031c8261d25b229c308818a13504de0ca0dd0c934b7cc127
+EBUILD labplot-9999.ebuild 3088 BLAKE2B b5064f21859f7b8675726f0e3ad0341f2e8aace1d55d3e3e678e7f500d519e395de86da2e933ffdec39753e388b7407b5972b4f9f3b35de4319963e7252e2678 SHA512 ef03c3af60d22613fdb8c3023ed51e25bd734edefa7ad3dbd9d20e1db3184b8fb19ff682e19d988d031c8261d25b229c308818a13504de0ca0dd0c934b7cc127
+MISC metadata.xml 2001 BLAKE2B 61d0797ea7f79baf22054ebf3da151292702a6e8eacfe0e006cdc5830174f5cde12d636a459a508056d617e29f72934114d7d16ceea760bea10e515dcae33374 SHA512 8672ae27a6d6253a40ca930fc8a5df91ba0d97d372aa2876a2c28b4dff0372e9549ea8e1dde7b2c743e393c52af7e047fd13154925ed53757a07c0cfc0196e69
diff --git a/sci-visualization/labplot/labplot-2.11.1.ebuild b/sci-visualization/labplot/labplot-2.11.1.ebuild
new file mode 100644
index 000000000000..4684a482542b
--- /dev/null
+++ b/sci-visualization/labplot/labplot-2.11.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+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="0"
+IUSE="eigen fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry xlsx"
+
+# IUSE="cantor"
+# 	cantor? (
+# 		>=kde-apps/cantor-19.12.0:6
+# 		>=kde-frameworks/kparts-${KFMIN}:6
+# 		>=kde-frameworks/kservice-${KFMIN}:6
+# 	)
+DEPEND="
+	app-text/poppler[qt6(-)]
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,gui,network,sql,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	>=sci-libs/gsl-1.15:=
+	eigen? ( dev-cpp/eigen:3= )
+	xlsx? ( 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:= )
+	ods? (
+		dev-libs/libixion:=
+		dev-libs/liborcus:=
+	)
+	origin? ( sci-libs/liborigin:2 )
+	root? (
+		app-arch/lz4
+		sys-libs/zlib
+	)
+	serial? ( >=dev-qt/qtserialport-${QTMIN}:6 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+# not packaged: dev-qt/qtmqtt, bug 683994
+BDEPEND="
+	app-alternatives/yacc
+	sys-devel/gettext
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	sed -e "/^ *find_package.*QT NAMES/s/Qt5 //" \
+		-i CMakeLists.txt || die # ensure Qt6 build
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MQTT=OFF # not packaged
+		-DENABLE_READSTAT=OFF # not packaged
+		-DENABLE_VECTOR_BLF=OFF # not packaged
+		-DENABLE_CANTOR=OFF # $(usex cantor)
+		-DENABLE_EIGEN3=$(usex eigen)
+		-DENABLE_XLSX=$(usex xlsx)
+		-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_ORCUS=$(usex ods)
+		-DENABLE_LIBORIGIN=$(usex origin)
+		$(cmake_use_find_package share KF6Purpose)
+		-DENABLE_ROOT=$(usex root)
+		-DENABLE_QTSERIALPORT=$(usex serial)
+		$(cmake_use_find_package telemetry KUserFeedbackQt6) # FIXME: should be KF6UserFeedback
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	ecm_src_configure
+}
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index f83aea5d78d6..4684a482542b 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="eigen excel fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry"
+IUSE="eigen fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry xlsx"
 
 # IUSE="cantor"
 # 	cantor? (
@@ -46,7 +46,7 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
 	>=sci-libs/gsl-1.15:=
 	eigen? ( dev-cpp/eigen:3= )
-	excel? ( dev-libs/qxlsx:= )
+	xlsx? ( dev-libs/qxlsx:= )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -90,7 +90,7 @@ src_configure() {
 		-DENABLE_VECTOR_BLF=OFF # not packaged
 		-DENABLE_CANTOR=OFF # $(usex cantor)
 		-DENABLE_EIGEN3=$(usex eigen)
-		-DENABLE_XLSX=$(usex excel)
+		-DENABLE_XLSX=$(usex xlsx)
 		-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 75a89a727232..87166454e57b 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -14,7 +14,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=LabPlot2</bugs-to>
 		<remote-id type="kde-invent">education/labplot</remote-id>
 	</upstream>
 	<use>
@@ -30,5 +30,6 @@
 		<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>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
+		<flag name="xlsx">Enable support for importing/exporting Microsoft Excel files (.xlsx) via <pkg>dev-libs/qxlsx</pkg></flag>
 	</use>
 </pkgmetadata>