Version bump wrt bug 541692. Also fixes bug 510152.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

4 files changed, 93 insertions, 58 deletions

diff --git a/sci-visualization/kst/ChangeLog b/sci-visualization/kst/ChangeLog
index 5fbef1f65172..ba6c2eaaf3b0 100644
--- a/sci-visualization/kst/ChangeLog
+++ b/sci-visualization/kst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/kst
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/ChangeLog,v 1.15 2015/03/01 13:17:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/ChangeLog,v 1.16 2015/04/10 15:23:54 pesa Exp $
+
+*kst-2.0.8 (10 Apr 2015)
+
+  10 Apr 2015; Davide Pesavento <pesa@gentoo.org> +kst-2.0.8.ebuild,
+  -files/kst-2.0.4-cfitsio-includes.patch:
+  Version bump wrt bug 541692. Also fixes bug 510152.
 
   01 Mar 2015; Michał Górny <mgorny@gentoo.org> -kst-2.0.6.ebuild:
   Remove old version with non-solvable deps.
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index 4db86ba1f716..0bc0246a36fc 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX kst-2.0.4-cfitsio-includes.patch 1122 SHA256 1fda4c767aa2979b69d40ad24420b81f0a1ce0e99552bd85427b640d73b1e305 SHA512 0b56a8d1d2ff97b41d57808eed954998be72f0a27daa153741a3a9ded86c25952908f6a2640b3a56ebcf729ec400604d3e72d64075c280612ee964707bbd6e47 WHIRLPOOL 095cd5d60e8a4ad65b5248b5c105832b0f48320537709f6a08e81677bdae8636c310bc269f66232a00b5e290e222faad0e747a25552ab2b56d2bd89ab9a49794
 AUX kst-2.0.7-cfitsio-includes.patch 739 SHA256 521a864806e80da926a5593ea55ea30608b5c8303a4a8a8903139d1f74e48251 SHA512 1bf24b9cc96b773f644ad7386f1c45ba79b9494b756349882d777f627a07aa6b8dabf6e77cf3f232645eecf032dd070157f9cc35f4ca9386e143ce3becb300ef WHIRLPOOL 8df62079df457f385771c9926954dcc2e56bf2d24c61ce47647b75471be4c1e09eed68a4c73a52e8d064365481e01d3bf3b306d5856d82612ee83d3b1c677f7f
 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
 EBUILD kst-2.0.7.ebuild 1432 SHA256 0cbb8e3386e8149d8d931729dad4ae5810e4c2c1393eac9dbeed0905e8671812 SHA512 aec97e4366fa623f1174705ab9e4022ee6977d290c4aa8cc52c89dfc089e3a08b4a16b282a3aa0ac49697f6075bf01663dd907ab3619e1bd4eb8f036d1d549e1 WHIRLPOOL 9871d658d3fd75b0e72ffa7d8efde1a059b3fa33145955f2ebb7dacd8a68c326ae41515b1355aee80c269602e77a4818ce3f54fc9983a38af7f342884fc77534
-MISC ChangeLog 3477 SHA256 fee73034db5626e2df03702159dcb03b43c1bccbefb60ba1cc6e3984bdea4acf SHA512 47124701f85aab2741ec6b71aefa43907fdaaf2553b9a9aacedaddffda5643b3924e7d615dcce04a539ea06b2e5aedfee370798c512d52381fe2f1e9eb713c1c WHIRLPOOL 3484aa0e91337093404340344930eeaa689b8f0a20433e5d264203addb948b9de759ea860833c9569a7cc09e0496fe435ac509a6dcad0494784e595ec8d7f904
+EBUILD kst-2.0.8.ebuild 1326 SHA256 69ffd60303f87edd790290b3408237e3d33fe0c92148456d5685223dc26a5657 SHA512 0496baf96591288fd3991436e1cf32449d4a8428070f486792efb19aa42218e952f60b5fa1399a9725b187dc62505abcec1168da4e11ae90d682eb39cf082106 WHIRLPOOL 1b28a390048cae300f4879b469dcfe87968fbf46cd132a2ad22cb53ce0b450e93f2b8336631da2198df6585cba793a6992292c1c755128673c56fa5f0ac9565c
+MISC ChangeLog 3668 SHA256 095d4e49678fcb3e9e622712033ccc3b9a75bc4296839c969317c9c86d9b795f SHA512 eebe3ef0fad8db058a7b113b8f30e1eac490e27d2669a7dec227e20683e64401395e1ba9f0892994d2d9f3e27bd300fa9ff037722faf1c2ec8c6b879bd7fe809 WHIRLPOOL 65d89083a93ac4bd41e3094321bea955b4ae657fa67a1f262fe0310a4d61879ccc3c27e40730dfa559e77b2093fb4d757285b052850de52cfa1f8f1adc7bc9f5
 MISC metadata.xml 278 SHA256 a8054ffd33c6f0e5add1ed8e3add9386f77282fac84bcd23f841fb22f07d83d1 SHA512 13b02b3ea5a141443ca2d8dc25335e1ef85c230dbb1d3366c9caa74fcef352347399edfc22c7475fdcd5464592172980e4cbffc9c891d38548a7b210c8c1e8ed WHIRLPOOL bcb515247f7861c9adc8beddf6a242a21bea98ca37c7e20d48dbf8019b37ff7afc1c4cbe53c022b8af0b1566a92bb110d4dc9b799f7dc1fc1367f059e47a73ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU8xFcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOGcP+QGiw6aabG+LiXnsUAWscnSc
