cpl: added wcs and gasgano support

6 files changed, 35 insertions, 78 deletions

diff --git a/sci-astronomy/cpl/ChangeLog b/sci-astronomy/cpl/ChangeLog
index 259466e98..d2f4dff9e 100644
--- a/sci-astronomy/cpl/ChangeLog
+++ b/sci-astronomy/cpl/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-astronomy/cpl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  sci-astronomy/cpl/metadata.xml:
+  Added wcs and gasgano support
+
   02 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org> +cpl-4.1.0.ebuild:
   Version bump, thanks to Marek Miller
 
@@ -14,4 +18,4 @@
   15 Oct 2006; Sebastien Fabbro <seb@ist.utl.pt>;
   +cpl-3.0.ebuild,  +metadata.xml.
   Initial import.
-  
\ No newline at end of file
+  
diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest
index 722372d8b..dd8efc4bb 100644
--- a/sci-astronomy/cpl/Manifest
+++ b/sci-astronomy/cpl/Manifest
@@ -1,8 +1,4 @@
-DIST cpl-3.1.tar.gz 1971557 RMD160 70fd7a764743203c740bbf43e878292feab879ff SHA1 e564d89ee3018f81d75da44c4f861b6aef93c1cb SHA256 d98a51f4606c677151b57b8b2576803a8e18b145b74921ef3948f60206ec8085
-DIST cpl-4.1.0.tar.gz 2110375 RMD160 372f4c5a59be125fac543d2c583eb3188c74c26e SHA1 2ba21055642f20003464d656e9d8772e5a78b8dc SHA256 f2cd564a2daabe663708118ba0e6d817dc4b378854ceaee8d5eab98666e22c9f
 DIST cpl-4.2.0.tar.gz 1841007 RMD160 aad1550d31668284f22466b828242d23cf096455 SHA1 cd59497198a849dbccc402e2b4694f8fc7dc9e3d SHA256 0ad808ba0130535f97230c0036146394e57ef8328d5015ddeb08e3c829878ffc
-EBUILD cpl-3.1.ebuild 618 RMD160 89499f7d55620078c249b95794b34aa8dd28dd25 SHA1 33f60f8a82ac6e664ff4592ad35efc5d088d133b SHA256 7c86df593f9053b4530a92b4dfee92c75f039d8f30f51c5b65c45e3200f2a436
-EBUILD cpl-4.1.0.ebuild 871 RMD160 e4ee3bf04464db910dda1535ca52d332d866ea98 SHA1 eaaa856d69e6247680f7f8ab8c0852a38cc177ba SHA256 72be73771eda47931d17bfffad7c9470643e8a3590a8e8cdf5804bcb7fc6f07c
-EBUILD cpl-4.2.0.ebuild 845 RMD160 8fb21c38178d6fc7bb0a508d7b8a1688badcfac5 SHA1 ec84d693e319f3b4ac350980fc2a70a18048ba07 SHA256 a8b2d2cdc32cec3e033ed3fefce94c1fa55002b10ddda6956de30fa6e514ddef
-MISC ChangeLog 469 RMD160 9fb6fa937e500a42550a61190476e531019b5b45 SHA1 92e3b665c443615a0a8bf589a7c6316caf6467d4 SHA256 b4ff558be4334dc44096fbcc5ec2b43ffc16c1d394ef6e0a8310f8acde14ac1c
+EBUILD cpl-4.2.0-r1.ebuild 901 RMD160 824f1b63ba471721cfb911cd2e20be0d96999660 SHA1 14eff829cbe133af7775e8fa0abe5ec514338744 SHA256 98c558826d54f01ac80ea56acb902c41b159d64436d54acc6c24d29c951567c9
+MISC ChangeLog 470 RMD160 c6030bf55de057b116aa3690ba07755ed25b8c4b SHA1 60adcd5aeb5377ba4ac9274121f2935498660e4a SHA256 82c5af813d4ffb2bafbb1887d509e377ce8a57e58249214513996479ef4cead9
 MISC metadata.xml 851 RMD160 7efdace874d151755ca66c0a878b98f4b1f74be7 SHA1 129f9157fbbe39ab6a8597be93169a97b57c2c21 SHA256 c0f4158534172f67ef54bffcbc3d0834e3bc5810613479cce09e625fb809004f
