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).

Package-Manager: portage-2.2_rc81/cvs/Linux x86_64

4 files changed, 20 insertions, 84 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/Manifest b/media-gfx/kst/Manifest
index fdf0d746ad8b..b6916f8e4477 100644
--- a/media-gfx/kst/Manifest
+++ b/media-gfx/kst/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX kst-cfitsio-includes.patch 1519 RMD160 733af09e87fa6fce447cdb49f8909c2fa373b552 SHA1 93a089e591effe24e719f2ed6929852baa483154 SHA256 0d71cbf22272115323a24251170d362bf750ea664621cbc408f2463f8ccd48e9
-DIST Kst-2.0.0-beta5-sources.tar.bz2 7964912 RMD160 9bc79721648c40d615bebcb0ed113f72870b8f50 SHA1 2da669ce9c3208008b7dd5a30702bf4e836b8f17 SHA256 aca2c0dfcd35e5907e01f792f26692f7084b34aec062a3dc417f3d2fc38db18d
-DIST kst-2.0.0-beta2.tar.gz 3938769 RMD160 ed381650717a7971ad890c5d07af9c6bcabba5a8 SHA1 dc53fe3df348abb1a62becb40544b618636525d3 SHA256 0d76070f9ef228b961cc543f4304b224301b505a94875ad24db0854ea675aee7
-EBUILD kst-2.0.0_beta2-r1.ebuild 2144 RMD160 fd3181d79173ff5850139378d5425026e38a87bd SHA1 a36e6aa343ca555dcf53ee25edc515278a052630 SHA256 6ab60f0c8222145c0b4d7340cfa8735f83ba48ff84fcd76db262fda6728f7895
-EBUILD kst-2.0.0_beta5-r1.ebuild 2178 RMD160 e8d851b25ffab0732e93692c876d5447140029a6 SHA1 9eaccce8a6240314a715131dac2f320c0ec50109 SHA256 5dbf5c012216f6caf99cea4198a4e249d9301b684c66cd52596da91c6e148b61
-MISC ChangeLog 1330 RMD160 26f242b306dd8e22e17618745267b90b2e654173 SHA1 a5c8b54268495f4ff8b05e3a57020e60e3c2aa34 SHA256 eca2acf2feb14eb8c78228f626859740125621079004b473f89cb57765fa88f1
+DIST kst-2.0.0.tar.gz 10270708 RMD160 b8b74bf8e22a80cd9133fd28224f77ec8b60decb SHA1 76742eb3fd81f68148449fa84abc8dc3139be720 SHA256 6f3e639b87cc21c3ddc8891aa91ee713c6b750cd9fafc945fb97acc1a8fe0c7c
+EBUILD kst-2.0.0.ebuild 2091 RMD160 bbde5675fb7b6ac1b2364dcafaf5532be86de442 SHA1 4c310901eea975841690a6d4c43ae42675d3af9b SHA256 39d000c1d39867492a5534b9afe3b80079356f2de31dd834d67e5b1430e0d7fe
+MISC ChangeLog 1654 RMD160 4045f5dd7d830d1cbb1b474823710af9c89c8820 SHA1 fb7635e815716e2ebe399dee70842832f424e266 SHA256 7c8849eee2f45a907f374534fca50040ab3d9b4bcf31d88b1193b50552da5b2b
 MISC metadata.xml 299 RMD160 2817d6e5370fefb9f2696eb770c9ff49399d6744 SHA1 f7badb6c31b2bf048766ad33bfda5b957fb32c2f SHA256 3c3fbe2f47e5a8e7ff708d354dd82f18b10e8dfd84dfa1673a8f95dd4a07eac2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwK3rgACgkQ+CZEqwt+F6ZRBgCeIpd5JGWAWZxNrh7a8UORFxZd
-cPcAn1PwdGa600htxmY4aFuS8Dc840Xs
-=Nhb4
+iEYEARECAAYFAkyOUREACgkQ+CZEqwt+F6afjQCglBKjYsguR9YltKJUS4QmHKUz
+bGYAoI09iFtmk4vG6nHhweuYNkpqWW6W
+=URax
 -----END PGP SIGNATURE-----
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"
-}