Version bump, remove old.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

5 files changed, 81 insertions, 131 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/Manifest b/sci-visualization/kst/Manifest
index 447e02f96c32..5083658c6abb 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1,22 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX kst-2.0.4-cfitsio-includes.patch 1122 RMD160 01b4a42a21c0b1efb04c2aba9c44f69230a21ee9 SHA1 ed5bca9a4b8db8f2c5f2d6a9602ae291aaed95a4 SHA256 1fda4c767aa2979b69d40ad24420b81f0a1ce0e99552bd85427b640d73b1e305
-AUX kst-cfitsio-includes.patch 1519 RMD160 733af09e87fa6fce447cdb49f8909c2fa373b552 SHA1 93a089e591effe24e719f2ed6929852baa483154 SHA256 0d71cbf22272115323a24251170d362bf750ea664621cbc408f2463f8ccd48e9
-DIST kst-2.0.0.tar.gz 10270708 RMD160 b8b74bf8e22a80cd9133fd28224f77ec8b60decb SHA1 76742eb3fd81f68148449fa84abc8dc3139be720 SHA256 6f3e639b87cc21c3ddc8891aa91ee713c6b750cd9fafc945fb97acc1a8fe0c7c
 DIST kst-2.0.4.tar.gz 10836992 RMD160 cbe28bd4f9e78cda59f32cdc5e4739effcec7134 SHA1 91a817565f3858f40b5498d88e6e65d40d7bfb00 SHA256 026774411ce919de6831139c378f632b2493bc31c39f901f5f4da712eb538da3
-EBUILD kst-2.0.0.ebuild 2111 RMD160 b522d29e32d26adfb35da4c3fb3fe59f4f370abe SHA1 d44acd369a727679dd91ab54bb99cc2a56deb80d SHA256 454116d3e476534362927f30f467cf856831034ad05933400c487fde563b47e9
+DIST kst-2.0.5.tar.gz 11402684 RMD160 9dff1a74732df2bf5cf5bdb67622b3c71582187e SHA1 aba9070a99fad7727ee58dad872a5f09b46b3840 SHA256 620104bd25ed404051ab5c81ca5f89a54d3b7155650450d0ae379a47bf506542
 EBUILD kst-2.0.4.ebuild 1244 RMD160 11f61068574c2f50e66aac7d4e1232e5f39b38f9 SHA1 7a04cd2208d1aceb9812b9d31c6aaedb59754549 SHA256 a5c60b3565cea9a5ba16975362eca16e0e0383102ad2362f66470e536866af61
-MISC ChangeLog 2132 RMD160 6dc9a4dbdb32aa9a96d16cf5fc841fcc3b9e50a2 SHA1 ea42b575dce103ac8f2872303f2b55f3f2a7c509 SHA256 de38c30547689728f0fa91541caf68829029c9cf2d2c751c868d0cf2dedaf388
+EBUILD kst-2.0.5.ebuild 1251 RMD160 38a4c1c50a650fd20c48d635dee9d95763ec8ccc SHA1 f4aac48432741dc20292e3ed4a5a7e012721e7d7 SHA256 c98e7c3400f3359637c4a472ba6c495f425f889dbb674f27a89c32ca1d9042cf
+MISC ChangeLog 2306 RMD160 46fddffb25c49e208f8c4c18f00b0c9d80c44594 SHA1 08c04cdb85b1f1437dc0df904a2f76c0aec12c96 SHA256 866c85089e4c10b88948c8c1c167f3ad99492939158cdb0b1a0981cd9cb3b6ce
 MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPupztAAoJEEdUh39IaPFNY1cH/Aq/abcnWx3GKWfwdmxVS8uk
-/solBa8DledCUpJSkGOBEkyHbIvAUNLUIywM/q/oraAOlfq2Vdj7zGP2YSZFm/a+
-pxC4ufc0wZz2IM7pf1jc4eg182Z1KdTVzbMGxavvNDK4pd8W8EV3MWPSsv7AukjL
-NBxrxVsIW8k6v0i0vxGpnadjupE1TTcIESvsm9V0jijdQvJoSiBjRMZibH3In83M
-q3+MUtTYKBGYbR5nbGFPWxmNMUIujgZS2v9lKJ4ZhIiFj5OAdman8TIZccAM9qvM
-Qh1Iy2fGO508mxCHl/YpttLAbtelGuR/f3iSb74yYKJIUdRqBI2iiZQzwX6TyLg=
-=eMfz
+iQIcBAEBCgAGBQJP8a6FAAoJENXLsxwXqFxyJdYP/ilGKJIKsZv+0IpFO1wkZExq
+Eh8p2cFwt1OR/t9oBKoRuVti8X9AWCW4cHqDEmYiezP3/yUo/R0PlEH7GzqhjwuN
+gR5QuRd9xVYodWBebyUoXPUtTSRgbRL3r4sW1dmvegdNCL1nbi5Tkds3U1gQ8IVv
+wCaf+iP1jNUaEOx58N2NBlE2pbs7Wr2JeOtDQUwKFRGbjiWtRxG/aTkLsmZoI3RO
+bC3Wsp0WphzgDXCJ+8abjG4Wa/BR+5WpkHH+vXiuJAuYWNLHBKg1vZ8mhoEgFdtp
+EJPGtU52pyLP9xJr4KCXS2ZhKBrIEKunQwDJZBJ6dmO8BVOUBTrv0s8BZ2F37CPA
+Lwzer8GFp7XQrVDbNNdh1o8ATCJdtufH36FFtAqDH7gtr9Nr83llJ0ftjKuVlCJT
+v471YG8DNNavrviFTzSBqCr+UXlIo1RduxhVL0kAt6eqDif7uqW5XKfqBQ+P2Rbx
+Qbezz9fbDJJ/RZtoxaoxP4SP9Y4UiV0ONg6aT4rpw1TA1eZd6jD/Vmv1iRrEuUuQ
+RQknB7A+vvvhZjdwoTptc6skmwOPmZjU0Wn/PlDM5eSjAkjSC0L3oRXA/9ZWz9Gp
+nNu86ZqzpZg37J9HU8BM1qMwjzTocFFoPz0qkzAdSBBmLDyDRjqEni/Vr3UlJh+s
+eQbmtPHl2mLNDGtQz+7Z
+=daev
 -----END PGP SIGNATURE-----
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
+}