gentoo auto-resync : 14:07:2024 - 12:27:13

5 files changed, 57 insertions, 238 deletions

diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index d6e4d2bf3357..3849077a8961 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,7 +1,4 @@
-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 2750 BLAKE2B 1f2e880ed5cd3081c212bbdda2b4895ec842859941629f810dc2bdf997280ddc8f3dd18384cce47a12c47e1371e2d9b469002d5872247b9bd2b6a197ae38dab3 SHA512 4b0da65263d30f4e46675d22fd99a0f04ad4d5c4bacb86a9f36652452196bb1e3f4bc6c5be36301a8f1a0074a8bb402e59c9a42be55cb1c9be17bb22f5e210ab
-EBUILD labplot-2.9.0-r1.ebuild 2698 BLAKE2B bce72a7aca24ec3b4eb5b271f3c5efb6d259c276a51b61c41021779828341a3300563a1bbd1b4c189a6b1de90303602e578aceab8681b890a5d059dff7b8b061 SHA512 61a5315aad78cd6ea3c70dc7b04abbf9514d7be07998da61109f98f8c90b818f4bfab16ec1676d31671e2ce654d07918c30d5690695795dbfca2a05d41c4d94d
-EBUILD labplot-9999.ebuild 2750 BLAKE2B 1f2e880ed5cd3081c212bbdda2b4895ec842859941629f810dc2bdf997280ddc8f3dd18384cce47a12c47e1371e2d9b469002d5872247b9bd2b6a197ae38dab3 SHA512 4b0da65263d30f4e46675d22fd99a0f04ad4d5c4bacb86a9f36652452196bb1e3f4bc6c5be36301a8f1a0074a8bb402e59c9a42be55cb1c9be17bb22f5e210ab
-MISC metadata.xml 1455 BLAKE2B ccc8422453061ab92164dd78226e60a06d242f47a6e51e391f20d868e8a07dbe1f67a7fc7bec2bb173acbe8b6097258b2fbf2bcd41502d3a8bdaf98de94a3235 SHA512 50aa6fdfbd7f3aa88cc16bb5fdfd58e746a7a42f659d2803699fadf41f31cfbfeaa84ad186c0701e9115e6fa12450638cfc3124d914b3d52ef8bcb3240eccb36
+EBUILD labplot-9999.ebuild 3091 BLAKE2B eb1a39f40650692c32479c5f7306526e84aa7040d708c57fe18a8f1778d5c8c7a5d0dacb57b4f5ec56f81e48bbfc6775a5d3a4a8e71edeb0eaafb085239949e4 SHA512 4a64d9e39434bb72e9016b13fb3a4334f1a906bed728aa36c28a8391b41835fbd050f62a22c736f68d1f7303dbb8b9a9858dfef17c933a030ae134ae2641c073
+MISC metadata.xml 1845 BLAKE2B bb7aca45e956abdcb37ae99b188fd56f24df36ecd9d5bcd3f657cc3fc6f952d8f5038627a6385f45199e22e1a0a70718b10628b6975d41c01a013291639ec154 SHA512 5af43fdb00656214370302db18d2b22acde9b5b80c6e5aa6a30c46791590224e324a4c350af2d7978b4f3694fdd78ce3df71bfeacc6b67cf8f0d39d6c687f6dd
diff --git a/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch b/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch
deleted file mode 100644
index e59c1309888d..000000000000
--- a/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 06837a859c3cc03b175241d84575f747c2a0a779 Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Mon, 17 Apr 2023 23:15:19 +0200
-Subject: [PATCH] support discount version 3
-
-cherry-picked (and merged) commits from git master:
-80340872e0fd3780065b847000882cd2c6faaf09
-22c553af43ff2afc42a32f8b9f04c6b426f49300
----
- CMakeLists.txt                      |  4 ++++
- cmake/FindDiscount.cmake            |  9 ++++++++-
- src/backend/worksheet/TextLabel.cpp | 17 +++++++++++++++--
- 3 files changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed478d024..2e28a1aff 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -493,6 +493,10 @@ IF (ENABLE_DISCOUNT)
- 		TYPE OPTIONAL)
- 	IF (Discount_FOUND)
- 		add_definitions (-DHAVE_DISCOUNT)
-+		MESSAGE (STATUS "Found Markdown Library Discount ${Discount_VERSION}")
-+		IF (${Discount_VERSION} VERSION_GREATER "2.99")
-+			add_definitions (-DHAVE_DISCOUNT3)
-+		ENDIF ()
- 	ELSE ()
- 		MESSAGE (STATUS "Discount library NOT FOUND.")
- 	ENDIF ()
-diff --git a/cmake/FindDiscount.cmake b/cmake/FindDiscount.cmake
-index 4919ad6e1..9dd348649 100644
---- a/cmake/FindDiscount.cmake
-+++ b/cmake/FindDiscount.cmake
-@@ -10,6 +10,11 @@
- # SPDX-FileCopyrightText: 2018 Sune Vuorela <sune@kde.org>
- # SPDX-License-Identifier: BSD-3-Clause
- 
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_LIBMARKDOWN libmarkdown QUIET)
-+
-+set(Discount_VERSION ${PC_LIBMARKDOWN_VERSION})
-+
- if (Discount_INCLUDE_DIR AND Discount_LIBRARIES)
- 
-   # Already in cache
-@@ -19,10 +24,12 @@ else (Discount_INCLUDE_DIR AND Discount_LIBRARIES)
- 
-   find_library (Discount_LIBRARIES
-     NAMES markdown libmarkdown
-+    HINTS ${PC_LIBMARKDOWN_LIBRARY_DIRS}
-   )
- 
-   find_path (Discount_INCLUDE_DIR
-     NAMES mkdio.h
-+    HINTS ${PC_LIBMARKDOWN_INCLUDE_DIRS}
-   )
- 
-   include (FindPackageHandleStandardArgs)
-@@ -30,7 +37,7 @@ else (Discount_INCLUDE_DIR AND Discount_LIBRARIES)
- 
- endif (Discount_INCLUDE_DIR AND Discount_LIBRARIES)
- 
--mark_as_advanced(Discount_INCLUDE_DIR Discount_LIBRARIES)
-+mark_as_advanced(Discount_INCLUDE_DIR Discount_LIBRARIES Discount_VERSION)
- 
- if (Discount_FOUND)
-    add_library(Discount::Lib UNKNOWN IMPORTED)
-diff --git a/src/backend/worksheet/TextLabel.cpp b/src/backend/worksheet/TextLabel.cpp
-index 815dcb785..1c85c0e9e 100644
---- a/src/backend/worksheet/TextLabel.cpp
-+++ b/src/backend/worksheet/TextLabel.cpp
-@@ -576,8 +576,21 @@ void TextLabelPrivate::updateText() {
- 	case TextLabel::Mode::Markdown: {
- #ifdef HAVE_DISCOUNT
- 		auto mdCharArray = textWrapper.text.toUtf8();
--		MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size()+1, 0);
--		if(!mkd_compile(mdHandle, MKD_LATEX | MKD_FENCEDCODE | MKD_GITHUBTAGS)) {
-+#ifdef HAVE_DISCOUNT3
-+		MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size() + 1, nullptr);
-+
-+		mkd_flag_t* v3flags = mkd_flags();
-+		mkd_set_flag_num(v3flags, MKD_LATEX);
-+		mkd_set_flag_num(v3flags, MKD_FENCEDCODE);
-+		mkd_set_flag_num(v3flags, MKD_GITHUBTAGS);
-+
-+		if (!mkd_compile(mdHandle, v3flags)) {
-+#else
-+		MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size() + 1, 0);
-+
-+		unsigned int flags = MKD_LATEX | MKD_FENCEDCODE | MKD_GITHUBTAGS;
-+		if (!mkd_compile(mdHandle, flags)) {
-+#endif
- 			DEBUG(Q_FUNC_INFO << ", Failed to compile the markdown document");
- 			mkd_cleanup(mdHandle);
- 			return;
--- 
-2.40.0
-
diff --git a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild
deleted file mode 100644
index 0b0ac52a1aad..000000000000
--- a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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=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}/${PV}/${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"
-
-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
-	)
-	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? ( kde-frameworks/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-# not packaged: dev-qt/qtmqtt, bug 683994
-BDEPEND="
-	app-alternatives/yacc
-	sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${P}-discount-3.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_MQTT=OFF # not packaged
-		-DENABLE_READSTAT=OFF # not packaged
-		-DENABLE_CANTOR=$(usex cantor)
-		-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 dceb294dff35..f83aea5d78d6 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -5,9 +5,8 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.88.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
+KFMIN=6.3.0
+QTMIN=6.6.2
 inherit ecm kde.org
 
 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
@@ -18,38 +17,35 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="GPL-2"
-SLOT="5"
-IUSE="cantor excel fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry"
+SLOT="0"
+IUSE="eigen excel fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry"
 
+# IUSE="cantor"
+# 	cantor? (
+# 		>=kde-apps/cantor-19.12.0:6
+# 		>=kde-frameworks/kparts-${KFMIN}:6
+# 		>=kde-frameworks/kservice-${KFMIN}:6
+# 	)
 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
+	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:=
-	cantor? (
-		>=kde-apps/cantor-19.12.0:5
-		>=kde-frameworks/kparts-${KFMIN}:5
-		>=kde-frameworks/kservice-${KFMIN}:5
-	)
+	eigen? ( dev-cpp/eigen:3= )
 	excel? ( dev-libs/qxlsx:= )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:= )
@@ -58,28 +54,43 @@ DEPEND="
 	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}:5 )
