Version bump. Remove old.

(Portage version: 2.1.13.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 60 insertions, 20 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/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
 }