gentoo resync : 10.09.2021

3 files changed, 18 insertions, 9 deletions

diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 6a755059a65d..34eb58f3e828 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,4 @@
 DIST labplot-2.8.2.tar.xz 13235168 BLAKE2B 251d7f6293ea90a1a16a33f38f3b3657051545cff4b0acc3d3009a02387c4cadb61dad31b72466f0d197b1cccac6e9095687fcc694853c2a6ef41fa1a954c6a7 SHA512 fc550ccb00c5d9966b42f3a367daaebfa94909b65f0a146e4cd75f9a4ed50d00a917fa4c5fd6b6694bf2223d75a564db49697106ea663b0e17def4ce501b09e1
 EBUILD labplot-2.8.2.ebuild 2343 BLAKE2B 9bb15fbb175a3124570d2a9c5248b61e50f5e46123bb095760689e4d5fa464b8388b1ab938f2b23ac22258c5ecb9737460c617339017981b73d9bcfd459c450d SHA512 5f355007fcd06649a419561dbd2cc1719634c01fde33d7bdde24ab022681372b4a8acb1764da56de8ad94553fc82532df52e1c68f65d33cff39fa576b53e92d5
-EBUILD labplot-9999.ebuild 2397 BLAKE2B e19109fbf49b027c4b62add3d5527e0dfd3255885584ce1a299ea1fda74a427706d4efe3267377bc85d09089656ea6eb77979cf3ca6cff132d5d55b2bb5f0a12 SHA512 2e781656089e248d8ec9c400f4954822bc7167c0a5a0f0a319345769db6b0121a7e6a36188a9c0eb47f3cc006938daf62030b40fdeabe7e910d6d947acdddab8
-MISC metadata.xml 1036 BLAKE2B d2617f7bc61890019ff32bd4c080aaacbc8e7684074ea767b106d7a6a63800abf51a5e5694ef866ad4c1c213ab5cc1cd87fd21ebb13dbf0ebada1c9216759e05 SHA512 c902491663093d6c99fadd1b4a08f06d7c76ce717e340492dc331d65f779c2cf446bebb47ffb597c983f456fdf45bfa4746601ea82be680ac68ce8f4ff94dee3
+EBUILD labplot-9999.ebuild 2617 BLAKE2B 409bad6dd79a0a7434eb4500c1bc92b507cfe281ce737f3acf7f622ce68537b1e1a3537d0f04dbd2c19292e5c1666dc67105b53fcd34eb18e92caa9ef98ed92f SHA512 ce4dc120dbd63d10a4ddd3005a7a273723c3b451986aefd8c66e2d958512f468dc9cb88a1b67c2f609d9ef3bfd47656059d626b7f592eebf2317f87ddba022cf
+MISC metadata.xml 1327 BLAKE2B b89645ce7e24b31783729126ec35348376cbae11604b8c7abaf352bfc6e2d39295004e82ed65da3be2210e557507ad9eea87e40100da55674dfc0e403b5b1819 SHA512 3ca8908ac98002fe0a20851c64a6c96f5b24eaa31de3564ea60c4b20f4a038a94b8e233f061e23938968947d457561f02935e56988d753629d16052f0447033c
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index 03cc30d425b1..6f96d8bbb4d3 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -11,7 +11,7 @@ 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/en/labplot2"
+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"
@@ -19,13 +19,8 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="cantor fftw fits hdf5 libcerf netcdf root serial telemetry"
+IUSE="cantor fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry"
 
-# not packaged: dev-qt/qtmqtt, bug 683994
-BDEPEND="
-	sys-devel/bison
-	sys-devel/gettext
-"
 DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -58,7 +53,10 @@ DEPEND="
 	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
@@ -67,6 +65,11 @@ DEPEND="
 	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=(
@@ -77,7 +80,10 @@ src_configure() {
 		-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)
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 44b4cb39dc37..1625558de1ee 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -20,6 +20,9 @@
 		<flag name="cantor">Enable support for different open-source computer algebra systems via <pkg>kde-apps/cantor</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="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>
 	</use>