-wJl1XGqXUc+CZxfrRRFrVBqpvbevsvv7+62FPu3xxH5R2gp8ti9iADFbdmnzeJGT
-n9RulwpgmOl7k0tL1+OV2nATnuqIJRkvzaq52UttpCk7wEg8MKvA3EIrHdd7apU3
-tT4I1nLzBAGHMk0FWFM2TZbZKSvw414UbnKZgJonSJGsRRJEV9ehY/UrHdPZz/xt
-L1/Yx7cOn4O1BMgIpt1QXMgde4VE+L/4qO/N3PGbJ+7aEbJGIMGEAT0iJ3RYb87t
-KXeCc+9s6Dijef6hMJwtVogqqhTxsdLpgsOZA7MPUy1TQHWLVZnJU2J0ew7DX9nB
-FXuP7E6DthhRapoII+6e/nv8iJcsGKOni2pbx3ZayY7jreCQ207+AtbjJdR3pQnh
-B7b36Ww4OnPkPsXpS+CLIyThsygZXJiaBKiwaqedvcGFObXXGWZLsmez6Iv8QPLh
-g06kwo8yVChDSWW9UiI9gDjS1NwcBrgDuAmEgOLdAT8MxUN4tDJtgAQBy9hYSJwQ
-zATVMDjFp+Wheg6+p7xG5eGUIj+xkStCAuSNUz5wJgtHh1+TwAaNNIVKOmLkAzBp
-3x5KV9zFr+5mhxO9iR++iI9eu0PlrVkldqzeI5s8Gr7j8BTH00X1kdyhk54Po86j
-5c7BKg/AaKKYr6ZXx6ft
-=r7HY
+iQJ8BAEBCABmBQJVJ+sSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9VxcP/1XkSdPo4HfD0TO3yyXBiAez
+CrEfWvos3JrhVxINeywa4AXCXdDsY6Z7YeCmCZjcfFdMQOhNZe3WkPtrYEqWJsXe
+ZDr16ZdNQVk4ZT/pEU5MzdXujbw3lTKe6rVJOOyLjUzpkf9UqY3tzGkm6h4mIDom
+FiMlLl7K5XliBE37WPnvCHLfBT1nS6rt1sfZDhQ01LFYV5Uv1E4n2pfwYaoJW0m6
+BxStK5vzDGdmDy3tIZ/BMYbsBbZTeV2ml93OYUQaDGKkv5w5ASIL8WveaNR+yTWd
+KAH8nlVzZy4L3D3isqJpJIQHdqD0IAZ0MWbXuEy4fsu3YeW/xOSuIdL32LDmVh8g
+8Lv5ctk93wkT4GECj4JEohA8JovXnxsV/WuttVFoV8sQijJ0IS+fISGwK5TVTTTP
+C1XBhhM5WmMF8tJqx9rPxKrBXw0pDbs8jkqTBWngFyHmKBFaFIvUinnzqsp+kzzm
+PweVT5het04z2IAjghuYKO8ddWJdYu1qp2nKmNqE09upVMEd9Zz58+m65j4I6XGY
+U9UCgsHpQNqcyylfM0S9GZsdrKzI1CprfiFrW7evdwvkU3V1Iz7d5mU3w+mDH1/i
+lSz0yIt42DWdWQyVAViHrqCYp0uUHQ2y6AW6GaaA5S//W/xyEp2VHd2zT5+bJp4U
+z1SJLN0/+74aIxke6k4u
+=G19K
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/kst/files/kst-2.0.4-cfitsio-includes.patch b/sci-visualization/kst/files/kst-2.0.4-cfitsio-includes.patch
deleted file mode 100644
index e9dfccf6683e..000000000000
--- a/sci-visualization/kst/files/kst-2.0.4-cfitsio-includes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/datasources/healpix/healpix_tools.h b/src/datasources/healpix/healpix_tools.h
-index 28ad906..420fc7f 100644
---- a/src/datasources/healpix/healpix_tools.h
-+++ b/src/datasources/healpix/healpix_tools.h
-@@ -19,7 +19,7 @@
- #define HEALPIX_TOOLS_H
- 
- #include <math.h>
--#include <libcfitsio0/fitsio.h>
-+#include <fitsio.h>
- #include <datasource.h>
- 
- #  ifdef HEALPIX_PI
-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 <datasource.h>
- #include <dataplugin.h>
--#include <libcfitsio0/fitsio.h>
-+#include <fitsio.h>
- 
- 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 <datasource.h>
- #include <dataplugin.h>
--#include <libcfitsio0/fitsio.h>
-+#include <fitsio.h>
- 
- typedef struct {
-   QString file;
diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild
new file mode 100644
index 000000000000..aa1dc9e5d081
--- /dev/null
+++ b/sci-visualization/kst/kst-2.0.8.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/kst-2.0.8.ebuild,v 1.1 2015/04/10 15:23:54 pesa Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+MY_P=Kst-${PV}
+
+DESCRIPTION="Fast real-time large-dataset viewing and plotting tool"
+HOMEPAGE="http://kst.kde.org/"
+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 )"
+
+RESTRICT="test"
+
+RDEPEND="
+	qt4? (
+		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
+	)
+	sci-libs/cfitsio
+	sci-libs/getdata
+	sci-libs/gsl
+	sci-libs/netcdf-cxx:3
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:4 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS README.kstScript )
+
+src_configure() {
+	local mycmakeargs=(
+		-Dkst_install_libdir="$(get_libdir)"
+		-Dkst_pch=OFF
+		-Dkst_release=$(usex debug OFF ON)
+		-Dkst_rpath=OFF
+		-Dkst_svnversion=OFF
+		$(cmake-utils_use test kst_test)
+		$(cmake-utils_use qt5 kst_qt5)
+	)
+	cmake-utils_src_configure
+}