keyword amd64-linux, x86-linux, removed old

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

3 files changed, 8 insertions, 56 deletions

diff --git a/sci-astronomy/cpl/ChangeLog b/sci-astronomy/cpl/ChangeLog
index f9579c45ec5d..957469d5927c 100644
--- a/sci-astronomy/cpl/ChangeLog
+++ b/sci-astronomy/cpl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2012/06/21 18:49:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.10 2012/08/05 15:03:02 bicatali Exp $
+
+  05 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -cpl-5.3.1.ebuild,
+  cpl-6.1.1.ebuild:
+  keyword amd64-linux, x86-linux, removed old
 
   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:
diff --git a/sci-astronomy/cpl/cpl-5.3.1.ebuild b/sci-astronomy/cpl/cpl-5.3.1.ebuild
deleted file mode 100644
index 8b3fb1abbc6d..000000000000
--- a/sci-astronomy/cpl/cpl-5.3.1.ebuild
+++ /dev/null
@@ -1,52 +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.3.1.ebuild,v 1.1 2011/04/08 04:39:17 bicatali Exp $
-
-EAPI=4
-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 static-libs"
-
-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 dev-texlive/texlive-fontsrecommended )
-	gasgano? ( >=virtual/jdk-1.5 )"
-
-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 \
-		$(use_enable static-libs static) \
-		--with-cfitsio="${EPREFIX}/usr" \
-		--with-wcs="${EPREFIX}/usr" \
-		--with-fftw="${EPREFIX}/usr" \
-		${myconf}
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-	if use doc; then
-		VARTEXFONTS=${T}/fonts doxygen Doxyfile || die
-	fi
-}
-src_install() {
-	default
-	use doc && dohtml -r html
-}
diff --git a/sci-astronomy/cpl/cpl-6.1.1.ebuild b/sci-astronomy/cpl/cpl-6.1.1.ebuild
index 0c5946f967ae..39412d329636 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.2 2012/06/21 18:49:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-6.1.1.ebuild,v 1.3 2012/08/05 15:03:02 bicatali Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc gasgano static-libs threads"
 
@@ -37,7 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	myeconfargs+=(
+	local myeconfargs=(
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		--disable-ltdl-install
 		--without-included-ltdl