Version bump. Remove old.

Package-Manager: portage-2.1.13.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 71 insertions, 30 deletions

diff --git a/sci-visualization/kst/ChangeLog b/sci-visualization/kst/ChangeLog
index 5221782407f5..5c3991d232a9 100644
--- a/sci-visualization/kst/ChangeLog
+++ b/sci-visualization/kst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/kst
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/ChangeLog,v 1.12 2013/07/23 14:19:51 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/ChangeLog,v 1.13 2013/08/01 18:28:16 kensington Exp $
+
+*kst-2.0.7 (01 Aug 2013)
+
+  01 Aug 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/kst-2.0.7-cfitsio-includes.patch, +kst-2.0.7.ebuild, -kst-2.0.5.ebuild:
+  Version bump. Remove old.
 
   23 Jul 2013; Michael Palimaka <kensington@gentoo.org> kst-2.0.5.ebuild,
   kst-2.0.6.ebuild:
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index f98f52ac13e1..483de94196f6 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -2,20 +2,21 @@
 Hash: SHA256
 
 AUX kst-2.0.4-cfitsio-includes.patch 1122 SHA256 1fda4c767aa2979b69d40ad24420b81f0a1ce0e99552bd85427b640d73b1e305 SHA512 0b56a8d1d2ff97b41d57808eed954998be72f0a27daa153741a3a9ded86c25952908f6a2640b3a56ebcf729ec400604d3e72d64075c280612ee964707bbd6e47 WHIRLPOOL 095cd5d60e8a4ad65b5248b5c105832b0f48320537709f6a08e81677bdae8636c310bc269f66232a00b5e290e222faad0e747a25552ab2b56d2bd89ab9a49794
-DIST kst-2.0.5.tar.gz 11402684 SHA256 620104bd25ed404051ab5c81ca5f89a54d3b7155650450d0ae379a47bf506542 SHA512 7018d6e234babd0fbeb3b3c794df90cd54185e8f4012acdd2538fb7c1715179c38d1ee2947e9e7a95ba9ebac96f1ae6df72c5bb76728196aa0e6f2561a9293cb WHIRLPOOL 216e10935df5140ad35b227790f934cda0432f05d438a00718b4a93bbda5c096981e22fcb239f6e92461b485bd710edb17a6af5f3f693ea5e473852d4bab9bbc
+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.6.tar.gz 11388226 SHA256 7968e604a188065d02da48a9a971fb04afab4b4b5358315b09e66f3deab1b80f SHA512 c78201e13ad60235ce3dcd9ebe75cba9ae892b936081a7ecb74c2811459bc536b3d9d849d89c84f178238e229c7728e4defd270611f3205fcce9266f452e7f2b WHIRLPOOL 027cc3cc616faf0f854a8676dc71821def65632b23d4ca8464cc2e28fc3e5d8198b7be89ef39e590de9a0de552a16f4837fa56626b7272716c76b793a82d709a
-EBUILD kst-2.0.5.ebuild 1308 SHA256 f7c8fcb5e0feeb6ec3bd9bcb58d128594c929f226b6af406643b4e1f12ac5c57 SHA512 7ceffed02ea3a8f2221283660ec1ae363805028d7008ecbbce6e8beba7ee22c664976595c82152e1d17b844802b8da46d0054e9114bb5cc0789f73154d1ca2af WHIRLPOOL dd676f345c7789a210fe5da686f54b1a22140a6ef98d7e8ef5b461a1999a3a292e191f68215853e45ce065b8a74f94762e1c099a2676cb3121cbd9b505802e34
 EBUILD kst-2.0.6.ebuild 1308 SHA256 f2e2f7f41f0edd4eb964d8d7cb747b94ce8092e8e364240a724fc254e0a74219 SHA512 0da2f692aae2785e4a61edcd82a068bfaacf6a5d1d2c95d561471fa796fe2d5110ac3a86fe20e85a9154c9e9ac8b0d43c49f54a8eca0e0ca8734667a330195be WHIRLPOOL 3e67557fc1ef724b4c956a7739516b4fcaea4a28907000409f58a9f058a9ae55ab58916558fa2c2fccd8ef14e7c8f772707cc19939fb00a40d7ecbf979fdd2c9
