Version bump, removing betas. Support for dirfile plugin through sci-libs/getdata. Thanks to Matěj Laitl <strohel@gmail.com> for updating the ebuild (bug #335019).

(Portage version: 2.2_rc81/cvs/Linux x86_64)

3 files changed, 13 insertions, 75 deletions

diff --git a/media-gfx/kst/ChangeLog b/media-gfx/kst/ChangeLog
index a9a6983a609b..757687dadbe7 100644
--- a/media-gfx/kst/ChangeLog
+++ b/media-gfx/kst/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/kst
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.31 2010/06/05 23:32:50 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.32 2010/09/13 16:27:48 ayoy Exp $
+
+*kst-2.0.0 (13 Sep 2010)
+
+  13 Sep 2010; Dominik Kapusta <ayoy@gentoo.org> -kst-2.0.0_beta2-r1.ebuild,
+  -kst-2.0.0_beta5-r1.ebuild, +kst-2.0.0.ebuild:
+  Version bump, removing betas. Support for dirfile plugin through
+  sci-libs/getdata. Thanks to Matěj Laitl <strohel@gmail.com> for updating
+  the ebuild (bug #335019).
 
 *kst-2.0.0_beta5-r1 (05 Jun 2010)
 
diff --git a/media-gfx/kst/kst-2.0.0_beta5-r1.ebuild b/media-gfx/kst/kst-2.0.0.ebuild
index f66a55e39fb1..cf0606788491 100644
--- a/media-gfx/kst/kst-2.0.0_beta5-r1.ebuild
+++ b/media-gfx/kst/kst-2.0.0.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-2.0.0_beta5-r1.ebuild,v 1.1 2010/06/05 23:32:50 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-2.0.0.ebuild,v 1.1 2010/09/13 16:27:48 ayoy Exp $
 
 EAPI=2
 
 inherit qt4-r2 multilib
 
-MY_PV="${PV/_/-}"
 MY_PN="${PN/k/K}"
-MY_P="${MY_PN}-${MY_PV}-sources"
 
 DESCRIPTION="Fast real-time large-dataset viewing and plotting tool for KDE4"
 HOMEPAGE="http://kst.kde.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/Kst%202.0.0%20Beta%205/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/project/${PN}/${MY_PN}%20${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.2"
 SLOT="0"
@@ -25,13 +23,12 @@ DEPEND="x11-libs/qt-gui:4[debug?]
 	x11-libs/qt-svg:4[debug?]
 	x11-libs/qt-xmlpatterns:4[debug?]
 	sci-libs/gsl
-	sci-libs/cfitsio"
+	sci-libs/cfitsio
+	sci-libs/getdata"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-cfitsio-includes.patch" )
 
-S="${WORKDIR}/${MY_PN}-2.0-beta5"
-
 src_prepare() {
 	qt4-r2_src_prepare
 	sed -e "s:\(INSTALL_DIR/\)lib:\1$(get_libdir):" \
diff --git a/media-gfx/kst/kst-2.0.0_beta2-r1.ebuild b/media-gfx/kst/kst-2.0.0_beta2-r1.ebuild
deleted file mode 100644
index 38056d393231..000000000000
--- a/media-gfx/kst/kst-2.0.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-2.0.0_beta2-r1.ebuild,v 1.3 2010/02/10 08:13:59 tove Exp $
-
-EAPI=2
-
-inherit qt4-r2 multilib
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Fast real-time large-dataset viewing and plotting tool for KDE4"
-HOMEPAGE="http://kst.kde.org/"
-SRC_URI="mirror://kde/unstable/apps/KDE4.x/scientific/${MY_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"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-cfitsio-includes.patch" )
-
-S="${WORKDIR}/${PN}"
-
-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 INSTDIR="${D}/usr"
-	eqmake4
-}
-
-src_install() {
-	emake install || die "emake install failed"
-	doicon src/images/${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN} \
-		"Qt;Graphics;DataVisualization" || die "make_desktop_entry failed"
-	dodoc AUTHORS ChangeLog NEWS PORTINGTODO README RELEASE.NOTES || die "dodoc failed"
-}