Updating [R]DEPEND with sci-libs/cfitsio and fixing a compilation error (bug #298212)

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

3 files changed, 67 insertions, 3 deletions

diff --git a/media-gfx/kst/ChangeLog b/media-gfx/kst/ChangeLog
index 4761844ededf..0f1edeb6f4fc 100644
--- a/media-gfx/kst/ChangeLog
+++ b/media-gfx/kst/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/kst
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.25 2009/12/08 20:10:19 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.26 2009/12/24 22:28:05 ayoy Exp $
+
+*kst-2.0.0_beta2-r1 (24 Dec 2009)
+
+  24 Dec 2009; Dominik Kapusta <ayoy@gentoo.org> -kst-2.0.0_beta2.ebuild,
+  +kst-2.0.0_beta2-r1.ebuild, +files/kst-cfitsio-includes.patch:
+  Updating [R]DEPEND with sci-libs/cfitsio and fixing a compilation error
+  (bug #298212)
 
 *kst-2.0.0_beta2 (08 Dec 2009)
 
diff --git a/media-gfx/kst/files/kst-cfitsio-includes.patch b/media-gfx/kst/files/kst-cfitsio-includes.patch
new file mode 100644
index 000000000000..5a49906d4e0b
--- /dev/null
+++ b/media-gfx/kst/files/kst-cfitsio-includes.patch
@@ -0,0 +1,52 @@
+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/media-gfx/kst/kst-2.0.0_beta2.ebuild b/media-gfx/kst/kst-2.0.0_beta2-r1.ebuild
index 6143f0893250..cde457881470 100644
--- a/media-gfx/kst/kst-2.0.0_beta2.ebuild
+++ b/media-gfx/kst/kst-2.0.0_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.ebuild,v 1.1 2009/12/08 20:10:19 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-2.0.0_beta2-r1.ebuild,v 1.1 2009/12/24 22:28:05 ayoy Exp $
 
 EAPI=2
 
@@ -23,11 +23,16 @@ DEPEND="x11-libs/qt-gui: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/gsl
+	sci-libs/cfitsio"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-cfitsio-includes.patch" )
 
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	qt4_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"