Fix aclocal with >=sys-devel/automake-1.12 wrt #422455 by Diego Elio Pettenò <flameeyes@gentoo.org>, drop old

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 30 insertions, 93 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/Manifest b/sci-astronomy/cpl/Manifest
index aa73b4910b06..37d874acae1c 100644
--- a/sci-astronomy/cpl/Manifest
+++ b/sci-astronomy/cpl/Manifest
@@ -1,21 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX cpl-5.2.0-test.patch 946 RMD160 286e39dda1529560e7c55f89bdd2420925fcfb1d SHA1 84b2de6ad4e062fe75658372c2b4afbcc4eb43c9 SHA256 6f095a40c98098ac190d531de9333f2e64658ae4a30505632172c92d4fc314e1
 AUX cpl-6.1.1-check-shared-libs.patch 1010 RMD160 15651ef53bd001c47951469572d653cbbb9acbd5 SHA1 a664ddecf19c930431ab94531cfee1586b37d687 SHA256 99d448ed80ad6139bb989ffc718942570dc8c2646e3936939c9fb6797deb92a5
 AUX cpl-6.1.1-use-system-ltdl.patch 1296 RMD160 2b59a55b55ec1c7942dd5ddf04cc80973a3bf993 SHA1 145f304a94016f3a5e63a8d5a2a50b14ff40a79c SHA256 55bd2aa8072e621d6a7e4e939f8e6831c598c7000f739756520ff174e1d6ecaf
-DIST cpl-5.2.0.tar.gz 1834948 RMD160 6286ed3243c41ac6ce995d97fe8b71f5ecda3cac SHA1 f7ad702230f91364c4b2512dbf0268c98735cc0d SHA256 617083b81d4029f2fb70710ab772ae0a1ed531806a8881c62dce7c522a62b6a0
 DIST cpl-5.3.1.tar.gz 2007590 RMD160 ee01961ed6e3719107119c1d206b69cd37bb2eec SHA1 1c260ec66cafb0aa72221e01a1400084bde93688 SHA256 b1483e7362a8b643d5cf38e473d1cb6fe8cc375450a391a2001c653b18384ad5
 DIST cpl-6.1.1.tar.gz 2846557 RMD160 225f56e7494ab9ac78ef23f261cb2c4148ec7fbe SHA1 8663c95c09101d8196857a68d649ecb00ac0bebd SHA256 74250d8459dcee4a0b814488d3f0f5691bf9888fde3931b66033673575eb95e7
-EBUILD cpl-5.2.0-r1.ebuild 1540 RMD160 a121ac071dfff6bb289afd2d96372bc31aefc7ab SHA1 5aa6f8d58f7f1fcd7e9c4084481def23a396912a SHA256 57aa357fe1d5b31ea00ee481cc8b714cc063a31cb57bcf31c0c5fdb5249685a6
 EBUILD cpl-5.3.1.ebuild 1390 RMD160 d8bda92e974463b73113c907bf99868a732949ca SHA1 3a5902ab3397d9fdd088ddb15b17ca2ca1865c70 SHA256 26c031312ccbbcd3364b57b315f0367992a639fe5fb50e11089f8d2259b6cf80
-EBUILD cpl-6.1.1.ebuild 1375 RMD160 8db095dbe0ccc70ac38e485e995c26c6a3a8e4d8 SHA1 9310189f5b29db983fb600ee41cdfb6c56ced82b SHA256 4e411f88b501fcc9eb2a3ab73c1bdae0f31a5d0b1e51c41931f71ef4cdc86989
-MISC ChangeLog 2129 RMD160 4e000bdab4afebdfcf2d141541c4d75d1a975d81 SHA1 1087b34a8849c7e309cbedeb0ce6da56bb82e717 SHA256 374d842f9419b214d7f054b4a3d7c5228217eba648bae6b95e339af4e29a3162
+EBUILD cpl-6.1.1.ebuild 1510 RMD160 aae41e1920b7257ca332365d500bfabd2a804ba8 SHA1 8f43df2365a3b88a3703c2af5ca00001c2a6e493 SHA256 fc8c24661acfb5868e399407c64d96fa906562cd5849eab12e70fbdecdf2ec03
+MISC ChangeLog 2372 RMD160 5b9513ace739d9ca55293f48c817a85a34868c16 SHA1 262365ad41b9a7a811b0ebeda9d7ef96a40e1195 SHA256 5174f731909268f65e5f0eb67f6b52ffdc62af83e41d66fff89780fecf43e2ba
 MISC metadata.xml 979 RMD160 aa4687f74e76d3feaa83e9089be988f3bb8105d7 SHA1 d89264aa661d8f49c81ff203dd93487e23fef25a SHA256 37431826b0c9d429427342e34cc1dc25535068b13d2875ea24dc4156fcaa879e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/NNJMACgkQ1ycZbhPLE2AMZACcC66LR4j2IpgVu5H9iAb7+vSD
-cIIAn0iQOwbRBus67ECY/PlrgmfEyU8L
-=4uo3
+iQIcBAEBCAAGBQJP42zAAAoJEF0huFKJUZL5PqYP/i1BQ5n2ulDBbK2bIJNGXS/E
+3PTtbXT4sU9FmIkhmGcQbzkld6BhN6o/CrS5TLJaAssdQucPGdqWla6Aukqvqr9E
+XjT1pymf4KVuf5uv+o/jNdLKYJXVFzuWQdhLZm33797e2FBw+VhWyzcayAI1Yycv
+vbHhj1lyHo1KUZPTIbhIdveb5J80CszSuHqm3+h/Z/BGus6wXrS1JGwAmFuGOR4U
+003f174oi8vgyn0M7t4GPT00Gtx8PSn6wVpZUcEVbcjo4ijFiVgBgge9pZTogRnA
+azeu/JWE0YW4uNiXNQbOk2y6+YYpqPB9A7rV5WEns5vlo5qcAeDgje53VHFMGc7E
+rctivLI7VVLaUUvamfZ3dPHebOtRLQQ1fLksi8M8+Ii2yXqHzEeVYUb9ZyzgyNGw
+jK6WOH4Ed8SsbdXu8buc9jBqUnyRPt0+5FZ7wJnFZsmnbj1GgAkJyQhfUjMTxoP1
+CJmmTmQyLMozzNAqg/UmUcxyhmrG48E9gLP27iPKBKq0CNTJXjrDuillbMZU2PA9
+/wqdhZ9teSBHHcg3mfC+MijKpy9qD+xh3cGU7IGuZCrLQ2wFUrxYSbimvF232KG8
+a2s8FNxboTpXYkwTRBwofAKLin5p1rWy+GX6+gACnrp6fmMxFIjYRhoiaJRpLGfW
+r9on1vERkZmU6rIF0/aG
+=LRDu
 -----END PGP SIGNATURE-----
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);
-             
-             }
-