Use pkg-config for cfitsio wrt bug 339460. Thanks to Diego for the report. Drop old.

(Portage version: 2.1.9/cvs/Linux x86_64)

3 files changed, 57 insertions, 4 deletions

diff --git a/sci-astronomy/esorex/ChangeLog b/sci-astronomy/esorex/ChangeLog
index 90c6cf064790..19243ca5c732 100644
--- a/sci-astronomy/esorex/ChangeLog
+++ b/sci-astronomy/esorex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/esorex
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.1 2010/05/26 19:10:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.2 2010/10/03 08:24:56 xarthisius Exp $
+
+*esorex-3.8.3-r1 (03 Oct 2010)
+
+  03 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> -esorex-3.8.3.ebuild,
+  +esorex-3.8.3-r1.ebuild, +files/esorex-3.8.3-cfitsio.patch:
+  Use pkg-config for cfitsio wrt bug 339460. Thanks to Diego for the report.
+  Drop old.
 
 *esorex-3.8.3 (26 May 2010)
 
diff --git a/sci-astronomy/esorex/esorex-3.8.3.ebuild b/sci-astronomy/esorex/esorex-3.8.3-r1.ebuild
index 1d8a749025b5..faa585264eb8 100644
--- a/sci-astronomy/esorex/esorex-3.8.3.ebuild
+++ b/sci-astronomy/esorex/esorex-3.8.3-r1.ebuild
@@ -1,22 +1,31 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/esorex-3.8.3.ebuild,v 1.1 2010/05/26 19:10:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/esorex-3.8.3-r1.ebuild,v 1.1 2010/10/03 08:24:55 xarthisius Exp $
 
 EAPI=2
 
+inherit autotools eutils
+
 DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
 HOMEPAGE="http://www.eso.org/sci/data-processing/software/cpl/esorex.html"
 SRC_URI="ftp://ftp.eso.org/pub/cpl/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
+
 DEPEND=">=sci-astronomy/cpl-5.2"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cfitsio.patch
+	eautoreconf
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS NEWS TODO BUGS ChangeLog
+	emake DESTDIR="${D}" install || die
+	dodoc README AUTHORS NEWS TODO BUGS ChangeLog || die
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples || die
diff --git a/sci-astronomy/esorex/files/esorex-3.8.3-cfitsio.patch b/sci-astronomy/esorex/files/esorex-3.8.3-cfitsio.patch
new file mode 100644
index 000000000000..0bc1b7f763c8
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.8.3-cfitsio.patch
@@ -0,0 +1,37 @@
+Use pkg-config for cfitsio
+
+http://bugs.gentoo.org/show_bug.cgi?id=339460
+
+--- configure.ac
++++ configure.ac
+@@ -69,7 +69,7 @@
+ ESOREX_FUNC_GETOPT
+ 
+ # Check for CPL/CFITSIO presence and usability
+-CPL_CHECK_CFITSIO
++PKG_CHECK_MODULES([CFITSIO], [cfitsio >= 3.09])
+ #CPL_CHECK_CEXT
+ CPL_CHECK_LIBS
+ ESO_CHECK_EXTRA_LIBS
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -33,7 +33,7 @@
+ 
+ CPPFLAGS = -DCX_LOG_DOMAIN=\"EsoRex\"
+ 
+-INCLUDES = $(CFITSIO_INCLUDES) $(CPL_INCLUDES) $(CX_INCLUDES) $(INCLTDL)
++INCLUDES = $(CFITSIO_CFLAGS) $(CPL_INCLUDES) $(CX_INCLUDES) $(INCLTDL)
+ 
+ noinst_HEADERS = er_fileutils.h er_help.h er_main.h er_params.h \
+ 		er_paramutils.h er_plugin.h er_pluginlist.h \
+@@ -51,8 +51,8 @@
+ 
+ config_DATA =
+ 
+-esorex_LDFLAGS = $(CPL_LDFLAGS) $(CFITSIO_LDFLAGS) $(LIBLTDL)
+-esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBLTDL)
++esorex_LDFLAGS = $(CPL_LDFLAGS) $(LIBLTDL)
++esorex_LDADD = @GETOPT@ $(CFITSIO_LIBS) $(LIBCPLUI) $(LIBCPLDFS) $(LIBLTDL)
+ esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL)
+ 
+ if PURIFY