[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/, sci-visualization/labplot/files/
commit: cd2e586412d2630b39df98988357fc7baa88c995 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Sep 20 21:00:49 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 20 21:01:26 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2e5864 sci-visualization/labplot: Fix build with USE=ods Bug: https://bugs.gentoo.org/939807 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/labplot-2.11.1-ods-buildfix.patch| 38 ++ sci-visualization/labplot/labplot-2.11.1.ebuild| 2 ++ 2 files changed, 40 insertions(+) diff --git a/sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch b/sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch new file mode 100644 index ..affddeeaae5b --- /dev/null +++ b/sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch @@ -0,0 +1,38 @@ +From 0edfd2862a8f953cdd06ffe4940e1da5b7b5dc17 Mon Sep 17 00:00:00 2001 +From: Alexander Semke +Date: Mon, 15 Jul 2024 09:56:40 +0200 +Subject: [PATCH] Minor qt6 related fixes. + +--- + src/kdefrontend/datasources/OdsOptionsWidget.cpp | 7 --- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/kdefrontend/datasources/OdsOptionsWidget.cpp b/src/kdefrontend/datasources/OdsOptionsWidget.cpp +index 6424032dd..c90943695 100644 +--- a/src/kdefrontend/datasources/OdsOptionsWidget.cpp b/src/kdefrontend/datasources/OdsOptionsWidget.cpp +@@ -67,9 +67,9 @@ void OdsOptionsWidget::sheetSelectionChanged() { + } + + if (selectedItems.size() > 1) +- emit enableDataPortionSelection(false); ++ Q_EMIT enableDataPortionSelection(false); + else // one selected item +- emit enableDataPortionSelection(true); ++ Q_EMIT enableDataPortionSelection(true); + + auto* item = selectedItems.last(); + auto* const filter = static_cast(m_fileWidget->currentFileFilter()); +@@ -98,7 +98,8 @@ void OdsOptionsWidget::sheetSelectionChanged() { + const int maxColumns = 100; + for (int row = 0; row < rowCount; ++row) { + auto lineString = importedStrings.at(row); +- colCount = std::min(maxColumns, lineString.size()); ++ const int size = lineString.size(); ++ colCount = std::min(maxColumns, size); + if (row == 0) { + ui.twPreview->setColumnCount(colCount); + +-- +GitLab + diff --git a/sci-visualization/labplot/labplot-2.11.1.ebuild b/sci-visualization/labplot/labplot-2.11.1.ebuild index 4684a482542b..2c5e9dedfc90 100644 --- a/sci-visualization/labplot/labplot-2.11.1.ebuild +++ b/sci-visualization/labplot/labplot-2.11.1.ebuild @@ -76,6 +76,8 @@ BDEPEND=" sys-devel/gettext " +PATCHES=( "${FILESDIR}/${P}-ods-buildfix.patch" ) + src_prepare() { ecm_src_prepare
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 569582fe7abf8eeb4e9f96c6cea7a1fce6095f69 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 10 18:49:41 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 10 18:53:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=569582fe sci-visualization/labplot: drop 2.10.1 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/Manifest | 1 - sci-visualization/labplot/labplot-2.10.1.ebuild | 98 - sci-visualization/labplot/metadata.xml | 2 - 3 files changed, 101 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 717a48430e6f..8231c1048a99 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ -DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da DIST labplot-2.11.1.tar.xz 24180904 BLAKE2B c2b94db140ca47f648f2b7e82956a88fa36819aa666430d69b0c328d46a254e0fe9991d4ea61581c4c8da0f44694b2016471090a166e8beeb378f1e02eb6b2c7 SHA512 51a039c7eec5a2e104079b1dc7bfe1ecdc2c4e3327bcfbdc99e1b2fbae2b2be5db3a1a2c319e30d41a7cfcf177be756e8e3bb05d9a58c8418e43900dfad6b3b1 diff --git a/sci-visualization/labplot/labplot-2.10.1.ebuild b/sci-visualization/labplot/labplot-2.10.1.ebuild deleted file mode 100644 index dceb294dff35.. --- a/sci-visualization/labplot/labplot-2.10.1.ebuild +++ /dev/null @@ -1,98 +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}/${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? ( kde-frameworks/kuserfeedback:5 ) -" -RDEPEND="${DEPEND}" -# not packaged: dev-qt/qtmqtt, bug 683994 -BDEPEND=" - app-alternatives/yacc - 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) -
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 057a817f47021813bec1a9459fd37d543e9f64bb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 31 17:01:46 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 31 17:25:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057a817f sci-visualization/labplot: Update upstream metadata Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml index 0a2b3cc38e71..87166454e57b 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -14,7 +14,7 @@ Gentoo KDE Project - https://bugs.kde.org/ + https://bugs.kde.org/enter_bug.cgi?product=LabPlot2 education/labplot
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: c2a91740fe395f9274344bb634bc7d4b165c6972 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 31 17:08:43 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 31 17:25:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2a91740 sci-visualization/labplot: add 2.11.1 Closes: https://bugs.gentoo.org/936006 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/Manifest | 1 + sci-visualization/labplot/labplot-2.11.1.ebuild | 111 2 files changed, 112 insertions(+) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 6f951d4a3987..717a48430e6f 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da +DIST labplot-2.11.1.tar.xz 24180904 BLAKE2B c2b94db140ca47f648f2b7e82956a88fa36819aa666430d69b0c328d46a254e0fe9991d4ea61581c4c8da0f44694b2016471090a166e8beeb378f1e02eb6b2c7 SHA512 51a039c7eec5a2e104079b1dc7bfe1ecdc2c4e3327bcfbdc99e1b2fbae2b2be5db3a1a2c319e30d41a7cfcf177be756e8e3bb05d9a58c8418e43900dfad6b3b1 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 ..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_DISCO
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 0553ebd7c6f3769e3012200c58badc347b1ab50f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 31 16:59:12 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 31 17:25:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0553ebd7 sci-visualization/labplot: Rename IUSE excel -> xlsx Bug: https://bugs.gentoo.org/936006 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 6 +++--- sci-visualization/labplot/metadata.xml| 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index f83aea5d78d6..4684a482542b 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.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..0a2b3cc38e71 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -30,5 +30,6 @@ Enable support for CERN's ROOT file type Enable support for RS232 serial ports using dev-qt/qtserialport Enable support for a share menu using kde-frameworks/purpose + Enable support for importing/exporting Microsoft Excel files (.xlsx) via dev-libs/qxlsx
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 946c61430ae5d79c51aa7d8bacbcaf47e3a055b1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 13 14:37:48 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 13 14:44:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=946c6143 sci-visualization/labplot: add kde-invent upstream metadata Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml index f535220dfd09..75a89a727232 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -15,6 +15,7 @@ https://bugs.kde.org/ + education/labplot Enable support for different open-source computer algebra systems via kde-apps/cantor
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/files/, sci-visualization/labplot/
commit: ba96c67b4b65ef8054350cead2c4394474e4df2f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 13 14:17:43 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 13 14:24:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba96c67b sci-visualization/labplot: drop 2.9.0-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/Manifest | 1 - .../labplot/files/labplot-2.9.0-discount-3.patch | 98 -- sci-visualization/labplot/labplot-2.9.0-r1.ebuild | 97 - 3 files changed, 196 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index dce5e0b4765d..6f951d4a3987 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da -DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 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.. --- 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 -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 - # 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_FENCE
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: bea15aae800b07ee8b5e37eed9c3ca37573d5ce1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 13 14:07:51 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 13 14:24:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea15aae sci-visualization/labplot: Port to KF6, update dependencies and IUSE Upstream commits: b4c72d6ea542c82720c5730663a62b530a435b63 a29eee61e3fbd67154e94eaaa1e0050e87a7b50b 0c49873bcbd10471cc6df2dc875027ed53b11d42 5e21792e0e0f506c89f3b160606484e96f67207b d1ef379f64887b5ad9376750ba552805d998e95c a187e0e03a5bfdea38b15cceda906b0a47073d08 8084df037928690755dcc72c536270022f8c4d1f 8330bccae191f3e25a8fa20a93fc193a0578e887 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 89 +++ sci-visualization/labplot/metadata.xml| 3 + 2 files changed, 54 insertions(+), 38 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index dceb294dff35..f83aea5d78d6 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.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
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 88e61be14c24883ab86ec625e3dcea4056125b1f Author: Sam James gentoo org> AuthorDate: Mon Jan 8 12:09:11 2024 + Commit: Sam James gentoo org> CommitDate: Mon Jan 8 12:25:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88e61be1 sci-visualization/labplot: sys-devel/bison -> app-alternatives/yacc All of these will be using app-alternatives/yacc anyway as they're not unsetting YACC or LEX, so make the dep reflect reality. (Included both YACC and LEX out of conservatism.) Signed-off-by: Sam James gentoo.org> sci-visualization/labplot/labplot-2.10.1.ebuild | 4 ++-- sci-visualization/labplot/labplot-2.9.0-r1.ebuild | 4 ++-- sci-visualization/labplot/labplot-.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sci-visualization/labplot/labplot-2.10.1.ebuild b/sci-visualization/labplot/labplot-2.10.1.ebuild index 088be1870718..dceb294dff35 100644 --- a/sci-visualization/labplot/labplot-2.10.1.ebuild +++ b/sci-visualization/labplot/labplot-2.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -69,7 +69,7 @@ DEPEND=" RDEPEND="${DEPEND}" # not packaged: dev-qt/qtmqtt, bug 683994 BDEPEND=" - sys-devel/bison + app-alternatives/yacc sys-devel/gettext " diff --git a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild index b6f8c3731bf2..0b0ac52a1aad 100644 --- a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild +++ b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -68,7 +68,7 @@ DEPEND=" RDEPEND="${DEPEND}" # not packaged: dev-qt/qtmqtt, bug 683994 BDEPEND=" - sys-devel/bison + app-alternatives/yacc sys-devel/gettext " diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 088be1870718..dceb294dff35 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -69,7 +69,7 @@ DEPEND=" RDEPEND="${DEPEND}" # not packaged: dev-qt/qtmqtt, bug 683994 BDEPEND=" - sys-devel/bison + app-alternatives/yacc sys-devel/gettext "
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 1437c84e9171049377f4bae2331c51dcaa310dde Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Jul 12 13:13:49 2023 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Jul 12 13:13:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1437c84e sci-visualization/labplot: add version 2.10.1 Now with support for excel files! Closes: https://bugs.gentoo.org/910259 Signed-off-by: Andrew Ammerlaan gentoo.org> sci-visualization/labplot/Manifest | 1 + .../labplot/{labplot-.ebuild => labplot-2.10.1.ebuild} | 7 +-- sci-visualization/labplot/labplot-.ebuild | 7 +-- sci-visualization/labplot/metadata.xml | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 8fff691a49ea..dce5e0b4765d 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ +DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-2.10.1.ebuild similarity index 91% copy from sci-visualization/labplot/labplot-.ebuild copy to sci-visualization/labplot/labplot-2.10.1.ebuild index c45f80b7f620..57d676f568d6 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-2.10.1.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/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index c45f80b7f620..57d676f568d6 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.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=$(
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/files/, sci-visualization/labplot/
commit: 4596df2ad4038c41ed2cc9bec6019207a65b55dc Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 18 18:17:20 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 18 18:22:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4596df2a sci-visualization/labplot: Fix build with >=app-text/discount-3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../labplot/files/labplot-2.9.0-discount-3.patch | 98 ++ sci-visualization/labplot/labplot-2.9.0-r1.ebuild | 2 + 2 files changed, 100 insertions(+) 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 new file mode 100644 index ..e59c1309888d --- /dev/null +++ b/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch @@ -0,0 +1,98 @@ +From 06837a859c3cc03b175241d84575f747c2a0a779 Mon Sep 17 00:00:00 2001 +From: Stefan Gerlach +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 + # 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 index c45f80b7f620..30d2be63d7c4 100644 --- a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild +++ b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild @@ -72,6 +72,8 @@ BDEPEND=" sys-devel/gettext " +PATCHES=( "${FILE
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 6ab260eaef4706627f566f7713b51279fbd24721 Author: Ben Kohler gentoo org> AuthorDate: Mon Jan 30 15:17:06 2023 + Commit: Ben Kohler gentoo org> CommitDate: Mon Jan 30 15:25:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab260ea sci-visualization/labplot: slot operator dep on app-text/discount Signed-off-by: Ben Kohler gentoo.org> sci-visualization/labplot/labplot-2.9.0-r1.ebuild | 4 ++-- sci-visualization/labplot/labplot-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild index 1e23e3c19800..c45f80b7f620 100644 --- a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild +++ b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,7 +54,7 @@ DEPEND=" fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) - markdown? ( app-text/discount ) + markdown? ( app-text/discount:= ) matio? ( sci-libs/matio:= ) netcdf? ( sci-libs/netcdf:= ) origin? ( sci-libs/liborigin:2 ) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 1e23e3c19800..c45f80b7f620 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,7 +54,7 @@ DEPEND=" fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) - markdown? ( app-text/discount ) + markdown? ( app-text/discount:= ) matio? ( sci-libs/matio:= ) netcdf? ( sci-libs/netcdf:= ) origin? ( sci-libs/liborigin:2 )
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 8e0120f11e7c062eb2a720e7e0b8d61c4ace4327 Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed May 18 16:14:17 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed May 18 16:14:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0120f1 sci-visualization/labplot: drop 2.8.2 Closes: https://bugs.gentoo.org/811552 Signed-off-by: Andrew Ammerlaan gentoo.org> sci-visualization/labplot/Manifest | 1 - sci-visualization/labplot/labplot-2.8.2.ebuild | 88 -- 2 files changed, 89 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index ff4d0cb264f1..8fff691a49ea 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ -DIST labplot-2.8.2.tar.xz 13235168 BLAKE2B 251d7f6293ea90a1a16a33f38f3b3657051545cff4b0acc3d3009a02387c4cadb61dad31b72466f0d197b1cccac6e9095687fcc694853c2a6ef41fa1a954c6a7 SHA512 fc550ccb00c5d9966b42f3a367daaebfa94909b65f0a146e4cd75f9a4ed50d00a917fa4c5fd6b6694bf2223d75a564db49697106ea663b0e17def4ce501b09e1 DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 diff --git a/sci-visualization/labplot/labplot-2.8.2.ebuild b/sci-visualization/labplot/labplot-2.8.2.ebuild deleted file mode 100644 index 7872a5add1e5.. --- a/sci-visualization/labplot/labplot-2.8.2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.1 -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"; -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 netcdf root serial telemetry test" - -# 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 - >=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 ) - netcdf? ( sci-libs/netcdf:= ) - test? ( >=kde-frameworks/kparts-${KFMIN}:5 ) - root? ( - app-arch/lz4 - sys-libs/zlib - ) - serial? ( >=dev-qt/qtserialport-${QTMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DENABLE_CANTOR=$(usex cantor) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_FITS=$(usex fits) - -DENABLE_HDF5=$(usex hdf5) - -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 - ) - - ecm_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 055a3008ffd59e74942e93df5c65a0a190aee906 Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon May 9 18:50:37 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon May 9 18:51:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=055a3008 sci-visualization/labplot: relax poppler dependency It links against libpoppler-qt5.so.1 only so we do not have to recompile it on ABI change Bug: https://bugs.gentoo.org/811552 Signed-off-by: Andrew Ammerlaan gentoo.org> .../labplot/{labplot-2.9.0.ebuild => labplot-2.9.0-r1.ebuild} | 2 +- sci-visualization/labplot/labplot-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-visualization/labplot/labplot-2.9.0.ebuild b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild similarity index 99% rename from sci-visualization/labplot/labplot-2.9.0.ebuild rename to sci-visualization/labplot/labplot-2.9.0-r1.ebuild index a942184a9e66..1e23e3c19800 100644 --- a/sci-visualization/labplot/labplot-2.9.0.ebuild +++ b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild @@ -22,7 +22,7 @@ SLOT="5" IUSE="cantor fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry" DEPEND=" - app-text/poppler:= + app-text/poppler >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index a942184a9e66..1e23e3c19800 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -22,7 +22,7 @@ SLOT="5" IUSE="cantor fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry" DEPEND=" - app-text/poppler:= + app-text/poppler >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 2bca509d0dc9216f8b8ea14cb3603250d1dc5454 Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon May 9 17:17:47 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon May 9 17:19:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bca509d sci-visualization/labplot: add 2.9.0 Bug: https://bugs.gentoo.org/811552 Signed-off-by: Andrew Ammerlaan gentoo.org> sci-visualization/labplot/Manifest | 1 + sci-visualization/labplot/{labplot-.ebuild => labplot-2.9.0.ebuild} | 1 + sci-visualization/labplot/labplot-.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index f0798d054116..ff4d0cb264f1 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ DIST labplot-2.8.2.tar.xz 13235168 BLAKE2B 251d7f6293ea90a1a16a33f38f3b3657051545cff4b0acc3d3009a02387c4cadb61dad31b72466f0d197b1cccac6e9095687fcc694853c2a6ef41fa1a954c6a7 SHA512 fc550ccb00c5d9966b42f3a367daaebfa94909b65f0a146e4cd75f9a4ed50d00a917fa4c5fd6b6694bf2223d75a564db49697106ea663b0e17def4ce501b09e1 +DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-2.9.0.ebuild similarity index 99% copy from sci-visualization/labplot/labplot-.ebuild copy to sci-visualization/labplot/labplot-2.9.0.ebuild index 24768e5e9f36..a942184a9e66 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-2.9.0.ebuild @@ -22,6 +22,7 @@ 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 diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 24768e5e9f36..a942184a9e66 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -22,6 +22,7 @@ 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
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: d07f0571e6891026c995c25ccef4a390cee51d13 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Mar 5 23:10:27 2022 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Mar 5 23:10:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d07f0571 sci-visualization/labplot: Tests need kparts Closes: https://bugs.gentoo.org/791268 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas K. Hüttel gentoo.org> sci-visualization/labplot/labplot-2.8.2.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sci-visualization/labplot/labplot-2.8.2.ebuild b/sci-visualization/labplot/labplot-2.8.2.ebuild index fd6001e75440..7872a5add1e5 100644 --- a/sci-visualization/labplot/labplot-2.8.2.ebuild +++ b/sci-visualization/labplot/labplot-2.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ fi LICENSE="GPL-2" SLOT="5" -IUSE="cantor fftw fits hdf5 libcerf netcdf root serial telemetry" +IUSE="cantor fftw fits hdf5 libcerf netcdf root serial telemetry test" # not packaged: dev-qt/qtmqtt, bug 683994 BDEPEND=" @@ -59,6 +59,7 @@ DEPEND=" hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) + test? ( >=kde-frameworks/kparts-${KFMIN}:5 ) root? ( app-arch/lz4 sys-libs/zlib
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 9dff1dd1984212139554aed8b67da1974e785e0a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 9 19:24:20 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 9 19:24:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dff1dd1 sci-visualization/labplot: EAPI-8 bump Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 6f96d8bbb4d3..24768e5e9f36 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.1 +KFMIN=5.88.0 +QTMIN=5.15.2 VIRTUALX_REQUIRED="test" inherit ecm kde.org
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 02e0204b0f0ca608b56f4d5cdae06667405a116f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 5 07:30:18 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 5 09:06:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e0204b sci-visualization/labplot: EAPI-8 bump, add IUSE=markdown,matio,origin Upstream commits: 25bad33ab8cf30343fad9143412e8b238cb1bf32 06cefc9dc23a8f8896b9741ffc7704b9e2c2445b c9a155efaded430915d9770a72849a601d9f6a08 Update HOMEPAGE Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 20 +--- sci-visualization/labplot/metadata.xml| 3 +++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 03cc30d425b..6f96d8bbb4d 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.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 44b4cb39dc3..1625558de1e 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -20,6 +20,9 @@ Enable support for different open-source computer algebra systems via kde-apps/cantor Enable support for NASA's sci-libs/cfitsio library Enable special functions from sci-libs/libcerf + Enable Markdown support via app-text/discount + Enable support for matio (sci-libs/matio) + Enable support for reading OriginLab OPJ project files through sci-libs/liborigin Enable support for CERN's ROOT file type Enable support for RS232 serial ports using dev-qt/qtserialport
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 8316b99ba9aaa7f9a17980423f34226036eb628d Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 20 22:13:14 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 20 22:13:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8316b99b sci-visualization/labplot: Set VIRTUALX_REQUIRED="test" Closes: https://bugs.gentoo.org/754051 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-2.8.2.ebuild | 1 + sci-visualization/labplot/labplot-.ebuild | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sci-visualization/labplot/labplot-2.8.2.ebuild b/sci-visualization/labplot/labplot-2.8.2.ebuild index 33e94fdbc0b..fd6001e7544 100644 --- a/sci-visualization/labplot/labplot-2.8.2.ebuild +++ b/sci-visualization/labplot/labplot-2.8.2.ebuild @@ -7,6 +7,7 @@ ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" KFMIN=5.74.0 QTMIN=5.15.1 +VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 988b1176a00..03cc30d425b 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,6 +7,7 @@ ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" KFMIN=5.74.0 QTMIN=5.15.1 +VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: f7e89f5bd5e1d7e7cceb3ed6c893af895a1c3092 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 28 13:37:20 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 28 14:15:53 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e89f5b sci-visualization/labplot: 2.8.2 version bump Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/Manifest | 1 + sci-visualization/labplot/labplot-2.8.2.ebuild | 86 ++ 2 files changed, 87 insertions(+) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index d92c6741787..d90c4b2ea84 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ DIST labplot-2.8.1.tar.xz 13203288 BLAKE2B 59699faf0abe3355ab996321203c829b3aff5d7943c2688e955c0a84807a47a1e665d630dd052d6e3c005dc78cf7c613a87ccf5ce6cc2498bb694d9de838780a SHA512 9e03e70a1c0f167626583b2480b3d00743221ae5121e4f9cdc5170f292804fb41b03369c53bc729c006c61adb446ef05496f9789a3c89ffbb3bf51bcdc79c7ba +DIST labplot-2.8.2.tar.xz 13235168 BLAKE2B 251d7f6293ea90a1a16a33f38f3b3657051545cff4b0acc3d3009a02387c4cadb61dad31b72466f0d197b1cccac6e9095687fcc694853c2a6ef41fa1a954c6a7 SHA512 fc550ccb00c5d9966b42f3a367daaebfa94909b65f0a146e4cd75f9a4ed50d00a917fa4c5fd6b6694bf2223d75a564db49697106ea663b0e17def4ce501b09e1 diff --git a/sci-visualization/labplot/labplot-2.8.2.ebuild b/sci-visualization/labplot/labplot-2.8.2.ebuild new file mode 100644 index 000..33e94fdbc0b --- /dev/null +++ b/sci-visualization/labplot/labplot-2.8.2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.74.0 +QTMIN=5.15.1 +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"; +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 netcdf 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 + >=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 ) + netcdf? ( sci-libs/netcdf:= ) + root? ( + app-arch/lz4 + sys-libs/zlib + ) + serial? ( >=dev-qt/qtserialport-${QTMIN}:5 ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_CANTOR=$(usex cantor) + -DENABLE_FFTW=$(usex fftw) + -DENABLE_FITS=$(usex fits) + -DENABLE_HDF5=$(usex hdf5) + -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 + ) + + ecm_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 479807cea769fdfadea29e16d68e97e254543e35 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 29 23:18:09 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 29 23:19:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479807ce sci-visualization/labplot: Disable ENABLE_READSTAT Closes: https://bugs.gentoo.org/756907 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 4378d86efff..988b1176a00 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -69,6 +69,8 @@ RDEPEND="${DEPEND}" 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) @@ -79,7 +81,6 @@ src_configure() { -DENABLE_QTSERIALPORT=$(usex serial) $(cmake_use_find_package telemetry KUserFeedback) -DENABLE_TESTS=$(usex test) - -DENABLE_MQTT=OFF ) ecm_src_configure
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 3960042569327ba7da95d836ed87d63b2b67513f Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 5 19:17:55 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 5 20:25:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39600425 sci-visualization/labplot: Drop 2.7.0 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/Manifest | 1 - sci-visualization/labplot/labplot-2.7.0.ebuild | 83 -- 2 files changed, 84 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index cf534d93927..2e52f7308a5 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ -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-2.7.0.ebuild b/sci-visualization/labplot/labplot-2.7.0.ebuild deleted file mode 100644 index d876c81c2fc..000 --- a/sci-visualization/labplot/labplot-2.7.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 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 -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"; -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 netcdf root" - -# 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 - >=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 - >=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.08.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 ) - netcdf? ( sci-libs/netcdf:= ) - root? ( - app-arch/lz4 - sys-libs/zlib - ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DENABLE_CANTOR=$(usex cantor) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_FITS=$(usex fits) - -DENABLE_HDF5=$(usex hdf5) - -DENABLE_LIBCERF=$(usex libcerf) - -DENABLE_NETCDF=$(usex netcdf) - -DENABLE_ROOT=$(usex root) - -DENABLE_TESTS=$(usex test) - -DENABLE_MQTT=OFF - ) - - ecm_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 99ff45c7f04abfce13ac35a131d5f8fbc16d518e Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Oct 30 15:52:29 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 31 09:20:30 2020 + 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 gentoo.org> sci-visualization/labplot/Manifest| 1 + .../labplot/{labplot-.ebuild => labplot-2.8.0.ebuild} | 15 +-- sci-visualization/labplot/labplot-.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-.ebuild b/sci-visualization/labplot/labplot-2.8.0.ebuild similarity index 85% copy from sci-visualization/labplot/labplot-.ebuild copy to sci-visualization/labplot/labplot-2.8.0.ebuild index d876c81c2fc..4378d86efff 100644 --- a/sci-visualization/labplot/labplot-.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-.ebuild b/sci-visualization/labplot/labplot-.ebuild index d876c81c2fc..4378d86efff 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.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-$
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: d4badd4b38ef0e407a536f0f9c865da8bb996952 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 22 23:59:16 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 23 00:25:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4badd4b sci-visualization/labplot: Drop 2.6.0 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/Manifest | 1 - sci-visualization/labplot/labplot-2.6.0.ebuild | 79 -- 2 files changed, 80 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 5ade22ff882..25663789074 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ -DIST labplot-2.6.0.tar.xz 12360732 BLAKE2B f6259de30deb0adb4ddd47f0401fe8753a277aa01ade27c220ec832eb7f6c3e568c765085d2567529799777c9fe2442da777bd4089e5f488cc1aefb25a61d5a8 SHA512 6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af DIST labplot-2.7.0.tar.xz 13306532 BLAKE2B 044f6f1e552b6ccbd56791e39af240c97f0c572fae66ede0bbc13e172a88b652b0c42182fa4f6742b386dfd9c17f3041180841fe531387a9f44bd9b00adb8c09 SHA512 73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a diff --git a/sci-visualization/labplot/labplot-2.6.0.ebuild b/sci-visualization/labplot/labplot-2.6.0.ebuild deleted file mode 100644 index 476204d69fd..000 --- a/sci-visualization/labplot/labplot-2.6.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" -HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="cantor fftw fits hdf5 libcerf netcdf root" - -# not packaged: dev-qt/qtmqtt, bug 683994 -BDEPEND=" - sys-devel/bison - sys-devel/gettext -" -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep syntax-highlighting) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtserialport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - >=sci-libs/gsl-1.15:= - cantor? ( - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_kdeapps_dep cantor) - ) - fftw? ( sci-libs/fftw:3.0= ) - fits? ( sci-libs/cfitsio:= ) - hdf5? ( sci-libs/hdf5:= ) - libcerf? ( sci-libs/libcerf ) - netcdf? ( sci-libs/netcdf:= ) - root? ( - app-arch/lz4 - sys-libs/zlib - ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${P/.0/}" - -src_configure() { - local mycmakeargs=( - -DENABLE_CANTOR=$(usex cantor) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_FITS=$(usex fits) - -DENABLE_HDF5=$(usex hdf5) - -DENABLE_LIBCERF=$(usex libcerf) - -DENABLE_NETCDF=$(usex netcdf) - -DENABLE_ROOT=$(usex root) - -DENABLE_TESTS=$(usex test) - -DENABLE_MQTT=OFF - ) - - kde5_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 97c6a2a50a5c01f7dac335b8aecbd386226b9ea1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 20 16:34:07 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 20 16:38:49 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c6a2a5 sci-visualization/labplot: 2.7.0 version bump Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/Manifest | 1 + sci-visualization/labplot/{labplot-.ebuild => labplot-2.7.0.ebuild} | 2 +- sci-visualization/labplot/labplot-.ebuild | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 97ecc1c1fb3..5ade22ff882 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ DIST labplot-2.6.0.tar.xz 12360732 BLAKE2B f6259de30deb0adb4ddd47f0401fe8753a277aa01ade27c220ec832eb7f6c3e568c765085d2567529799777c9fe2442da777bd4089e5f488cc1aefb25a61d5a8 SHA512 6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af +DIST labplot-2.7.0.tar.xz 13306532 BLAKE2B 044f6f1e552b6ccbd56791e39af240c97f0c572fae66ede0bbc13e172a88b652b0c42182fa4f6742b386dfd9c17f3041180841fe531387a9f44bd9b00adb8c09 SHA512 73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-2.7.0.ebuild similarity index 100% copy from sci-visualization/labplot/labplot-.ebuild copy to sci-visualization/labplot/labplot-2.7.0.ebuild index 69ec65373d7..fcf591f4a89 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-2.7.0.ebuild @@ -50,9 +50,9 @@ DEPEND=" >=kde-frameworks/syntax-highlighting-${KFMIN}:5 >=sci-libs/gsl-1.15:= cantor? ( + >=kde-apps/cantor-19.08.0:5 >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-apps/cantor-19.08.0:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 69ec65373d7..fcf591f4a89 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -50,9 +50,9 @@ DEPEND=" >=kde-frameworks/syntax-highlighting-${KFMIN}:5 >=sci-libs/gsl-1.15:= cantor? ( + >=kde-apps/cantor-19.08.0:5 >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-apps/cantor-19.08.0:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= )
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 5a2d7a38b1ab3bec4ba369dc025188d7099bbad5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 13 13:31:31 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 13 13:44:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2d7a38 sci-visualization/labplot: Port to ecm.eclass and kde.org.eclass Package-Manager: Portage-2.3.79, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 67 ++- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index ba890ab34c7..69ec65373d7 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -3,16 +3,21 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit kde5 +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="GPL-2" -KEYWORDS="" +SLOT="5" IUSE="cantor fftw fits hdf5 libcerf netcdf root" # not packaged: dev-qt/qtmqtt, bug 683994 @@ -21,33 +26,33 @@ BDEPEND=" sys-devel/gettext " DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep syntax-highlighting) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtserialport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=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 + >=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? ( - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_kdeapps_dep cantor) + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-apps/cantor-19.08.0:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) @@ -74,5 +79,5 @@ src_configure() { -DENABLE_MQTT=OFF ) - kde5_src_configure + ecm_src_configure }
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 1c0c7aca30d17adaaaff8c252df250e599acba99 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 20 19:08:10 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 20 19:29:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0c7aca sci-visualization/labplot: Fix HOMEPAGE Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-2.6.0.ebuild | 2 +- sci-visualization/labplot/labplot-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-visualization/labplot/labplot-2.6.0.ebuild b/sci-visualization/labplot/labplot-2.6.0.ebuild index 7de7c2fe995..476204d69fd 100644 --- a/sci-visualization/labplot/labplot-2.6.0.ebuild +++ b/sci-visualization/labplot/labplot-2.6.0.ebuild @@ -8,7 +8,7 @@ KDE_TEST="forceoptional" inherit kde5 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" -HOMEPAGE="https://www.kde.org/applications/education/labplot/"; +HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2"; [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index e5c39d783eb..ba890ab34c7 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -8,7 +8,7 @@ KDE_TEST="forceoptional" inherit kde5 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" -HOMEPAGE="https://www.kde.org/applications/education/labplot/"; +HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2"; [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 155f754d34ac440f9bba0d113665e96c7423dbcd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 12 09:22:04 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 13 00:17:36 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155f754d sci-visualization/labplot: Add new DEPEND Upstream commit 7db95753334c19ac6f375a7a7ea7f60cece23682 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 5e4f6fed268..e5c39d783eb 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -28,6 +28,7 @@ DEPEND=" $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) $(add_frameworks_dep knewstuff) $(add_frameworks_dep kcrash) $(add_frameworks_dep ktextwidgets)
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 0df3b80bfae73b380f35503187f090ecbdffb1ce Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 23 17:40:12 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 23 20:24:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df3b80b sci-visualization/labplot: Drop 2.5.0-r1 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/Manifest| 1 - sci-visualization/labplot/labplot-2.5.0-r1.ebuild | 70 --- 2 files changed, 71 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 3ca755dac2b..97ecc1c1fb3 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ -DIST labplot-2.5.0.tar.xz 11831656 BLAKE2B b6c122509874f1f7a554814b7ac9889b416d36f750ff831773aed313f9eff23abc0809f40f6f591051b287bd1a875af455f5d500ce54130c4d8ddfe5fcfa0870 SHA512 a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba DIST labplot-2.6.0.tar.xz 12360732 BLAKE2B f6259de30deb0adb4ddd47f0401fe8753a277aa01ade27c220ec832eb7f6c3e568c765085d2567529799777c9fe2442da777bd4089e5f488cc1aefb25a61d5a8 SHA512 6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af diff --git a/sci-visualization/labplot/labplot-2.5.0-r1.ebuild b/sci-visualization/labplot/labplot-2.5.0-r1.ebuild deleted file mode 100644 index be9f065e8b5..000 --- a/sci-visualization/labplot/labplot-2.5.0-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" -HOMEPAGE="https://www.kde.org/applications/education/labplot/"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="cantor fftw fits hdf5 libcerf netcdf" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep syntax-highlighting) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtserialport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - >=sci-libs/gsl-1.15:= - cantor? ( $(add_kdeapps_dep cantor) ) - fftw? ( sci-libs/fftw:3.0= ) - fits? ( sci-libs/cfitsio:= ) - hdf5? ( sci-libs/hdf5:= ) - libcerf? ( sci-libs/libcerf ) - netcdf? ( sci-libs/netcdf:= ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/bison - sys-devel/gettext - x11-misc/shared-mime-info -" -RDEPEND="${COMMON_DEPEND} - !sci-visualization/labplot:4 -" - -src_configure() { - local mycmakeargs=( - -DENABLE_CANTOR=$(usex cantor) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_FITS=$(usex fits) - -DENABLE_HDF5=$(usex hdf5) - -DENABLE_LIBCERF=$(usex libcerf) - -DENABLE_NETCDF=$(usex netcdf) - -DENABLE_TESTS=$(usex test) - ) - - kde5_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 5ed5e3dcaa1879f87bdf7de53e0c33565416910d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 21 16:11:30 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 18:21:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed5e3dc sci-visualization/labplot: Add new DEPEND Upstream commit f48ffedad67605510f52287bdf171a3387eb7ef2 Also fix cmake options. Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index b3267fe058b..5e4f6fed268 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -15,6 +15,7 @@ LICENSE="GPL-2" KEYWORDS="" IUSE="cantor fftw fits hdf5 libcerf netcdf root" +# not packaged: dev-qt/qtmqtt, bug 683994 BDEPEND=" sys-devel/bison sys-devel/gettext @@ -28,6 +29,7 @@ DEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep knewstuff) + $(add_frameworks_dep kcrash) $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) @@ -67,7 +69,8 @@ src_configure() { -DENABLE_LIBCERF=$(usex libcerf) -DENABLE_NETCDF=$(usex netcdf) -DENABLE_ROOT=$(usex root) - -DENABLE_TEST=$(usex test) + -DENABLE_TESTS=$(usex test) + -DENABLE_MQTT=OFF ) kde5_src_configure
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 18e2f26e2480810334d011d9a320d7b56a8417fc Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 21 16:10:38 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 18:21:37 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e2f26e sci-visualization/labplot: Drop obsolete blocker Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 7e90a08059f..b3267fe058b 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -56,9 +56,7 @@ DEPEND=" sys-libs/zlib ) " -RDEPEND="${DEPEND} - !sci-visualization/labplot:4 -" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 3a0bd9f73d3aa607a48f3c2bc032f1434c2fbf1e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 21 16:26:39 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 18:21:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0bd9f7 sci-visualization/labplot: 2.6.0 version bump Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/Manifest | 1 + sci-visualization/labplot/labplot-2.6.0.ebuild | 79 ++ 2 files changed, 80 insertions(+) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 141373dce8b..3ca755dac2b 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ DIST labplot-2.5.0.tar.xz 11831656 BLAKE2B b6c122509874f1f7a554814b7ac9889b416d36f750ff831773aed313f9eff23abc0809f40f6f591051b287bd1a875af455f5d500ce54130c4d8ddfe5fcfa0870 SHA512 a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba +DIST labplot-2.6.0.tar.xz 12360732 BLAKE2B f6259de30deb0adb4ddd47f0401fe8753a277aa01ade27c220ec832eb7f6c3e568c765085d2567529799777c9fe2442da777bd4089e5f488cc1aefb25a61d5a8 SHA512 6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af diff --git a/sci-visualization/labplot/labplot-2.6.0.ebuild b/sci-visualization/labplot/labplot-2.6.0.ebuild new file mode 100644 index 000..7de7c2fe995 --- /dev/null +++ b/sci-visualization/labplot/labplot-2.6.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" +HOMEPAGE="https://www.kde.org/applications/education/labplot/"; +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="cantor fftw fits hdf5 libcerf netcdf root" + +# not packaged: dev-qt/qtmqtt, bug 683994 +BDEPEND=" + sys-devel/bison + sys-devel/gettext +" +DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep syntax-highlighting) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtserialport) + $(add_qt_dep qtsql) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + >=sci-libs/gsl-1.15:= + cantor? ( + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_kdeapps_dep cantor) + ) + fftw? ( sci-libs/fftw:3.0= ) + fits? ( sci-libs/cfitsio:= ) + hdf5? ( sci-libs/hdf5:= ) + libcerf? ( sci-libs/libcerf ) + netcdf? ( sci-libs/netcdf:= ) + root? ( + app-arch/lz4 + sys-libs/zlib + ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P/.0/}" + +src_configure() { + local mycmakeargs=( + -DENABLE_CANTOR=$(usex cantor) + -DENABLE_FFTW=$(usex fftw) + -DENABLE_FITS=$(usex fits) + -DENABLE_HDF5=$(usex hdf5) + -DENABLE_LIBCERF=$(usex libcerf) + -DENABLE_NETCDF=$(usex netcdf) + -DENABLE_ROOT=$(usex root) + -DENABLE_TESTS=$(usex test) + -DENABLE_MQTT=OFF + ) + + kde5_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: f126f9507e7c7e62c89ce757304c7a042df552fb Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 15 23:20:34 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Feb 15 23:28:23 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f126f950 sci-visualization/labplot: EAPI-7 bump Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/labplot/labplot-.ebuild | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 8b114b53331..7e90a08059f 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" @@ -15,7 +15,11 @@ LICENSE="GPL-2" KEYWORDS="" IUSE="cantor fftw fits hdf5 libcerf netcdf root" -COMMON_DEPEND=" +BDEPEND=" + sys-devel/bison + sys-devel/gettext +" +DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -52,12 +56,7 @@ COMMON_DEPEND=" sys-libs/zlib ) " -DEPEND="${COMMON_DEPEND} - sys-devel/bison - sys-devel/gettext - x11-misc/shared-mime-info -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !sci-visualization/labplot:4 "
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: f23a8655b8870860e897ff3becb0aec7e85d2131 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 21 14:51:06 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 21 14:57:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23a8655 sci-visualization/labplot: Add missing dependencies Closes: https://bugs.gentoo.org/668882 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 ...labplot-.ebuild => labplot-2.5.0-r1.ebuild} | 23 +- sci-visualization/labplot/labplot-.ebuild | 4 +++- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-2.5.0-r1.ebuild similarity index 83% copy from sci-visualization/labplot/labplot-.ebuild copy to sci-visualization/labplot/labplot-2.5.0-r1.ebuild index b6d50918c31..be9f065e8b5 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-2.5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,8 +12,8 @@ HOMEPAGE="https://www.kde.org/applications/education/labplot/"; [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="" -IUSE="cantor fftw fits hdf5 libcerf netcdf root" +KEYWORDS="~amd64 ~x86" +IUSE="cantor fftw fits hdf5 libcerf netcdf" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -21,8 +21,10 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) $(add_frameworks_dep knewstuff) $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) @@ -30,25 +32,19 @@ COMMON_DEPEND=" $(add_frameworks_dep syntax-highlighting) $(add_qt_dep qtconcurrent) $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) $(add_qt_dep qtprintsupport) $(add_qt_dep qtserialport) + $(add_qt_dep qtsql) $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) >=sci-libs/gsl-1.15:= - cantor? ( - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_kdeapps_dep cantor) - ) + cantor? ( $(add_kdeapps_dep cantor) ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) - root? ( - app-arch/lz4 - sys-libs/zlib - ) " DEPEND="${COMMON_DEPEND} sys-devel/bison @@ -67,8 +63,7 @@ src_configure() { -DENABLE_HDF5=$(usex hdf5) -DENABLE_LIBCERF=$(usex libcerf) -DENABLE_NETCDF=$(usex netcdf) - -DENABLE_ROOT=$(usex root) - -DENABLE_TEST=$(usex test) + -DENABLE_TESTS=$(usex test) ) kde5_src_configure diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index b6d50918c31..8b114b53331 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,8 +30,10 @@ COMMON_DEPEND=" $(add_frameworks_dep syntax-highlighting) $(add_qt_dep qtconcurrent) $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) $(add_qt_dep qtprintsupport) $(add_qt_dep qtserialport) + $(add_qt_dep qtsql) $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) >=sci-libs/gsl-1.15:=
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: a960f744dfbb6236dc328f1ee8966d75a7285798 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 21 14:51:50 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 21 14:57:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a960f744 sci-visualization/labplot: Drop 2.5.0 (r0) Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sci-visualization/labplot/labplot-2.5.0.ebuild | 68 -- 1 file changed, 68 deletions(-) diff --git a/sci-visualization/labplot/labplot-2.5.0.ebuild b/sci-visualization/labplot/labplot-2.5.0.ebuild deleted file mode 100644 index 7c2b38eee9e..000 --- a/sci-visualization/labplot/labplot-2.5.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" -HOMEPAGE="https://www.kde.org/applications/education/labplot/"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="cantor fftw fits hdf5 libcerf netcdf" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep syntax-highlighting) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtserialport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - >=sci-libs/gsl-1.15:= - cantor? ( $(add_kdeapps_dep cantor) ) - fftw? ( sci-libs/fftw:3.0= ) - fits? ( sci-libs/cfitsio:= ) - hdf5? ( sci-libs/hdf5:= ) - libcerf? ( sci-libs/libcerf ) - netcdf? ( sci-libs/netcdf:= ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/bison - sys-devel/gettext - x11-misc/shared-mime-info -" -RDEPEND="${COMMON_DEPEND} - !sci-visualization/labplot:4 -" - -src_configure() { - local mycmakeargs=( - -DENABLE_CANTOR=$(usex cantor) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_FITS=$(usex fits) - -DENABLE_HDF5=$(usex hdf5) - -DENABLE_LIBCERF=$(usex libcerf) - -DENABLE_NETCDF=$(usex netcdf) - -DENABLE_TESTS=$(usex test) - ) - - kde5_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 6ae0187e2c3aa64e81550610c3d0a96dd7181e72 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 13 14:02:24 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 13 18:52:03 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae0187e sci-visualization/labplot: Restore keywords Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sci-visualization/labplot/labplot-2.5.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-visualization/labplot/labplot-2.5.0.ebuild b/sci-visualization/labplot/labplot-2.5.0.ebuild index 40f32162ebc..7c2b38eee9e 100644 --- a/sci-visualization/labplot/labplot-2.5.0.ebuild +++ b/sci-visualization/labplot/labplot-2.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/education/labplot/"; [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="cantor fftw fits hdf5 libcerf netcdf" COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: baebbfc03c34360a4364dc2c9154a893f5f09939 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 8 13:24:52 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 8 13:28:51 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baebbfc0 sci-visualization/labplot: Drop 2.4.0 Package-Manager: Portage-2.3.49, Repoman-2.3.10 sci-visualization/labplot/Manifest | 1 - sci-visualization/labplot/labplot-2.4.0.ebuild | 73 -- 2 files changed, 74 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 146e34d4dfa..141373dce8b 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ -DIST labplot-2.4.0-kf5.tar.xz 6038072 BLAKE2B b1116a516f3d94d331584f22aefe4e9e54c0c96e98c08a90929bea1aaf379f04437d39a8644afc7cc7feda3f43881ba552d310ca263ae3fc6db24dbc8fb5 SHA512 5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b DIST labplot-2.5.0.tar.xz 11831656 BLAKE2B b6c122509874f1f7a554814b7ac9889b416d36f750ff831773aed313f9eff23abc0809f40f6f591051b287bd1a875af455f5d500ce54130c4d8ddfe5fcfa0870 SHA512 a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba diff --git a/sci-visualization/labplot/labplot-2.4.0.ebuild b/sci-visualization/labplot/labplot-2.4.0.ebuild deleted file mode 100644 index 41c5faefd1e..000 --- a/sci-visualization/labplot/labplot-2.4.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_BRANCH="frameworks" -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" -HOMEPAGE="https://www.kde.org/applications/education/labplot/"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="cantor fftw fits hdf5 netcdf" - -[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - >=sci-libs/gsl-1.15:= - cantor? ( $(add_kdeapps_dep cantor) ) - fftw? ( sci-libs/fftw:3.0= ) - fits? ( sci-libs/cfitsio:= ) - hdf5? ( sci-libs/hdf5:= ) - netcdf? ( sci-libs/netcdf:= ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext - x11-misc/shared-mime-info -" -RDEPEND="${COMMON_DEPEND} - !sci-visualization/labplot:4 -" - -src_prepare() { - kde5_src_prepare - - if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then - cmake_comment_add_subdirectory doc-translations - fi - - punt_bogus_dep KF5 NewStuff -} - -src_configure() { - local mycmakeargs=( - -DENABLE_CANTOR=$(usex cantor) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_FITS=$(usex fits) - -DENABLE_HDF5=$(usex hdf5) - -DENABLE_NETCDF=$(usex netcdf) - ) - - kde5_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 9e17361169ac96e94e95ccc7159bbb258af41f52 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 3 16:51:57 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 3 18:03:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e173611 sci-visualization/labplot: Drop unused DEPENDs Upstream commits 027bdb46520f096b85f74ee87dfab53d55be2d9b 2f1152d318109e667e59dfeb1569c67c65ba1ce4 Package-Manager: Portage-2.3.48, Repoman-2.3.10 sci-visualization/labplot/labplot-.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index a9e3d53b012..29a2451cf3f 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -22,10 +22,8 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) $(add_frameworks_dep knewstuff) $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons)
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 73003a1280021d235c196605b0d6380151cc1bce Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 3 17:44:11 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 3 18:03:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73003a12 sci-visualization/labplot: 2.5.0 version bump Closes: https://bugs.gentoo.org/665176 Package-Manager: Portage-2.3.48, Repoman-2.3.10 sci-visualization/labplot/Manifest | 1 + .../{labplot-.ebuild => labplot-2.5.0.ebuild} | 29 +- sci-visualization/labplot/labplot-.ebuild | 12 + 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index eb9705e4b00..146e34d4dfa 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ DIST labplot-2.4.0-kf5.tar.xz 6038072 BLAKE2B b1116a516f3d94d331584f22aefe4e9e54c0c96e98c08a90929bea1aaf379f04437d39a8644afc7cc7feda3f43881ba552d310ca263ae3fc6db24dbc8fb5 SHA512 5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b +DIST labplot-2.5.0.tar.xz 11831656 BLAKE2B b6c122509874f1f7a554814b7ac9889b416d36f750ff831773aed313f9eff23abc0809f40f6f591051b287bd1a875af455f5d500ce54130c4d8ddfe5fcfa0870 SHA512 a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-2.5.0.ebuild similarity index 76% copy from sci-visualization/labplot/labplot-.ebuild copy to sci-visualization/labplot/labplot-2.5.0.ebuild index 25cd79c868c..40f32162ebc 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-2.5.0.ebuild @@ -9,13 +9,11 @@ inherit kde5 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" HOMEPAGE="https://www.kde.org/applications/education/labplot/"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz" +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" KEYWORDS="" -IUSE="cantor fftw fits hdf5 libcerf netcdf root" - -[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5" +IUSE="cantor fftw fits hdf5 libcerf netcdf" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -23,8 +21,10 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) $(add_frameworks_dep knewstuff) $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) @@ -37,20 +37,12 @@ COMMON_DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) >=sci-libs/gsl-1.15:= - cantor? ( - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_kdeapps_dep cantor) - ) + cantor? ( $(add_kdeapps_dep cantor) ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) - root? ( - app-arch/lz4 - sys-libs/zlib - ) " DEPEND="${COMMON_DEPEND} sys-devel/bison @@ -61,14 +53,6 @@ RDEPEND="${COMMON_DEPEND} !sci-visualization/labplot:4 " -src_prepare() { - kde5_src_prepare - - if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then - cmake_comment_add_subdirectory doc-translations - fi -} - src_configure() { local mycmakeargs=( -DENABLE_CANTOR=$(usex cantor) @@ -77,8 +61,7 @@ src_configure() { -DENABLE_HDF5=$(usex hdf5) -DENABLE_LIBCERF=$(usex libcerf) -DENABLE_NETCDF=$(usex netcdf) - -DENABLE_ROOT=$(usex root) - -DENABLE_TEST=$(usex test) + -DENABLE_TESTS=$(usex test) ) kde5_src_configure diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 25cd79c868c..b6d50918c31 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -9,14 +9,12 @@ inherit kde5 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" HOMEPAGE="https://www.kde.org/applications/education/labplot/"; -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz" +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 8f0bd171d4d37ed88457a8e420f33f0906aa54f1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 3 17:32:06 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 3 18:03:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0bd171 sci-visualization/labplot: Add missing DEPENDs Upstream commits ace4d68cd5619485f7368883677e0a51c94d2364 bb3b0fa22a99f2542a3e0baaa7a7e07c5a32593b Package-Manager: Portage-2.3.48, Repoman-2.3.10 sci-visualization/labplot/labplot-.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 30110089d94..25cd79c868c 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -29,6 +29,7 @@ COMMON_DEPEND=" $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep syntax-highlighting) $(add_qt_dep qtconcurrent) $(add_qt_dep qtgui) $(add_qt_dep qtprintsupport) @@ -52,6 +53,7 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} + sys-devel/bison sys-devel/gettext x11-misc/shared-mime-info "
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 3fddbf9c3596381be6d1e7b55d8e31c68c04b55b Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 3 16:56:08 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 3 18:03:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fddbf9c sci-visualization/labplot: Add USE root Upstream commit 62e9b7c253d1d4927ce210609236741f4ea1aa47 Package-Manager: Portage-2.3.48, Repoman-2.3.10 sci-visualization/labplot/labplot-.ebuild | 7 ++- sci-visualization/labplot/metadata.xml| 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 29a2451cf3f..0adc14acbe2 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/education/labplot/"; LICENSE="GPL-2" KEYWORDS="" -IUSE="cantor fftw fits hdf5 netcdf" +IUSE="cantor fftw fits hdf5 netcdf root" [[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5" @@ -44,6 +44,10 @@ COMMON_DEPEND=" fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) netcdf? ( sci-libs/netcdf:= ) + root? ( + app-arch/lz4 + sys-libs/zlib + ) " DEPEND="${COMMON_DEPEND} sys-devel/gettext @@ -68,6 +72,7 @@ src_configure() { -DENABLE_FITS=$(usex fits) -DENABLE_HDF5=$(usex hdf5) -DENABLE_NETCDF=$(usex netcdf) + -DENABLE_ROOT=$(usex root) ) kde5_src_configure diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml index 9e450bf9332..e2c5300fb86 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -16,5 +16,6 @@ Enable support for different open-source computer algebra systems via kde-apps/cantor Enable support for NASA's sci-libs/cfitsio library + Enable support for CERN's ROOT file type
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 3a5ba26d8e28ce85546da944690675dab45d8b43 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 3 17:11:38 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 3 18:03:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5ba26d sci-visualization/labplot: Add USE libcerf Upstream commit 03f2cec7c69a2ad35ebbf405d1e3cc3ec86479d3 Package-Manager: Portage-2.3.48, Repoman-2.3.10 sci-visualization/labplot/labplot-.ebuild | 4 +++- sci-visualization/labplot/metadata.xml| 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 5073f218bae..30110089d94 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.kde.org/applications/education/labplot/"; LICENSE="GPL-2" KEYWORDS="" -IUSE="cantor fftw fits hdf5 netcdf root" +IUSE="cantor fftw fits hdf5 libcerf netcdf root" [[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5" @@ -44,6 +44,7 @@ COMMON_DEPEND=" fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) + libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 @@ -72,6 +73,7 @@ src_configure() { -DENABLE_FFTW=$(usex fftw) -DENABLE_FITS=$(usex fits) -DENABLE_HDF5=$(usex hdf5) + -DENABLE_LIBCERF=$(usex libcerf) -DENABLE_NETCDF=$(usex netcdf) -DENABLE_ROOT=$(usex root) -DENABLE_TEST=$(usex test) diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml index e2c5300fb86..150390b1984 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -16,6 +16,7 @@ Enable support for different open-source computer algebra systems via kde-apps/cantor Enable support for NASA's sci-libs/cfitsio library + Enable special functions from sci-libs/libcerf Enable support for CERN's ROOT file type
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 0d1acfee34b8d91994a972fd4a75cb8b802386df Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 3 17:03:33 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 3 18:03:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1acfee sci-visualization/labplot: Add tests handling Upstream commit 5d22491b4ee1191d0760b1ebfd7126eb203d98e7 Package-Manager: Portage-2.3.48, Repoman-2.3.10 sci-visualization/labplot/labplot-.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 0adc14acbe2..5073f218bae 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -4,6 +4,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" inherit kde5 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" @@ -73,6 +74,7 @@ src_configure() { -DENABLE_HDF5=$(usex hdf5) -DENABLE_NETCDF=$(usex netcdf) -DENABLE_ROOT=$(usex root) + -DENABLE_TEST=$(usex test) ) kde5_src_configure
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 07e409a10af3210c91968ce214f1559764d9c9a5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 3 16:47:24 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 3 18:03:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e409a1 sci-visualization/labplot: Add missing USE=cantor DEPENDs Upstream commits 0aa0baedb15256a24858149d8e1489db8581368b 9a05732bf3678dfccd200224d1b4a9ef98357526 Package-Manager: Portage-2.3.48, Repoman-2.3.10 sci-visualization/labplot/labplot-.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 0fa0b2d7ce0..a9e3d53b012 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -37,7 +37,11 @@ COMMON_DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) >=sci-libs/gsl-1.15:= - cantor? ( $(add_kdeapps_dep cantor) ) + cantor? ( + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_kdeapps_dep cantor) + ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= )
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 009218bb4d145577231b975daee748696c536574 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 21 14:01:05 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 21 14:01:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009218bb sci-visualization/labplot: Add new DEPEND Reported-by: urcindalo gmail.com> Closes: https://bugs.gentoo.org/653294 Package-Manager: Portage-2.3.31, Repoman-2.3.9 sci-visualization/labplot/labplot-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 5b11f8d449b..0fa0b2d7ce0 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -33,6 +33,7 @@ COMMON_DEPEND=" $(add_qt_dep qtconcurrent) $(add_qt_dep qtgui) $(add_qt_dep qtprintsupport) + $(add_qt_dep qtserialport) $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) >=sci-libs/gsl-1.15:=
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: fcd3aead941542c28dbaacfc72dd40fe30bc186a Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 13 09:02:35 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 13 09:02:46 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd3aead sci-visualization/labplot: Frameworks merged to master Closes: https://bugs.gentoo.org/653090 Package-Manager: Portage-2.3.28, Repoman-2.3.9 sci-visualization/labplot/labplot-.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 6eebaf15248..5b11f8d449b 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -EGIT_BRANCH="frameworks" KDE_HANDBOOK="forceoptional" inherit kde5
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 1ea6b27ef3cf489d099d3753b5c8c2050d67054e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 8 17:55:40 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 8 17:59:37 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea6b27e sci-visualization/labplot: 2.4.0 version bump Package-Manager: Portage-2.3.3, Repoman-2.3.1 sci-visualization/labplot/Manifest | 1 + .../labplot/{labplot-.ebuild => labplot-2.4.0.ebuild}| 9 + sci-visualization/labplot/labplot-.ebuild| 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 689f27edbda..a2b212d933c 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ DIST labplot-2.3.0-kf5.tar.xz 4531156 SHA256 a5a7d706de5f978430b359ada42f9227a2619f5fa9608d56af16c760b7626f33 SHA512 0f8053bfccbfb6756db14c2d35f69b18bc83395c15cc01cbe61e5877065ad587e1563e7f161dfbac7c75b8b30aa04ee112e0c1962b52544e33ca936bd17b1444 WHIRLPOOL febd50c0a36612a1f93d8190eb9907ede4c29513652cc1a99cfc196c464eb7a7d6bc8692e13a98a9ce31e963a15396385dd9d7b015fe65bd995e2b85e9a09f94 +DIST labplot-2.4.0-kf5.tar.xz 6038072 SHA256 86198247ff0d274c85607cdb07a0c4ef19149e4f4bf6c9d2e6e8249134e26bb2 SHA512 5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b WHIRLPOOL 8d5af85ae52bbe1526d00888c1a18922a0f27c3dbf4ff992736e6672008ca61f54f8df93a1c0185bf4fcdcebe4543e58aa7260eafaf40ba8abf87b39ab84bad4 diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-2.4.0.ebuild similarity index 94% copy from sci-visualization/labplot/labplot-.ebuild copy to sci-visualization/labplot/labplot-2.4.0.ebuild index 463b7dba15e..41c5faefd1e 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-2.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/education/labplot/"; [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz" LICENSE="GPL-2" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="cantor fftw fits hdf5 netcdf" [[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5" @@ -27,7 +27,6 @@ COMMON_DEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) @@ -52,11 +51,13 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { + kde5_src_prepare + if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then cmake_comment_add_subdirectory doc-translations fi - kde5_src_prepare + punt_bogus_dep KF5 NewStuff } src_configure() { diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 463b7dba15e..6eebaf15248 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,11 +52,11 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { + kde5_src_prepare + if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then cmake_comment_add_subdirectory doc-translations fi - - kde5_src_prepare } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/files/, sci-visualization/labplot/
commit: 458eacdfdd01178605c3b711daa2e1a9638f5363 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 8 17:57:51 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 8 17:59:38 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=458eacdf sci-visualization/labplot: Drop old Package-Manager: Portage-2.3.3, Repoman-2.3.1 sci-visualization/labplot/Manifest | 1 - .../labplot/files/labplot-2.3.0-deps.patch | 49 -- .../labplot/files/labplot-2.3.0-desktop.patch | 24 --- .../labplot/files/labplot-2.3.0-options.patch | 77 -- sci-visualization/labplot/labplot-2.3.0.ebuild | 76 - 5 files changed, 227 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index a2b212d933c..4d44278f530 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ -DIST labplot-2.3.0-kf5.tar.xz 4531156 SHA256 a5a7d706de5f978430b359ada42f9227a2619f5fa9608d56af16c760b7626f33 SHA512 0f8053bfccbfb6756db14c2d35f69b18bc83395c15cc01cbe61e5877065ad587e1563e7f161dfbac7c75b8b30aa04ee112e0c1962b52544e33ca936bd17b1444 WHIRLPOOL febd50c0a36612a1f93d8190eb9907ede4c29513652cc1a99cfc196c464eb7a7d6bc8692e13a98a9ce31e963a15396385dd9d7b015fe65bd995e2b85e9a09f94 DIST labplot-2.4.0-kf5.tar.xz 6038072 SHA256 86198247ff0d274c85607cdb07a0c4ef19149e4f4bf6c9d2e6e8249134e26bb2 SHA512 5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b WHIRLPOOL 8d5af85ae52bbe1526d00888c1a18922a0f27c3dbf4ff992736e6672008ca61f54f8df93a1c0185bf4fcdcebe4543e58aa7260eafaf40ba8abf87b39ab84bad4 diff --git a/sci-visualization/labplot/files/labplot-2.3.0-deps.patch b/sci-visualization/labplot/files/labplot-2.3.0-deps.patch deleted file mode 100644 index dbedac7f5be..000 --- a/sci-visualization/labplot/files/labplot-2.3.0-deps.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 41c3e23837adb8df641024901d3aee9dea2ded9d Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 6 Nov 2016 00:37:36 +0100 -Subject: [PATCH 1/2] Add missing dependencies - -REVIEW: 129344 - CMakeLists.txt | 25 +++-- - 1 file changed, 23 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9dc90f7..4db135f 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,8 +4,29 @@ cmake_minimum_required(VERSION 2.8.12) - find_package(ECM 1.3.0 REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - --find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg Concurrent) --find_package(KF5 REQUIRED COMPONENTS I18n KDELibs4Support) -+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS -+ Concurrent -+ Gui -+ PrintSupport -+ Svg -+ Widgets -+) -+find_package(KF5 REQUIRED COMPONENTS -+ Archive -+ Completion -+ Config -+ ConfigWidgets -+ CoreAddons -+ DocTools -+ I18n -+ IconThemes -+ KDELibs4Support -+ KIO -+ NewStuff -+ TextWidgets -+ WidgetsAddons -+ XmlGui -+) - - include(FeatureSummary) - include(ECMInstallIcons) --- -2.7.3 - diff --git a/sci-visualization/labplot/files/labplot-2.3.0-desktop.patch b/sci-visualization/labplot/files/labplot-2.3.0-desktop.patch deleted file mode 100644 index 8722b171446..000 --- a/sci-visualization/labplot/files/labplot-2.3.0-desktop.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit a66226a538ae23f61eaf4b3c00efa8321504fe00 -Author: Wolfgang Bauer -Date: Thu Jul 28 15:20:05 2016 +0200 - -Fix .desktop file's Exec line - -The KF5 port uses QCommandLineParser which doesn't know the '-caption' -parameter. -The desktop file needs to use '-qwindowtitle' instead. - -REVIEW: 128532 - -diff --git a/src/labplot2.desktop b/src/labplot2.desktop -index 38fe9bb..8ce836c 100755 a/src/labplot2.desktop -+++ b/src/labplot2.desktop -@@ -1,6 +1,6 @@ - [Desktop Entry] - Type=Application --Exec=labplot2 -caption %c %i %f -+Exec=labplot2 -qwindowtitle %c %i %f - Icon=labplot2 - Name=LabPlot2 - Name[ast]=LabPlot2 diff --git a/sci-visualization/labplot/files/labplot-2.3.0-options.patch b/sci-visualization/labplot/files/labplot-2.3.0-options.patch deleted file mode 100644 index f4f9a4c9d2d..000 --- a/sci-visualization/labplot/files/labplot-2.3.0-options.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 2756fff72169df6cd4eec3d9bf96e9673574c2d0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 6 Nov 2016 01:00:13 +0100 -Subject: [PATCH 2/2] Make options optional - -REVIEW: 129344 - CMakeLists.txt | 30 ++ - 1 file changed, 18 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4db135f..8055bee 100644 a/CMakeLists.txt -+++ b/CMake
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: d4dd78e39f92a275f8f7c049a6b70bee4ea7b21b Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 30 00:21:28 2016 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 30 00:24:37 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4dd78e3 sci-visualization/labplot: Fix configure Package-Manager: portage-2.3.0 sci-visualization/labplot/labplot-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index ac5f373..d81dfe2 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -65,7 +65,7 @@ src_configure() { -DENABLE_CANTOR=$(usex cantor) -DENABLE_FFTW=$(usex fftw) -DENABLE_FITS=$(usex fits) - $(cmake-utils_use_find_package hdf5 HDF5) + -DENABLE_HDF5=$(usex hdf5) -DENABLE_NETCDF=$(usex netcdf) )
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: d7381458d825f6cddae2114253631b895edf8d41 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Nov 5 22:45:26 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Nov 6 18:11:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7381458 sci-visualization/labplot: Switch to frameworks branch metadata.xml: Indentation Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/2756 Signed-off-by: David Seifert gentoo.org> sci-visualization/labplot/labplot-.ebuild | 84 --- sci-visualization/labplot/metadata.xml| 28 + 2 files changed, 80 insertions(+), 32 deletions(-) diff --git a/sci-visualization/labplot/labplot-.ebuild b/sci-visualization/labplot/labplot-.ebuild index 93da819..ac5f373 100644 --- a/sci-visualization/labplot/labplot-.ebuild +++ b/sci-visualization/labplot/labplot-.ebuild @@ -1,29 +1,73 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -if [[ "${PV}" != "" ]]; then - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - inherit kde4-base -else - EGIT_REPO_URI="git://anongit.kde.org/labplot" - inherit kde4-base git-r3 -fi +EGIT_BRANCH="frameworks" +KDE_HANDBOOK="forceoptional" +inherit kde5 -MY_PN=LabPlot -MY_P=${MY_PN}-${PV} - -DESCRIPTION="KDE data analysis and visualisation program" -HOMEPAGE="https://edu.kde.org/applications/science/labplot/"; +DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" +HOMEPAGE="https://www.kde.org/applications/education/labplot/"; +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz" LICENSE="GPL-2" -SLOT="4" -IUSE="" +KEYWORDS="" +IUSE="cantor fftw fits hdf5 netcdf" + +[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5" -DEPEND=" - sci-libs/gsl +COMMON_DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + >=sci-libs/gsl-1.15:= + cantor? ( $(add_kdeapps_dep cantor) ) + fftw? ( sci-libs/fftw:3.0= ) + fits? ( sci-libs/cfitsio:= ) + hdf5? ( sci-libs/hdf5:= ) + netcdf? ( sci-libs/netcdf:= ) +" +DEPEND="${COMMON_DEPEND} + sys-devel/gettext + x11-misc/shared-mime-info +" +RDEPEND="${COMMON_DEPEND} + !sci-visualization/labplot:4 " -RDEPEND="$DEPEND" + +src_prepare() { + if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then + cmake_comment_add_subdirectory doc-translations + fi + + kde5_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_CANTOR=$(usex cantor) + -DENABLE_FFTW=$(usex fftw) + -DENABLE_FITS=$(usex fits) + $(cmake-utils_use_find_package hdf5 HDF5) + -DENABLE_NETCDF=$(usex netcdf) + ) + + kde5_src_configure +} diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml index fb2bfd8..9e450bf 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -1,16 +1,20 @@ http://www.gentoo.org/dtd/metadata.dtd";> - -dilfri...@gentoo.org -Andreas K. Huettel - - -s...@gentoo.org -Gentoo Science Project - - -k...@gentoo.org -Gentoo KDE Project - + + dilfri...@gentoo.org + Andreas K. Huettel + + + s...@gentoo.org + Gentoo Science Project + + + k...@gentoo.org + Gentoo KDE Project + + + Enable support for different open-source computer algebra systems via kde-apps/cantor + Enable support for NASA's sci-libs/cfitsio library +
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/files/, sci-visualization/labplot/
commit: 2e8f7a0efa6739921197dd79c98c322d4a23f8a9 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Nov 6 00:31:53 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Nov 6 18:11:20 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e8f7a0e sci-visualization/labplot: Add first kf5-based release Gentoo-bug: 578532 Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/2756 Signed-off-by: David Seifert gentoo.org> sci-visualization/labplot/Manifest | 1 + .../labplot/files/labplot-2.3.0-deps.patch | 49 ++ .../labplot/files/labplot-2.3.0-desktop.patch | 24 +++ .../labplot/files/labplot-2.3.0-options.patch | 77 ++ sci-visualization/labplot/labplot-2.3.0.ebuild | 77 ++ 5 files changed, 228 insertions(+) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 7399f70..203e458 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ DIST labplot-2.0.2.tar.xz 2696384 SHA256 f52e6e2ce87aeda5bf15b950155e5db71cde4b0e1fb0819b6e71aaf6dee0 SHA512 6fb78f7f36dfd961690e4062646401fde86054323ffbf1d90986ae686201ad9f1bd5f2e6a914545f10d085355c490d63399ce92197770d7fb0cfccc91e24421b WHIRLPOOL 677f40ffb5cf151a160148da25cc364a6de62cfa5829bf70d4486e072ed05b6831d3975d31fa2ad6ef7c698b4abb44bdfd86efd9d29d1670e0bd5e57f9c4314e +DIST labplot-2.3.0-kf5.tar.xz 4531156 SHA256 a5a7d706de5f978430b359ada42f9227a2619f5fa9608d56af16c760b7626f33 SHA512 0f8053bfccbfb6756db14c2d35f69b18bc83395c15cc01cbe61e5877065ad587e1563e7f161dfbac7c75b8b30aa04ee112e0c1962b52544e33ca936bd17b1444 WHIRLPOOL febd50c0a36612a1f93d8190eb9907ede4c29513652cc1a99cfc196c464eb7a7d6bc8692e13a98a9ce31e963a15396385dd9d7b015fe65bd995e2b85e9a09f94 diff --git a/sci-visualization/labplot/files/labplot-2.3.0-deps.patch b/sci-visualization/labplot/files/labplot-2.3.0-deps.patch new file mode 100644 index ..dbedac7 --- /dev/null +++ b/sci-visualization/labplot/files/labplot-2.3.0-deps.patch @@ -0,0 +1,49 @@ +From 41c3e23837adb8df641024901d3aee9dea2ded9d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 6 Nov 2016 00:37:36 +0100 +Subject: [PATCH 1/2] Add missing dependencies + +REVIEW: 129344 +--- + CMakeLists.txt | 25 +++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9dc90f7..4db135f 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -4,8 +4,29 @@ cmake_minimum_required(VERSION 2.8.12) + find_package(ECM 1.3.0 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg Concurrent) +-find_package(KF5 REQUIRED COMPONENTS I18n KDELibs4Support) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS ++ Concurrent ++ Gui ++ PrintSupport ++ Svg ++ Widgets ++) ++find_package(KF5 REQUIRED COMPONENTS ++ Archive ++ Completion ++ Config ++ ConfigWidgets ++ CoreAddons ++ DocTools ++ I18n ++ IconThemes ++ KDELibs4Support ++ KIO ++ NewStuff ++ TextWidgets ++ WidgetsAddons ++ XmlGui ++) + + include(FeatureSummary) + include(ECMInstallIcons) +-- +2.7.3 + diff --git a/sci-visualization/labplot/files/labplot-2.3.0-desktop.patch b/sci-visualization/labplot/files/labplot-2.3.0-desktop.patch new file mode 100644 index ..8722b17 --- /dev/null +++ b/sci-visualization/labplot/files/labplot-2.3.0-desktop.patch @@ -0,0 +1,24 @@ +commit a66226a538ae23f61eaf4b3c00efa8321504fe00 +Author: Wolfgang Bauer +Date: Thu Jul 28 15:20:05 2016 +0200 + +Fix .desktop file's Exec line + +The KF5 port uses QCommandLineParser which doesn't know the '-caption' +parameter. +The desktop file needs to use '-qwindowtitle' instead. + +REVIEW: 128532 + +diff --git a/src/labplot2.desktop b/src/labplot2.desktop +index 38fe9bb..8ce836c 100755 +--- a/src/labplot2.desktop b/src/labplot2.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] + Type=Application +-Exec=labplot2 -caption %c %i %f ++Exec=labplot2 -qwindowtitle %c %i %f + Icon=labplot2 + Name=LabPlot2 + Name[ast]=LabPlot2 diff --git a/sci-visualization/labplot/files/labplot-2.3.0-options.patch b/sci-visualization/labplot/files/labplot-2.3.0-options.patch new file mode 100644 index ..f4f9a4c --- /dev/null +++ b/sci-visualization/labplot/files/labplot-2.3.0-options.patch @@ -0,0 +1,77 @@ +From 2756fff72169df6cd4eec3d9bf96e9673574c2d0 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 6 Nov 2016 01:00:13 +0100 +Subject: [PATCH 2/2] Make options optional + +REVIEW: 129344 +--- + CMakeLists.txt | 30 ++ + 1 file changed, 18 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.tx
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/
commit: 13a86f47f58eb7d2fac9f7738a37bc7aa97d83ad Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Nov 6 17:40:06 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Nov 6 18:11:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a86f47 sci-visualization/labplot: Drop old Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/2756 Signed-off-by: David Seifert gentoo.org> sci-visualization/labplot/Manifest | 1 - sci-visualization/labplot/labplot-2.0.2.ebuild | 29 -- 2 files changed, 30 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 203e458..689f27e 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ -DIST labplot-2.0.2.tar.xz 2696384 SHA256 f52e6e2ce87aeda5bf15b950155e5db71cde4b0e1fb0819b6e71aaf6dee0 SHA512 6fb78f7f36dfd961690e4062646401fde86054323ffbf1d90986ae686201ad9f1bd5f2e6a914545f10d085355c490d63399ce92197770d7fb0cfccc91e24421b WHIRLPOOL 677f40ffb5cf151a160148da25cc364a6de62cfa5829bf70d4486e072ed05b6831d3975d31fa2ad6ef7c698b4abb44bdfd86efd9d29d1670e0bd5e57f9c4314e DIST labplot-2.3.0-kf5.tar.xz 4531156 SHA256 a5a7d706de5f978430b359ada42f9227a2619f5fa9608d56af16c760b7626f33 SHA512 0f8053bfccbfb6756db14c2d35f69b18bc83395c15cc01cbe61e5877065ad587e1563e7f161dfbac7c75b8b30aa04ee112e0c1962b52544e33ca936bd17b1444 WHIRLPOOL febd50c0a36612a1f93d8190eb9907ede4c29513652cc1a99cfc196c464eb7a7d6bc8692e13a98a9ce31e963a15396385dd9d7b015fe65bd995e2b85e9a09f94 diff --git a/sci-visualization/labplot/labplot-2.0.2.ebuild b/sci-visualization/labplot/labplot-2.0.2.ebuild deleted file mode 100644 index 93da819.. --- a/sci-visualization/labplot/labplot-2.0.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ "${PV}" != "" ]]; then - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - inherit kde4-base -else - EGIT_REPO_URI="git://anongit.kde.org/labplot" - inherit kde4-base git-r3 -fi - -MY_PN=LabPlot -MY_P=${MY_PN}-${PV} - -DESCRIPTION="KDE data analysis and visualisation program" -HOMEPAGE="https://edu.kde.org/applications/science/labplot/"; - -LICENSE="GPL-2" -SLOT="4" -IUSE="" - -DEPEND=" - sci-libs/gsl -" -RDEPEND="$DEPEND"