Version bump

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

5 files changed, 47 insertions, 60 deletions

diff --git a/sci-astronomy/esorex/ChangeLog b/sci-astronomy/esorex/ChangeLog
index eaf2f78547ba..a6ca631e90ae 100644
--- a/sci-astronomy/esorex/ChangeLog
+++ b/sci-astronomy/esorex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/esorex
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.4 2011/08/04 18:30:14 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.5 2012/06/04 22:57:51 bicatali Exp $
+
+*esorex-3.9.6 (04 Jun 2012)
+
+  04 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> -esorex-3.8.3-r1.ebuild,
+  -files/esorex-3.8.3-cfitsio.patch, +esorex-3.9.6.ebuild,
+  +files/esorex-3.9.6-use-shared-libs.patch:
+  Version bump
 
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
diff --git a/sci-astronomy/esorex/Manifest b/sci-astronomy/esorex/Manifest
index 89fd0877ee9c..80707826c3ec 100644
--- a/sci-astronomy/esorex/Manifest
+++ b/sci-astronomy/esorex/Manifest
@@ -1,17 +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
+AUX esorex-3.9.6-use-shared-libs.patch 562 RMD160 8edd715b8fa239f30633b9f29f99efbb2e66cc99 SHA1 73db7557b8cad3f2257b357a1009731758583a58 SHA256 1a8922317e93d5840144b79d84e93b7ca329da9aa0e1872ad3493913e6975e90
 DIST esorex-3.9.0.tar.gz 748335 RMD160 121c033a6866e48eedb0e48b85c07923f39eed9d SHA1 e3c2fb3de9582651be2e99f7a4b2b1d2a7b415b9 SHA256 23c17ba9b56ac26765dd63555b278901c08f8a52a90e48e52e335e5cd18103d2
-EBUILD esorex-3.8.3-r1.ebuild 816 RMD160 6afc165dcd9aabf388b163fa1a540cdc2e0f5dfa SHA1 fc6c6e6b30ba5d95d46e5130c4836b8c608bc6de SHA256 4a2fc4fe7550b641f851c30e5a2fbfcc3cfd249d038dacf19e346d71211da22c
+DIST esorex-3.9.6.tar.gz 799988 RMD160 9dd32e7e55417293bfcb6e52ba0923ed338c23dd SHA1 00165c0281986db84cbafd71216e7c6ab70954a5 SHA256 9adba0f8c712ffa5f6b553618e927197e25bb71b4d2ab7b5e64482aea269a0ac
 EBUILD esorex-3.9.0.ebuild 625 RMD160 78c4d93f8ee252af47d2a6d3f8a471da7338ec54 SHA1 ae6db40ccc6668b095355c082e645c7bcae14546 SHA256 1c47b54a575e7a624eef81a4fd43e73ebb2125f01f5218a3beef8555392ba5a4
-MISC ChangeLog 1506 RMD160 d29da638863c25a6a5403deb9cae8b1a97f5e7a8 SHA1 5a8f73efa917defd67028a5518cf434c1ec84688 SHA256 5757913736919e3776ea582933e8cdb666dbb4d2e88728a7f4e574cd17188644
+EBUILD esorex-3.9.6.ebuild 771 RMD160 02b9ded741a5e730293588ee120776a4447e6424 SHA1 72cd5fbb8ad6cddb941734046acf7947f8114619 SHA256 a170a2c95599f94de94795969edff285fa542f714742eb076dcc30b1bb076b89
+MISC ChangeLog 1735 RMD160 5fa4541a56c6481afd0c7e78945a809a24dc067c SHA1 fb0a47db9800e7d7ed4d193ccf1e558b0c93f47a SHA256 efde0405e95805085ce50e6e3881d652e275444c1dbb8254700412a5c91d4ba3
 MISC metadata.xml 925 RMD160 c334e7431cef5da68f0730b87d4ef60f5778435f SHA1 c18218f4b790f4f2941f0072d43d25ed706c4c7d SHA256 9b482343b9d05dbf69ac34df5999fe45f8a8529c6ebd4b57bb0678d37505df3f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk465T4ACgkQ1ycZbhPLE2B39wCeO1PD4V/1P5LCtJZIiN+Smk5K
-UPkAniiimEiSre68pcmyF4fJ6Cm2RH1y
-=uMSV
+iEYEARECAAYFAk/NPXkACgkQ1ycZbhPLE2BM8ACfTJ0IDYlVnPnWXly2tV1XY59w
+beQAoJScWgSFBDYHIj7m6H/7nkAlVPkj
+=+fR3
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/esorex/esorex-3.8.3-r1.ebuild b/sci-astronomy/esorex/esorex-3.9.6.ebuild
index 6c7267eb97c1..50bec7c66c5a 100644
--- a/sci-astronomy/esorex/esorex-3.8.3-r1.ebuild
+++ b/sci-astronomy/esorex/esorex-3.9.6.ebuild
@@ -1,33 +1,30 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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-r1.ebuild,v 1.2 2011/02/24 17:25:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/esorex-3.9.6.ebuild,v 1.1 2012/06/04 22:57:51 bicatali Exp $
 
-EAPI=2
+EAPI=4
 
-inherit autotools eutils
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
 
 DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
 HOMEPAGE="http://www.eso.org/sci/software/cpl/esorex.html"
-SRC_URI="ftp://ftp.eso.org/pub/cpl/${P}.tar.gz"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND=">=sci-astronomy/cpl-5.2"
+DEPEND=">=sci-astronomy/cpl-6"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cfitsio.patch
-	eautoreconf
-}
+PATCHES=( "${FILESDIR}"/${P}-use-shared-libs.patch )
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README AUTHORS NEWS TODO BUGS ChangeLog || die
+	autotools-utils_src_install
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples || die
+		doins -r examples
 	fi
 }
diff --git a/sci-astronomy/esorex/files/esorex-3.8.3-cfitsio.patch b/sci-astronomy/esorex/files/esorex-3.8.3-cfitsio.patch
deleted file mode 100644
index 0bc1b7f763c8..000000000000
--- a/sci-astronomy/esorex/files/esorex-3.8.3-cfitsio.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
diff --git a/sci-astronomy/esorex/files/esorex-3.9.6-use-shared-libs.patch b/sci-astronomy/esorex/files/esorex-3.9.6-use-shared-libs.patch
new file mode 100644
index 000000000000..0cd348eaa446
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.9.6-use-shared-libs.patch
@@ -0,0 +1,20 @@
+--- esorex-3.9.6/m4/cpl.m4.orig	2012-06-04 23:47:50.000000000 +0100
++++ esorex-3.9.6/m4/cpl.m4	2012-06-04 23:48:45.000000000 +0100
+@@ -455,7 +455,7 @@
+     AC_MSG_CHECKING([for libcext])
+ 
+     cpl_cext_check_header="cxtypes.h"
+-    cpl_cext_check_lib="libcext.a"
++    cpl_cext_check_lib="libcext.so"
+ 
+     cpl_cext_incdirs=""
+     cpl_cext_libdirs=""
+@@ -1314,7 +1314,7 @@
+     AC_MSG_CHECKING([for CPL])
+ 
+     cpl_check_cpl_header="cpl.h"
+-    cpl_check_cpl_lib="libcplcore.a"
++    cpl_check_cpl_lib="libcplcore.so"
+ 
+     cpl_incdirs=""
+     cpl_libdirs=""