diff --git a/sci-astronomy/cpl/cpl-3.1.ebuild b/sci-astronomy/cpl/cpl-3.1.ebuild
deleted file mode 100644
index 645e9cf50..000000000
--- a/sci-astronomy/cpl/cpl-3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/observing/cpl/"
-SRC_URI="ftp://ftp.hq.eso.org/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=sci-libs/qfits-6.2"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS NEWS TODO BUGS ChangeLog
-	if use doc; then
-		make htmldir=usr/share/doc/${PF} install-html \
-			|| die "make install-html failed"
-	fi
-}
diff --git a/sci-astronomy/cpl/cpl-4.1.0.ebuild b/sci-astronomy/cpl/cpl-4.2.0-r1.ebuild
index 3b243ea19..4a1c941c9 100644
--- a/sci-astronomy/cpl/cpl-4.1.0.ebuild
+++ b/sci-astronomy/cpl/cpl-4.2.0-r1.ebuild
@@ -1,34 +1,44 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+inherit java-pkg-opt-2
+
 DESCRIPTION="ESO common pipeline library for astronomical data reduction"
 HOMEPAGE="http://www.eso.org/sci/data-processing/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/${PN}/${PF}.tar.gz"
+SRC_URI="ftp://ftp.eso.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-#todo: enable Gasgano support.
-IUSE="doc"
+IUSE="doc gasgano"
 
-# The qfits library is not used any more
-RDEPEND="=sci-libs/cfitsio-2.510*"
-DEPEND="${RDEPEND}"
+RDEPEND="=sci-libs/cfitsio-2.510*
+	sci-astronomy/wcslib
+	gasgano? ( sci-astronomy/gasgano )"
+DEPEND="${RDEPEND}
+	gasgano? ( >=virtual/jdk-1.5 )"
 
-src_compile() {
+src_configure() {
+	local myconf="--without-gasgano"
+	use gasgano && \
+		myconf="--with-gasgano=/usr
+				--with-gasgano-classpath=/usr/share/gasgano/lib"
 	econf \
 		--with-cfitsio="/usr" \
-		|| die "econf failed"
-	emake || die "emake failed"
+		--with-wcs="/usr" \
+		${myconf}
 }
 
 src_install() {
-
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README AUTHORS NEWS TODO BUGS ChangeLog
-	use doc && dohtml html/*
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r html || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/sci-astronomy/cpl/cpl-4.2.0.ebuild b/sci-astronomy/cpl/cpl-4.2.0.ebuild
deleted file mode 100644
index 74eefcfac..000000000
--- a/sci-astronomy/cpl/cpl-4.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/sci/data-processing/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/${PN}/${PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-#todo: enable Gasgano support.
-IUSE="doc"
-
-# The qfits library is not used any more
-RDEPEND="=sci-libs/cfitsio-2.510*"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf \
-		--with-cfitsio="/usr"
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS NEWS TODO BUGS ChangeLog
-	use doc && dohtml html/*
-}
-
-pkg_postinst() {
-	elog "Help us to improve the ebuild"
-	elog "http://bugs.gentoo.org/show_bug.cgi?id=224227"
-}
diff --git a/sci-astronomy/cpl/metadata.xml b/sci-astronomy/cpl/metadata.xml
index d573949d6..1b34a43fa 100644
--- a/sci-astronomy/cpl/metadata.xml
+++ b/sci-astronomy/cpl/metadata.xml
@@ -14,4 +14,9 @@
   way to make the library portable and flexible, as well as minimising
   external dependencies.
 </longdescription>
+<use>
+  <flag name='gasgano'>
+    Enable support for <pkg>sci-astronomy/gasgano</pkg> file organizer
+  </flag>
+</use>
 </pkgmetadata>