-MISC ChangeLog 3076 SHA256 ac62f9980b149dc0bf1bba6f3f3f760e655601fffd932c103ec8a0ba8647ff24 SHA512 fe75d236a082a211226f261c25d3721ef1c271090091c615f499afcaafc9662275d64a5b405e80f2a45187f7d718b2f857622d5ba96b9028d03b57395ebff4b3 WHIRLPOOL fb166d40a53e25aef28e46f4613026f51679fd18a6ce670fb7fe4952a134c0af634706b80d98cd6ed213c597f7e1e79ad034b57df57c2f6ea47d5ed5bd1724e8
+EBUILD kst-2.0.7.ebuild 1437 SHA256 f76d4b0880485db4e15af2765b78397bcaca4cb794b2b196a64deb588a66018a SHA512 0ddfd364928009485b1b1eceb15d12ac4b261a6731a778798163e542e24d86c159dd7142190a0a8c6c578a4d080f7680e5f475f14f50016e99b2833b5e2a3b4d WHIRLPOOL 434bbabe44492cd867e17721b0bcf5262c81b5bc1c61fd18d932436152476dc17f711ce020a48ce6e8155e4a633f4003efbd4c39571fa6ec16c00ba4df797445
+MISC ChangeLog 3268 SHA256 c0b235c21b16953dfe257442df5e430fd816a2ba0758a869df204a2b5b408b27 SHA512 7d14059d3d12e080109f0f02a5a8fda8df5720f0307e2a41bc80cae022505c44ab3129a2fd474bd0d425af69730f6e79ec6508d685e0f7316cc6509a37ae1bcc WHIRLPOOL cb199db93af5bf71f0221c0669a5a9c7ee1e166e3744bf2d3f28a6ed4a170d6167ec782d9dc00786d508b7dcc5b0f1189fce795ff6a89d4e1a4bc5d25f242996
 MISC metadata.xml 271 SHA256 48a293e0754ad6ea6327ff2e8515908a9f1c27a79f2c549a1543c67803aa2307 SHA512 bfc883e5c5938366b5131c641f225852b06481c4a847ed2e2a62ae20b596cdffad75d3e59ed53ef1e786f650a235ce1022323f94f975c0c86bdaa01bfe4201b2 WHIRLPOOL e220d1bae14ac0211d2a42d607a76527fe9b62f70e2c306700be83b75a96fdec6b984720b04b9a968f5d3b6342cca3091f73703bbd46d0ba1af52fe648527f51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR7pCRAAoJEMbwO6tnXQ0stLAIAII9BnybYrVPc1KosYhoBmTj
-j9xjUdRPJ+Nhj51lyRoKqAE9h3BLBWscqmWmfuAWheJB+nJkXr8WidJ07maoAnPN
-iFYLKkECDh4yWwiBYeRabfuXUlYSquN9QL5PROFZiMZ8kQN/+wRSYujOcQ3Et465
-1wQvurMALZ8C8r520KcS0UYXC5j0aAF1MsGFeeSfr+SlTrJOtIpmVbUC0wiZUrzk
-CijgZJmZIrIx62vbCoAsHVMJ2lRTGMDbODi/8rLh1rt6VQFRJMhM5SmEumeEC+Tw
-bT6Ur5ERWr/GQzY2Q6vuWiLQj4q+Vaoeh1GjrVo3irjOgnrQfGVCPN/MTu7fBT0=
-=T3fO
+iQEcBAEBCAAGBQJR+qhDAAoJEMbwO6tnXQ0sbSkH/ROGvD0YjaL51Z5cGUWjyAfj
+ZzeJipbZRwohag4igVV5EVxZsyt6Rfflp31DsqiFhwyRw+ZCWS/61n8bKKvRptWT
+scCESsSs8DWUudOhUP+HQJOa6RhylSxEBocuwP30MFGIUz/8UexhgbNTdX0DmsWt
+fi6zSjCuf2xBNJp8JBCQIN136hGfU4P0WcirYGbjDLaRQYLfJOP4zkdbp3qr/v4Q
+23NvrA7TfTXc2S74av5NGH1po/eWyuCA1Ns7ZGfUY5W0d8lboBJ+zskTfZ16eX4N
+63Wx/2m8eUVZ7NxsaK47Hw7X03GzqqMrc3cE+t1BECXfLis9eQke39uzt4ildEU=
+=sw7x
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..57238f8964eb
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.7-cfitsio-includes.patch
@@ -0,0 +1,26 @@
+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.5.ebuild b/sci-visualization/kst/kst-2.0.7.ebuild
index a2655d491bfb..99485d4b7ec1 100644
--- a/sci-visualization/kst/kst-2.0.5.ebuild
+++ b/sci-visualization/kst/kst-2.0.7.ebuild
@@ -1,57 +1,65 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/kst-2.0.5.ebuild,v 1.5 2013/07/23 14:19:51 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/kst-2.0.7.ebuild,v 1.1 2013/08/01 18:28:16 kensington Exp $
 
 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="http://kst.kde.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+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 test"
+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 ) <dev-qt/qtgui-4.8.5:4 )
+		dev-qt/qtopengl:4
+		dev-qt/qtsvg:4
+	)
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/designer: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]
-	dev-qt/qtcore:4
-	|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-	dev-qt/qtopengl:4
-	dev-qt/qtsvg:4
 "
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:4 )
 "
 
 DOCS=( AUTHORS ChangeLog )
-PATCHES=( "${FILESDIR}/${PN}-2.0.4-cfitsio-includes.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix desktop file
-	sed -i -e 's/^Categories=/&Education;/' \
-		-e '/^Encoding=/d' \
-		src/kst/kst2.desktop || die
-}
+PATCHES=( "${FILESDIR}/${PN}-2.0.7-cfitsio-includes.patch" )
 
 src_configure() {
 	local mycmakeargs=(
 		-Dkst_install_libdir=$(get_libdir)
 		-Dkst_pch=OFF
-		-Dkst_release=$(use debug && echo OFF || echo 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)
 	)
 	cmake-utils_src_configure
 }