-	telemetry? ( kde-frameworks/kuserfeedback:5 )
+	serial? ( >=dev-qt/qtserialport-${QTMIN}:6 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
 "
-RDEPEND="${DEPEND}"
 # 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=$(usex cantor)
-		-DENABLE_EXCEL=$(usex excel)
+		-DENABLE_CANTOR=OFF # $(usex cantor)
+		-DENABLE_EIGEN3=$(usex eigen)
+		-DENABLE_XLSX=$(usex excel)
 		-DENABLE_FFTW=$(usex fftw)
 		-DENABLE_FITS=$(usex fits)
 		-DENABLE_HDF5=$(usex hdf5)
@@ -87,10 +98,12 @@ src_configure() {
 		-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 KUserFeedback)
+		$(cmake_use_find_package telemetry KUserFeedbackQt6) # FIXME: should be KF6UserFeedback
 		-DENABLE_TESTS=$(usex test)
 	)
 
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 96a92087bc72..75a89a727232 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -15,16 +15,20 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">education/labplot</remote-id>
 	</upstream>
 	<use>
 		<flag name="cantor">Enable support for different open-source computer algebra systems via <pkg>kde-apps/cantor</pkg></flag>
+		<flag name="eigen">Enable support for fast baseline removal via <pkg>dev-cpp/eigen</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>
 		<flag name="matio">Enable support for matio (<pkg>sci-libs/matio</pkg>)</flag>
+		<flag name="ods">Enable support for importing/exporting OpenDocument spreadsheets (.ods) via <pkg>dev-libs/liborcus</pkg></flag>
 		<flag name="origin">Enable support for reading OriginLab OPJ project files through <pkg>sci-libs/liborigin</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>
+		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
 </pkgmetadata>