gentoo resync : 29.08.2018

5 files changed, 90 insertions, 29 deletions

diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index c599a2fd3803..2f5f03eafef1 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1,5 +1,6 @@
+AUX kst-2.0.8-gsl-2.0.patch 1253 BLAKE2B 7663fbb426f224924885554ae22517afc3d8510818e08fa9baee36daef878af4ec70ef649fa2dcb37ec47510181c40c52e10059f215cb993957cb10b50974117 SHA512 fb1495e91cc85b90b6971b27e587d07e4197c4973f75a5320cccb2938db8eec00fa0c85f44b240ca2e916b48983448c344a7c1449d99c16eba5edbbe0e6d0963
 AUX kst-2.0.8-includes.patch 581 BLAKE2B f0c631be82fbad4a816938311accdfe8474e0b80241af677a26d46d3f7d0d15130c1d18c0a6aeb7443d4bd2f368a8cfe4634efb6b4ac7b6198f32b4b005c869c SHA512 d4b0f764beff6c8f9e8d64a5152153d1d9ddc72da029f5e10b83865e2f9aa94ae59eb1678b33f653ac06b38086b5bb03aa172c79cedbe562c0f1b9c872e124a4
-AUX kst-2.0.8-qt-5.11b3.patch 934 BLAKE2B 769c2ce96b334605b5452ff3f29696a7bad8ad47d46ac8d1107d4d262c3ad025a075636ba4029d9e1dcfb8dc6e356d8f23d32ac90c9402fac59e1dbfd5a04449 SHA512 4d2777210cf08bd0fbc8e533c1e890b42570e65b1cb10aaaeafb70ba5ed931086740f1b4d35af0950c10db249a6df1b4d2c6fa8348d7020bd51053bf4608f048
+AUX kst-2.0.8-qt-5.11.patch 1389 BLAKE2B 99a879ddecec135d1f1bf6da52a8410127e9a6f590f5fb6aac135258c58f3091618b928de0773fd5899d833a8d9d11ee971a3b3b1b5d85c204234fb61b31e6de SHA512 b5a38b941d40df6c5327125883a1cad27e545cf9df375d09fe4ad542e5dd104fb42859f479485df1b1bff2b6dcd6765699bd7c665d475769aea39e9e85aa1040
 DIST Kst-2.0.8.tar.gz 14527129 BLAKE2B 5330dc97bc56bf8c6120a461e078ed1bdf87c4ec41b6f6ddc13d7500fde0d1b973b42da8f38c738d133559696d89ad579c288206c7ba07bbfd22dbc2bf6f2064 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb
-EBUILD kst-2.0.8.ebuild 1102 BLAKE2B 2fb39560721040993cc14f99d6ef8074c7e4844686798f75389826685e1d42b41b6855970b299e8f9294038fb9d30b30bec5471b9db2b7ae9e28a0c58415ee75 SHA512 28cd732e1f1a3b70a48ab0f5d3fe551972c28ff50ca5c54f658ea3de9da29123f47f8e45c75a64d84e5d31fb636254dc192af2b57d159a915544ec3c6d8116fe
+EBUILD kst-2.0.8.ebuild 1240 BLAKE2B 726a847d8cc8e91ef3fef2a4779fc306915effd95492d4ab435d3c9622090c54a60f9763f5d009de2f7df28a6e37932ef06a3f380f109f1bd8acee02af3be031 SHA512 903985410c12e1dede2c3e0b391955deaf4dbd6cdb93c024e309dea89f48e58a8420200ac1caa485297a26476df6ef00241018f13c0c1c8ef25adc52eb81e713
 MISC metadata.xml 364 BLAKE2B 921c6ea44760ec3694ea9565aba0707f9b4d3e18cbd5fc9c523f1031e47dced5f96da57f1e24d68a0e5f3f7c4e1ea49a8c327c5a591928be77777a9248b8e3c1 SHA512 46ab4c2f002b9b516a49e8c678740344b3cdb79ce92ada0b22ee205fe17b54a804fcc520ae517bfc2f420870eaa28c40043007e54c4b55506e8edcdf7f958e66
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 000000000000..c49ba2e20bca
--- /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/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 000000000000..8409f6664d73
--- /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 <christophe@krop.fr>
+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 <QGraphicsView>
++#include <QMenu>
+ 
+ #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 b211e1ed21ee..000000000000
--- 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 <asturm@gentoo.org>
-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 1ea474c0cee9..6f068a906ed2 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}
 
@@ -43,7 +43,8 @@ DOCS=( AUTHORS README.kstScript )
 
 PATCHES=(
 	"${FILESDIR}/${P}-includes.patch"
-	"${FILESDIR}/${P}-qt-5.11b3.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-gsl-2.0.patch"
 )
 
 src_configure() {
@@ -59,3 +60,11 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}