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

Package-Manager: portage-2.1.9/cvs/Linux x86_64

4 files changed, 66 insertions, 10 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/Manifest b/sci-astronomy/esorex/Manifest
index 2c7a3f787474..bd68868b02b9 100644
--- a/sci-astronomy/esorex/Manifest
+++ b/sci-astronomy/esorex/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX esorex-3.8.3-cfitsio.patch 1023 RMD160 2031eda7c32ea41e4367b2fd24d748ff8557c154 SHA1 6a716bfd5de9a0e535c7cc7eadef2167e67195ad SHA256 8a1461ef09604927e84a4972f72c90cffa26069fb99eabf86edb104027de47ad
 DIST esorex-3.8.3.tar.gz 798170 RMD160 9217d06dfdafe3b7e199b8249d4f190697f88182 SHA1 4b7c10e48f989c400bd7d88bd5981751dcbacddd SHA256 4438197e4609f01b60eed725a687cf97763af4c04999c7800b776499bc917716
-EBUILD esorex-3.8.3.ebuild 744 RMD160 53f5cdafefbbba37dcd850657ba91b2061642e5d SHA1 d67cebcc7c2c8c655a7a28518c53a7d9a41f916f SHA256 bae1af72d6959a07488c1dbfa50c58ed43e891823bd478ba47131f345a755362
-MISC ChangeLog 1021 RMD160 7c67ff2a4b0626989651e3404b1741f4e4089429 SHA1 814a659a6a8b56a9e2e1df84a5f113f71ce43548 SHA256 344be8bf54f854ae88d8fedfc0f65f1e8250edb5e23c48b46b3d9170ebd98fd2
+EBUILD esorex-3.8.3-r1.ebuild 834 RMD160 c66a8e267cb705d18044b8aa92f67026b46a4a10 SHA1 89a2242165decfe4e31d7824a4423f97516bc300 SHA256 3b8aa1337e9b897a19271485ebed5a34e48ccfb4e7d1bfcf35824ee72f5f35cc
+MISC ChangeLog 1283 RMD160 4154a4125c5942ac11d1e9296219b27d1e7ac9c1 SHA1 a0a7bcac12dc2cb1aae1e79532671384a1e85c34 SHA256 cddc31bd394271e9ecaa0f2757b8ee583952106ceff41a8a2f8a2b4228b8e1a3
 MISC metadata.xml 915 RMD160 6ed5e48cbf1ff25653e71c5fb6e1d81d974ce691 SHA1 dc68a8b74495bd6f1a9e694b6595d037d966b7c4 SHA256 c1287c3d8ea7c525a0d25ac9ab56f5f5be83125b8fb7a5885825a9b251a1deb3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkv9eyMACgkQ1ycZbhPLE2BQPgCeO5FxCrdZUT1ptdblcIN/jcHO
-4/0AoIe9SaCeGjYGb3tpxMojzSO4Lom1
-=JLfh
+iJwEAQECAAYFAkyoPeEACgkQIiMqcbOVdxT4vAP9HO4JJ4R6u/kzN9+Pr5inFBHQ
+qZqmahrU2upIxFdDluHNYTLliVfWN3OU2Qn2+H8Lwwv7s97S4jm0VGCJSBPN80/5
+wD7/dmKKyCw3II7FISbo476Fp0E2sb2PP4ioUyMfFXjAcBB+36DoQuCHfqujVSZw
+388BNUTpO4KCtwlDKY8=
+=Pwo2
 -----END PGP SIGNATURE-----
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