4 files changed, 13 insertions, 83 deletions
diff --git a/sci-astronomy/cpl/ChangeLog b/sci-astronomy/cpl/ChangeLog
index 6bb3bad07b4f..f9579c45ec5d 100644
--- a/sci-astronomy/cpl/ChangeLog
+++ b/sci-astronomy/cpl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/cpl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.8 2012/06/04 22:19:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.9 2012/06/21 18:49:26 xarthisius Exp $
+
+  21 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org> -cpl-5.2.0-r1.ebuild,
+  -files/cpl-5.2.0-test.patch, cpl-6.1.1.ebuild:
+  Fix aclocal with >=sys-devel/automake-1.12 wrt #422455 by Diego Elio Pettenò
+  <flameeyes@gentoo.org>, drop old
 
 *cpl-6.1.1 (04 Jun 2012)
 
diff --git a/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild b/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild
deleted file mode 100644
index 062306bf8b5c..000000000000
--- a/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild,v 1.4 2011/02/24 17:30:50 bicatali Exp $
-
-EAPI=3
-JAVA_PKG_OPT_USE=gasgano
-inherit eutils java-pkg-opt-2
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc gasgano"
-
-RDEPEND=">=sci-libs/cfitsio-3.09
-	sci-astronomy/wcslib
-	sci-libs/fftw:3.0
-	gasgano? ( sci-astronomy/gasgano )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )
-	gasgano? ( >=virtual/jdk-1.5 )"
-
-src_prepare() {
-	# fft precision test failed. should be fixed in 5.3
-	epatch "${FILESDIR}"/${P}-test.patch
-}
-
-src_configure() {
-	has_version sci-libs/cfitsio[static-libs] || \
-		sed -i -e 's/libcfitsio.a/libcfitsio.so/' configure
-	local myconf="--without-gasgano"
-	use gasgano && \
-		myconf="--with-gasgano=${EPREFIX}/usr
-				--with-gasgano-classpath=${EPREFIX}/usr/share/gasgano/lib"
-	econf \
-		--with-cfitsio="${EPREFIX}/usr" \
-		--with-wcs="${EPREFIX}/usr" \
-		--with-fftw="${EPREFIX}/usr" \
-		${myconf}
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" || die #336189
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README AUTHORS NEWS TODO BUGS ChangeLog || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r html || die
-	fi
-}
diff --git a/sci-astronomy/cpl/cpl-6.1.1.ebuild b/sci-astronomy/cpl/cpl-6.1.1.ebuild
index 8bcc44e48d5c..0c5946f967ae 100644
--- a/sci-astronomy/cpl/cpl-6.1.1.ebuild
+++ b/sci-astronomy/cpl/cpl-6.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-6.1.1.ebuild,v 1.1 2012/06/04 22:19:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-6.1.1.ebuild,v 1.2 2012/06/21 18:49:26 xarthisius Exp $
 
 EAPI=4
 
@@ -30,6 +30,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-use-system-ltdl.patch
 )
 
+src_prepare() {
+	sed -e '/AM_C_PROTOTYPES/d' \
+		-i configure.ac libcext/configure.ac || die #422455
+	autotools-utils_src_prepare
+}
+
 src_configure() {
 	myeconfargs+=(
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
diff --git a/sci-astronomy/cpl/files/cpl-5.2.0-test.patch b/sci-astronomy/cpl/files/cpl-5.2.0-test.patch
deleted file mode 100644
index 222f01c60153..000000000000
--- a/sci-astronomy/cpl/files/cpl-5.2.0-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- cpldrs/tests/cpl_fft-test.c.orig	2010-12-22 15:36:23.000000000 +0000
-+++ cpldrs/tests/cpl_fft-test.c	2010-12-22 15:36:54.000000000 +0000
-@@ -205,14 +205,14 @@
-             
-             if (imtype & CPL_TYPE_FLOAT) {
-             cpl_test_image_abs(img2_re, img4_re,
--                       2 * 10 * FLT_EPSILON * CONSTANT);
-+                       3 * 10 * FLT_EPSILON * CONSTANT);
-             cpl_test_image_abs(img2_im, img4_im,
--                       2 * 10 * FLT_EPSILON * CONSTANT);
-+                       3 * 10 * FLT_EPSILON * CONSTANT);
-             } else {
-             cpl_test_image_abs(img2_re, img4_re,
--                       2 *10 * DBL_EPSILON * CONSTANT);
-+                       5 *10 * DBL_EPSILON * CONSTANT);
-             cpl_test_image_abs(img2_im, img4_im,
--                       2* 10 * DBL_EPSILON * CONSTANT);
-+                       5* 10 * DBL_EPSILON * CONSTANT);
-             
-             }
-