Version bump, remove old.

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

4 files changed, 64 insertions, 119 deletions

diff --git a/sci-visualization/kst/ChangeLog b/sci-visualization/kst/ChangeLog
index c9fe23dda65d..2abbdd6250ee 100644
--- a/sci-visualization/kst/ChangeLog
+++ b/sci-visualization/kst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/kst
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/ChangeLog,v 1.5 2012/05/21 19:55:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/ChangeLog,v 1.6 2012/07/02 14:21:53 pesa Exp $
+
+*kst-2.0.5 (02 Jul 2012)
+
+  02 Jul 2012; Davide Pesavento <pesa@gentoo.org> +kst-2.0.5.ebuild,
+  -files/kst-cfitsio-includes.patch, -kst-2.0.0.ebuild:
+  Version bump, remove old.
 
   21 May 2012; Samuli Suominen <ssuominen@gentoo.org> kst-2.0.0.ebuild:
   inherit eutils for make_desktop_entry
@@ -54,4 +60,3 @@
   +metadata.xml:
   Initial commit of kst (bug #292902). Ebuild by Samuli Suominen
   (ssuominen@g.o), Markos Chandras (hwoarang@g.o) and me.
-
diff --git a/sci-visualization/kst/files/kst-cfitsio-includes.patch b/sci-visualization/kst/files/kst-cfitsio-includes.patch
deleted file mode 100644
index 5a49906d4e0b..000000000000
--- a/sci-visualization/kst/files/kst-cfitsio-includes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/src/datasources/fitsimage/fitsimage.h b/src/datasources/fitsimage/fitsimage.h
-index 6b6713a..f51fc47 100644
---- a/src/datasources/fitsimage/fitsimage.h
-+++ b/src/datasources/fitsimage/fitsimage.h
-@@ -15,7 +15,7 @@
- 
- #include <datasource.h>
- #include <dataplugin.h>
--#include <libcfitsio0/fitsio.h>
-+#include <fitsio.h>
- 
- class FitsImageSource : public Kst::DataSource {
-   Q_OBJECT
-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 809be40..207d083 100644
---- a/src/datasources/lfiio/lfiio.h
-+++ b/src/datasources/lfiio/lfiio.h
-@@ -15,7 +15,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 cce6a0d..d3087d0 100644
---- a/src/datasources/planckIDEF/planckIDEF.h
-+++ b/src/datasources/planckIDEF/planckIDEF.h
-@@ -15,7 +15,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.0.ebuild b/sci-visualization/kst/kst-2.0.0.ebuild
deleted file mode 100644
index 8c77b7963fb4..000000000000
--- a/sci-visualization/kst/kst-2.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/kst-2.0.0.ebuild,v 1.2 2012/05/21 19:55:15 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils qt4-r2 multilib
-
-MY_PN="${PN/k/K}"
-
-DESCRIPTION="Fast real-time large-dataset viewing and plotting tool for KDE4"
-HOMEPAGE="http://kst.kde.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_PN}%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-gui:4[debug?]
-	x11-libs/qt-opengl:4[debug?]
-	x11-libs/qt-qt3support:4[debug?]
-	x11-libs/qt-svg:4[debug?]
-	x11-libs/qt-xmlpatterns:4[debug?]
-	sci-libs/gsl
-	sci-libs/cfitsio
-	sci-libs/getdata"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-cfitsio-includes.patch" )
-
-src_prepare() {
-	qt4-r2_src_prepare
-	sed -e "s:\(INSTALL_DIR/\)lib:\1$(get_libdir):" \
-		-i src/libkst/libkst.pro src/libkstapp/libkstapp.pro \
-		src/libkstmath/libkstmath.pro || die "sed libdir failed"
-
-	sed -e "s:\(INSTALL_DIR/\)plugin:\1$(get_libdir)/kst/plugins:" \
-		-i dataobjectplugin.pri datasourceplugin.pri src/widgets/widgets.pro \
-		|| die "sed plugins install path failed"
-
-	sed -e "s!QLibraryInfo::location(QLibraryInfo::PluginsPath)!\"/usr/$(get_libdir)/kst/plugins\"!" \
-		-i src/libkst/datasource.cpp src/libkstmath/dataobject.cpp \
-		|| die "sed plugins search path failed"
-
-	# libkstwidgets is a Qt Designer plugin but they link against it (!!!)
-	# so either we keep it in plugins dir and set the rpath, or move to
-	# lib dir and add a SONAME. Currently the first solution is in use.
-	sed -e "s!\(QMAKE_RPATHDIR += \).*!\1/usr/$(get_libdir)/kst/plugins!" \
-		-i kst.pri src/d2asc/d2asc.pro src/d2d/d2d.pro \
-		|| die "sed rpath failed"
-}
-
-src_configure() {
-	export INSTALL_LIBDIR="$(get_libdir)"
-	eqmake4
-}
-
-src_install() {
-	qt4-r2_src_install
-	doicon src/images/${PN}.png
-	make_desktop_entry "${PN}2" ${PN} ${PN} \
-		"Qt;Graphics;DataVisualization" || die "make_desktop_entry failed"
-	dodoc AUTHORS ChangeLog NEWS README RELEASE.NOTES || die "dodoc failed"
-}
diff --git a/sci-visualization/kst/kst-2.0.5.ebuild b/sci-visualization/kst/kst-2.0.5.ebuild
new file mode 100644
index 000000000000..0de990bf1fae
--- /dev/null
+++ b/sci-visualization/kst/kst-2.0.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 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.1 2012/07/02 14:21:53 pesa Exp $
+
+EAPI=4
+
+CMAKE_USE_DIR=${S}/cmake
+
+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"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+RESTRICT="test"
+
+RDEPEND="
+	sci-libs/cfitsio
+	sci-libs/getdata
+	sci-libs/gsl
+	sci-libs/netcdf[cxx]
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-svg:4
+"
+DEPEND="${RDEPEND}
+	test? ( x11-libs/qt-test:4 )
+"
+
+DOCS=( AUTHORS ChangeLog )
+PATCHES=( "${FILESDIR}/${PN}-2.0.4-cfitsio-includes.patch" )
+
+src_prepare() {
+	base_src_prepare
+
+	# fix desktop file
+	sed -i -e 's/^Categories=/&Education;/' \
+		-e '/^Encoding=/d' \
+		src/kst/kst2.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dkst_install_libdir=$(get_libdir)
+		-Dkst_pch=OFF
+		-Dkst_release=$(use debug && echo OFF || echo ON)
+		-Dkst_rpath=OFF
+		-Dkst_svnversion=OFF
+		$(cmake-utils_use test kst_test)
+	)
+	cmake-utils_src_configure
+}