[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: 52e24d1ea822f809e6e51fe31a8e593711577179 Author: Eli Schwartz gmail com> AuthorDate: Wed Mar 27 05:27:44 2024 + Commit: Sam James gentoo org> CommitDate: Wed Mar 27 05:54:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52e24d1e sci-visualization/kst: mark as LTO-unsafe Closes: https://bugs.gentoo.org/863296 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> sci-visualization/kst/kst-2.0.8-r2.ebuild | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sci-visualization/kst/kst-2.0.8-r2.ebuild b/sci-visualization/kst/kst-2.0.8-r2.ebuild index d98d0d65c25d..6eea2097dbb3 100644 --- a/sci-visualization/kst/kst-2.0.8-r2.ebuild +++ b/sci-visualization/kst/kst-2.0.8-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MY_P=Kst-${PV} -inherit cmake xdg-utils +inherit cmake flag-o-matic xdg-utils DESCRIPTION="Fast real-time large-dataset viewing and plotting tool" HOMEPAGE="https://kst-plot.kde.org/ https://invent.kde.org/graphics/kst-plot; @@ -50,6 +50,11 @@ PATCHES=( ) src_configure() { + # -Werror=odr, -Werror=lto-type=-mismatch + # https://bugs.gentoo.org/863296 + # https://bugs.kde.org/show_bug.cgi?id=484572 + filter-lto + local mycmakeargs=( -Dkst_install_libdir="$(get_libdir)" -Dkst_pch=OFF
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/
commit: c3876a84c08510d2351ee41d189e58f2592b8c77 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 7 11:44:53 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 7 12:52:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3876a84 sci-visualization/kst: Fix build w/ >=dev-util/cmake-3.20 Closes: https://bugs.gentoo.org/778560 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kst/files/kst-2.0.8-cmake-3.20.patch | 32 ++ sci-visualization/kst/kst-2.0.8-r1.ebuild | 1 + 2 files changed, 33 insertions(+) diff --git a/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch new file mode 100644 index 000..39e2df7d0a6 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch @@ -0,0 +1,32 @@ +From 6a41644c39ffb394c350de3dacbacdffa54a0a2a Mon Sep 17 00:00:00 2001 +From: Adriaan de Groot +Date: Sat, 3 Apr 2021 00:47:52 +0200 +Subject: [PATCH] Fix CMake-time with CMake 3.20 + +Having multiple else-blocks for a single if() is now a syntax +error; they need to be elseif() with only a single +optional else() at the end. +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 593dcb11..f965bd64 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -116,10 +116,10 @@ elseif(kst_3rdparty_download) + elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) + set(ver 4.7) + set(md5 de6e8dbab1bb17eee6057941fddc93e3) +-else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) ++elseif(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) + set(ver 4.6) + set(md5 70d8670af9c21eb8fb466654c95d8e4d) +-else(GCC_VERSION VERSION_GREATER 4.4) ++elseif(GCC_VERSION VERSION_GREATER 4.4) + set(ver 4.4) + set(md5 999248fb40a44543af4dd4cd1be0ceeb) + else() +-- +GitLab + diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r1.ebuild index e7319cac830..dea0db42382 100644 --- a/sci-visualization/kst/kst-2.0.8-r1.ebuild +++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild @@ -44,6 +44,7 @@ PATCHES=( "${FILESDIR}/${P}-includes.patch" "${FILESDIR}/${P}-qt-5.11.patch" "${FILESDIR}/${P}-gsl-2.0.patch" + "${FILESDIR}/${P}-cmake-3.20.patch" # bug 778560 ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/
commit: 0dbe576f6001ea47c6062c4208c21361cd8add32 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 7 12:36:11 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 7 12:52:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbe576f sci-visualization/kst: Fix FindGetdata.cmake Closes: https://bugs.gentoo.org/593848 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kst-2.0.8-getdata-drop-bogus-lib_debug.patch | 23 ++ 1 file changed, 23 insertions(+) diff --git a/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch b/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch new file mode 100644 index 000..07baa1a32ab --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch @@ -0,0 +1,23 @@ +--- a/cmake/modules/FindGetdata.cmake 2014-02-13 10:41:44.0 +0100 b/cmake/modules/FindGetdata.cmake 2021-09-07 14:32:16.248930734 +0200 +@@ -49,19 +49,9 @@ + PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS}) + list(APPEND GETDATA_LIBRARIES_RELEASE ${lib_release}) + list(APPEND GETDATA_LIBRARIES_BOTH optimized ${lib_release}) +- set(lib_debug lib_debug-NOTFOUND CACHE STRING "" FORCE) +- FIND_LIBRARY(lib_debug ${it}d +- HINTS ENV GETDATA_DIR PATH_SUFFIXES lib +- PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS}) +- list(APPEND GETDATA_LIBRARIES_DEBUG ${lib_debug}) +- list(APPEND GETDATA_LIBRARIES_BOTH debug ${lib_debug}) + endforeach() + +-if(GETDATA_LIBRARIES_DEBUG AND GETDATA_LIBRARIES_RELEASE) +- set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_BOTH} CACHE STRING "" FORCE) +-else() +- set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE} CACHE STRING "" FORCE) +-endif() ++set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE} CACHE STRING "" FORCE) + + endif() +
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: bfa2bb1075711dfd765f6f86fea7fbef5fc09e52 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 7 11:38:22 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 7 12:52:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa2bb10 sci-visualization/kst: Update HOMEPAGE, fix metadata.xml indentation Add current upstream repository address. Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/kst/kst-2.0.8-r1.ebuild | 2 +- sci-visualization/kst/metadata.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r1.ebuild index 148390c6c26..9df077a76f9 100644 --- a/sci-visualization/kst/kst-2.0.8-r1.ebuild +++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild @@ -8,7 +8,7 @@ inherit cmake-utils xdg-utils MY_P=Kst-${PV} DESCRIPTION="Fast real-time large-dataset viewing and plotting tool" -HOMEPAGE="https://kst.kde.org/; +HOMEPAGE="https://kst-plot.kde.org/ https://invent.kde.org/graphics/kst-plot; SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2 LGPL-2 FDL-1.2" diff --git a/sci-visualization/kst/metadata.xml b/sci-visualization/kst/metadata.xml index 9f73ea702ac..27e7888aa2c 100644 --- a/sci-visualization/kst/metadata.xml +++ b/sci-visualization/kst/metadata.xml @@ -4,7 +4,7 @@ q...@gentoo.org Gentoo Qt Project - + kst https://bugs.kde.org/
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: 47d28485c0b9dc3c9f0ae512a7c0ca648edf6c43 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 7 12:47:43 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 7 12:52:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d28485 sci-visualization/kst: Fix dependencies, add missing usedep Drop unused dev-qt/qtopengl:5 Add missing slot op to sci-libs/cfitsio Add missing sci-libs/matio (fixes automagic dep after it was packaged) Thanks-to: Jérôme Borme laposte.net> Bug: https://bugs.gentoo.org/593848 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/kst/{kst-2.0.8-r1.ebuild => kst-2.0.8-r2.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r2.ebuild similarity index 95% rename from sci-visualization/kst/kst-2.0.8-r1.ebuild rename to sci-visualization/kst/kst-2.0.8-r2.ebuild index 159b9f3b814..d98d0d65c25 100644 --- a/sci-visualization/kst/kst-2.0.8-r1.ebuild +++ b/sci-visualization/kst/kst-2.0.8-r2.ebuild @@ -24,13 +24,13 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - sci-libs/cfitsio - sci-libs/getdata + sci-libs/cfitsio:= + sci-libs/getdata[cxx] sci-libs/gsl:= + sci-libs/matio:= sci-libs/netcdf-cxx:3 " DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: bfaf58c44af48ea56c0c4943b8d2b0bfe2731755 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 7 11:43:43 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 7 12:52:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfaf58c4 sci-visualization/kst: EAPI-8 bump, switch to cmake.eclass Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/kst/kst-2.0.8-r1.ebuild | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r1.ebuild index 9df077a76f9..e7319cac830 100644 --- a/sci-visualization/kst/kst-2.0.8-r1.ebuild +++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit cmake-utils xdg-utils +EAPI=8 MY_P=Kst-${PV} +inherit cmake xdg-utils DESCRIPTION="Fast real-time large-dataset viewing and plotting tool" HOMEPAGE="https://kst-plot.kde.org/ https://invent.kde.org/graphics/kst-plot; SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2 LGPL-2 FDL-1.2" SLOT="0" @@ -34,11 +34,9 @@ RDEPEND=" sci-libs/netcdf-cxx:3 " DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) " - -S=${WORKDIR}/${MY_P} +BDEPEND="dev-qt/linguist-tools:5" DOCS=( AUTHORS README.kstScript ) @@ -59,7 +57,7 @@ src_configure() { -Dkst_test=$(usex test) ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
commit: 8b6c60dd4d1e2c2396b9eb4cb15de30d1a503fb5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 7 12:39:55 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 7 12:52:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6c60dd sci-visualization/kst: Fix build with Qt 5.15 Thanks-to: Jérôme Borme laposte.net> Bug: https://bugs.gentoo.org/593848 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch | 10 ++ sci-visualization/kst/kst-2.0.8-r1.ebuild | 2 ++ 2 files changed, 12 insertions(+) diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch new file mode 100644 index 000..97b42a6d33c --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch @@ -0,0 +1,10 @@ +--- a/src/widgets/gradienteditor.h 2014-02-13 09:41:44.0 + b/src/widgets/gradienteditor.h 2021-04-18 14:45:24.654148450 +0100 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include "kstwidgets_export.h" + diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r1.ebuild index dea0db42382..159b9f3b814 100644 --- a/sci-visualization/kst/kst-2.0.8-r1.ebuild +++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild @@ -45,6 +45,8 @@ PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" "${FILESDIR}/${P}-gsl-2.0.patch" "${FILESDIR}/${P}-cmake-3.20.patch" # bug 778560 + "${FILESDIR}/${P}-getdata-drop-bogus-lib_debug.patch" # bug 593848 + "${FILESDIR}/${P}-qt-5.15.patch" # bug 593848 ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: 6dff1cd4a0a7b7a3b0b38af9ff5be803b2abccc1 Author: Sam James gentoo org> AuthorDate: Wed Jun 2 21:28:35 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jun 2 21:50:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dff1cd4 sci-visualization/kst: subscribe to sci-libs/gsl subslot Signed-off-by: Sam James gentoo.org> sci-visualization/kst/{kst-2.0.8.ebuild => kst-2.0.8-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8-r1.ebuild similarity index 95% rename from sci-visualization/kst/kst-2.0.8.ebuild rename to sci-visualization/kst/kst-2.0.8-r1.ebuild index d5cfd61e367..148390c6c26 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,7 +30,7 @@ RDEPEND=" dev-qt/qtxml:5 sci-libs/cfitsio sci-libs/getdata - sci-libs/gsl + sci-libs/gsl:= sci-libs/netcdf-cxx:3 " DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: 6ecbac744f236426308e25eca7fb7207a9a766f2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 5 17:41:58 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 5 17:42:21 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ecbac74 sci-visualization/kst: Add missing DEPEND Closes: https://bugs.gentoo.org/664798 Package-Manager: Portage-2.3.49, Repoman-2.3.10 sci-visualization/kst/kst-2.0.8.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index 6f068a906ed..d5cfd61e367 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -34,6 +34,7 @@ RDEPEND=" sci-libs/netcdf-cxx:3 " DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) "
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: 5a70b639ba64b3645d04d1947ddd30a8bf67b3b0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 26 18:21:49 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 26 18:23:50 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a70b639 sci-visualization/kst: Run xdg_desktop_database_update Package-Manager: Portage-2.3.48, Repoman-2.3.10 sci-visualization/kst/kst-2.0.8.ebuild | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index 6b0ac253117..6f068a906ed 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit cmake-utils +inherit cmake-utils xdg-utils MY_P=Kst-${PV} @@ -60,3 +60,11 @@ src_configure() { cmake-utils_src_configure } + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
commit: 901e0196c41d8c1b57e327370c6f9bbeba4d309f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 26 17:37:17 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 26 18:23:49 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=901e0196 sci-visualization/kst: Fix build with Qt 5.11 Closes: https://bugs.gentoo.org/664532 Package-Manager: Portage-2.3.48, Repoman-2.3.10 .../kst/files/kst-2.0.8-qt-5.11.patch | 46 ++ .../kst/files/kst-2.0.8-qt-5.11b3.patch| 25 sci-visualization/kst/kst-2.0.8.ebuild | 2 +- 3 files changed, 47 insertions(+), 26 deletions(-) diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch new file mode 100644 index 000..8409f6664d7 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-qt-5.11.patch @@ -0,0 +1,46 @@ +From 9fc5140791ec00d6df2d65973f3ca61df17b1d47 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Sun, 3 Jun 2018 19:43:34 +0200 +Subject: Fix build with Qt 5.11 + +Summary: +- qt5_use_modules was removed in Qt 5.11. use target_link_libraries instead. +- Add a missing #include + +Subscribers: kde-edu + +Tags: #kde_edu + +Differential Revision: https://phabricator.kde.org/D13339 +--- + cmake/modules/KstMacros.cmake | 2 +- + src/libkstapp/view.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake +index 4ff9c15..bc3d8a6 100644 +--- a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake +@@ -240,7 +240,7 @@ endmacro() + macro(kst_link) + target_link_libraries(${kst_name} ${ARGV}) + if(kst_qt5) +- qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport) ++ target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport) + else() + target_link_libraries(${kst_name} + ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY}) +diff --git a/src/libkstapp/view.h b/src/libkstapp/view.h +index 95c8c6a..2af5393 100644 +--- a/src/libkstapp/view.h b/src/libkstapp/view.h +@@ -14,6 +14,7 @@ + #define VIEW_H + + #include ++#include + + #include "kst_export.h" + +-- +cgit v0.11.2 diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch deleted file mode 100644 index b211e1ed21e..000 --- a/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 91867d80df4fe8f26c9adbfe10c1c883ccb36697 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Tue, 12 Jun 2018 08:57:08 +0200 -Subject: [PATCH] Fix configure with Qt-5.11.0_beta3 (no more qt5_use_modules) - - cmake/modules/KstMacros.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake -index 676d5731..95848f20 100644 a/cmake/modules/KstMacros.cmake -+++ b/cmake/modules/KstMacros.cmake -@@ -240,7 +240,7 @@ endmacro() - macro(kst_link) - target_link_libraries(${kst_name} ${ARGV}) - if(kst_qt5) -- qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport) -+ target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport) - else() - target_link_libraries(${kst_name} - ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY}) --- -2.17.1 - diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index 1ea474c0cee..d8c58992ca3 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -43,7 +43,7 @@ DOCS=( AUTHORS README.kstScript ) PATCHES=( "${FILESDIR}/${P}-includes.patch" - "${FILESDIR}/${P}-qt-5.11b3.patch" + "${FILESDIR}/${P}-qt-5.11.patch" ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
commit: e1b28544fe15ec757bae3c1708660bb94a4432a0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 26 18:07:50 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 26 18:23:49 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b28544 sci-visualization/kst: Fix build with sci-libs/gsl-2 Closes: https://bugs.gentoo.org/574746 Package-Manager: Portage-2.3.48, Repoman-2.3.10 .../kst/files/kst-2.0.8-gsl-2.0.patch | 30 ++ sci-visualization/kst/kst-2.0.8.ebuild | 1 + 2 files changed, 31 insertions(+) diff --git a/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch b/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch new file mode 100644 index 000..c49ba2e20bc --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch @@ -0,0 +1,30 @@ +Patch kindly borrowed from Debian. +Gentoo-bug: https://bugs.gentoo.org/574746 +KDE-bug: https://bugs.kde.org/show_bug.cgi?id=355324 + +--- a/src/plugins/fits/non_linear.h b/src/plugins/fits/non_linear.h +@@ -177,7 +177,9 @@ bool kstfit_nonlinear( + } + iIterations++; + } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (pSolver, J); ++ gsl_multifit_covar (J, 0.0, pMatrixCovariance); + + // + // determine the fitted values... +--- a/src/plugins/fits/non_linear_weighted.h b/src/plugins/fits/non_linear_weighted.h +@@ -193,7 +193,9 @@ bool kstfit_nonlinear_weighted( + } + while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); + +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (pSolver, J); ++ gsl_multifit_covar (J, 0.0, pMatrixCovariance); + + // + // determine the fitted values... diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index d8c58992ca3..6b0ac253117 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -44,6 +44,7 @@ DOCS=( AUTHORS README.kstScript ) PATCHES=( "${FILESDIR}/${P}-includes.patch" "${FILESDIR}/${P}-qt-5.11.patch" + "${FILESDIR}/${P}-gsl-2.0.patch" ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/
commit: 10b8466f663b78d2dcbbe012310db237c2b8d7ee Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 12 07:04:55 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 12 07:16:46 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10b8466f sci-visualization/kst: Fix build with Qt-5.11.0_beta3 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../kst/files/kst-2.0.8-qt-5.11b3.patch| 25 ++ sci-visualization/kst/kst-2.0.8.ebuild | 8 +-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch new file mode 100644 index 000..b211e1ed21e --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-qt-5.11b3.patch @@ -0,0 +1,25 @@ +From 91867d80df4fe8f26c9adbfe10c1c883ccb36697 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 12 Jun 2018 08:57:08 +0200 +Subject: [PATCH] Fix configure with Qt-5.11.0_beta3 (no more qt5_use_modules) + +--- + cmake/modules/KstMacros.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake +index 676d5731..95848f20 100644 +--- a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake +@@ -240,7 +240,7 @@ endmacro() + macro(kst_link) + target_link_libraries(${kst_name} ${ARGV}) + if(kst_qt5) +- qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport) ++ target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport) + else() + target_link_libraries(${kst_name} + ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY}) +-- +2.17.1 + diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index 408da47f298..9d4e9bb326f 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -40,7 +40,11 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} DOCS=( AUTHORS README.kstScript ) -PATCHES=( "${FILESDIR}/${P}-includes.patch" ) + +PATCHES=( + "${FILESDIR}/${P}-includes.patch" + "${FILESDIR}/${P}-qt-5.11b3.patch" +) src_configure() { local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: c5d274282a8e9c2a12ce6c9ea90b51e3547edafe Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 12 07:07:14 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 12 07:16:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d27428 sci-visualization/kst: EAPI-6 bump Package-Manager: Portage-2.3.40, Repoman-2.3.9 sci-visualization/kst/kst-2.0.8.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index 9d4e9bb326f..1ea474c0cee 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit cmake-utils multilib +inherit cmake-utils MY_P=Kst-${PV} @@ -54,7 +54,7 @@ src_configure() { -Dkst_release=$(usex debug OFF ON) -Dkst_rpath=OFF -Dkst_svnversion=OFF - $(cmake-utils_use test kst_test) + -Dkst_test=$(usex test) ) cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: f933839581a7e975affe56973e362020029ac5c7 Author: Michael Palimaka gentoo org> AuthorDate: Sun Sep 24 06:27:10 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Sep 24 06:27:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9338395 sci-visualization/kst: drop qt4 support Package-Manager: Portage-2.3.8, Repoman-2.3.3 sci-visualization/kst/kst-2.0.8.ebuild | 42 -- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index b5c0423a6d0..408da47f298 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit cmake-utils multilib qmake-utils +inherit cmake-utils multilib MY_P=Kst-${PV} @@ -14,39 +14,27 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2 LGPL-2 FDL-1.2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug qt5 test" +IUSE="debug test" RESTRICT="test" RDEPEND=" - !qt5? ( - dev-qt/designer:4 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qtsvg:4 - ) - qt5? ( - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 sci-libs/cfitsio sci-libs/getdata sci-libs/gsl sci-libs/netcdf-cxx:3 " DEPEND="${RDEPEND} - test? ( - !qt5? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) + test? ( dev-qt/qttest:5 ) " S=${WORKDIR}/${MY_P} @@ -58,14 +46,12 @@ src_configure() { local mycmakeargs=( -Dkst_install_libdir="$(get_libdir)" -Dkst_pch=OFF + -Dkst_qt5=ON -Dkst_release=$(usex debug OFF ON) -Dkst_rpath=OFF -Dkst_svnversion=OFF $(cmake-utils_use test kst_test) - $(cmake-utils_use qt5 kst_qt5) ) - use !qt5 && mycmakeargs+=( -DQT_LCONVERT_EXECUTABLE="$(qt4_get_bindir)/lconvert" ) - cmake-utils_src_configure }
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: e3b9196e5d19db1770bfec45c753608df2447675 Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 14 20:27:37 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 14 20:45:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9196e sci-visualization/kst: avoid REQUIRED_USE for Qt version selection Package-Manager: portage-2.3.0 sci-visualization/kst/kst-2.0.8.ebuild | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index 7a79231..4b0c98e 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,14 +15,12 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2 LGPL-2 FDL-1.2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug +qt4 qt5 test" - -REQUIRED_USE="^^ ( qt4 qt5 )" +IUSE="debug qt5 test" RESTRICT="test" RDEPEND=" - qt4? ( + !qt5? ( dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 @@ -46,7 +44,10 @@ RDEPEND=" sci-libs/netcdf-cxx:3 " DEPEND="${RDEPEND} - test? ( dev-qt/qttest:4 ) + test? ( + !qt5? ( dev-qt/qttest:4 ) + qt5? ( dev-qt/qttest:5 ) + ) " S=${WORKDIR}/${MY_P}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/files/, sci-visualization/kst/
commit: 4b5177e5aed652c708c074cf08c002ce27862474 Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 14 20:45:03 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 14 20:45:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5177e5 sci-visualization/kst: add patch to fix build failure with USE="qt5" Gentoo-bug: 587948 Package-Manager: portage-2.3.0 .../kst/files/kst-2.0.8-includes.patch | 25 ++ sci-visualization/kst/kst-2.0.8.ebuild | 1 + 2 files changed, 26 insertions(+) diff --git a/sci-visualization/kst/files/kst-2.0.8-includes.patch b/sci-visualization/kst/files/kst-2.0.8-includes.patch new file mode 100644 index ..113d9dc --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-includes.patch @@ -0,0 +1,25 @@ +Add missing includes required for Qt 5 build to succeed. + +Author: David Carne+Gentoo-bug: 587948 + +--- a/src/libkst/editablematrix.cpp b/src/libkst/editablematrix.cpp +@@ -19,6 +19,7 @@ + #include "debug.h" + #include + #include ++#include + + namespace Kst { + +--- a/src/libkst/editablevector.cpp b/src/libkst/editablevector.cpp +@@ -18,6 +18,7 @@ + // Create QDataStream into a QByteArray + // qCompress the bytearray + #include ++#include + + #include "debug.h" + namespace Kst { diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index 5d2eafa..2d368b8 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -53,6 +53,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} DOCS=( AUTHORS README.kstScript ) +PATCHES=( "${FILESDIR}/${P}-includes.patch" ) src_configure() { local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: 450fa6ae2e505c86840ba8c375434e55982f7bf3 Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 14 20:28:52 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 14 20:45:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=450fa6ae sci-visualization/kst: ensure the correct version of lconvert is used Package-Manager: portage-2.3.0 sci-visualization/kst/kst-2.0.8.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index 4b0c98e..5d2eafa 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-utils multilib +inherit cmake-utils multilib qmake-utils MY_P=Kst-${PV} @@ -64,5 +64,8 @@ src_configure() { $(cmake-utils_use test kst_test) $(cmake-utils_use qt5 kst_qt5) ) + + use !qt5 && mycmakeargs+=( -DQT_LCONVERT_EXECUTABLE="$(qt4_get_bindir)/lconvert" ) + cmake-utils_src_configure }
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/
commit: f27065c8b250ca8093f6cf9ec5c7d95ddc5815ee Author: Michael Palimaka gentoo org> AuthorDate: Wed Jun 29 18:41:20 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Jun 29 19:13:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27065c8 sci-visualization/kst: metadata whitespace Package-Manager: portage-2.3.0 sci-visualization/kst/metadata.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sci-visualization/kst/metadata.xml b/sci-visualization/kst/metadata.xml index 57fbf96..9f73ea7 100644 --- a/sci-visualization/kst/metadata.xml +++ b/sci-visualization/kst/metadata.xml @@ -1,12 +1,12 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -q...@gentoo.org -Gentoo Qt Project - - -kst -https://bugs.kde.org/ - + + q...@gentoo.org + Gentoo Qt Project + + + kst + https://bugs.kde.org/ +
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/kst/, sci-visualization/kst/files/
commit: 538037ef92741fc230242aa481cd198f737786da Author: Michael Palimaka gentoo org> AuthorDate: Sat Oct 31 15:56:17 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Oct 31 15:57:12 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538037ef sci-visualization/kst: remove old Package-Manager: portage-2.2.20.1 sci-visualization/kst/Manifest | 1 - .../kst/files/kst-2.0.7-cfitsio-includes.patch | 26 - sci-visualization/kst/kst-2.0.7.ebuild | 65 -- 3 files changed, 92 deletions(-) diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest index ecba356..61fb665 100644 --- a/sci-visualization/kst/Manifest +++ b/sci-visualization/kst/Manifest @@ -1,2 +1 @@ -DIST Kst-2.0.7.tar.gz 11706657 SHA256 0ef0e1e85fa90472447eb53ee560970635532d2013d200d99ebdd105bd2eecee SHA512 d68968b9d161b74c42da87a3e5d9a2ade14e4c13e61526a0ef1e53538334b806d7f28ce3717e5a8ff85802b94aa2d7551422b873df5f180782994409ebc7ce17 WHIRLPOOL 654e054ceee5bb40de3a07d1a073c7192902616b018d355faa53770ed965eaf2dc83447f828af323401099a419ba2bfabfaacf77053e2ed4c79c123586683d3d DIST Kst-2.0.8.tar.gz 14527129 SHA256 cefbfd3e3710771985e08f02a397ef8ab407168fa8415d2c3c5740c031af18c6 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb WHIRLPOOL d143cd2c88e7dcff1aeb53375272cf4b7a60f546a9c8dbd76bf8c9933575ab6fbb5f7e5f82f793dbde19d523af9314eeb8efecb8e82f30b3846ebf9d222d27d1 diff --git a/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch b/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch deleted file mode 100644 index 57238f8..000 --- a/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/datasources/lfiio/lfiio.h b/src/datasources/lfiio/lfiio.h -index bb6493c..8ed748c 100644 a/src/datasources/lfiio/lfiio.h -+++ b/src/datasources/lfiio/lfiio.h -@@ -18,7 +18,7 @@ - - #include - #include --#include -+#include - - class LFIIOSource : public Kst::DataSource { - Q_OBJECT -diff --git a/src/datasources/planckIDEF/planckIDEF.h b/src/datasources/planckIDEF/planckIDEF.h -index 7fb226f..6e6d82f 100644 a/src/datasources/planckIDEF/planckIDEF.h -+++ b/src/datasources/planckIDEF/planckIDEF.h -@@ -16,7 +16,7 @@ - - #include - #include --#include -+#include - - typedef struct { - QString file; diff --git a/sci-visualization/kst/kst-2.0.7.ebuild b/sci-visualization/kst/kst-2.0.7.ebuild deleted file mode 100644 index 8c1b5df..000 --- a/sci-visualization/kst/kst-2.0.7.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -CMAKE_USE_DIR=${S}/cmake -MY_PN="Kst" -inherit cmake-utils multilib - -DESCRIPTION="Fast real-time large-dataset viewing and plotting tool for KDE4" -HOMEPAGE="https://kst.kde.org/; -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="GPL-2 LGPL-2 FDL-1.2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +qt4 qt5 test" - -REQUIRED_USE="^^ ( qt4 qt5 )" - -RESTRICT="test" - -RDEPEND=" - qt4? ( - dev-qt/qtcore:4 - || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )