Version bump

Package-Manager: portage-2.2.01.21938-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 88 insertions, 7 deletions

diff --git a/sci-astronomy/cpl/ChangeLog b/sci-astronomy/cpl/ChangeLog
index 4c0c5d177b9d..31d37ed2fb40 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.12 2012/12/05 17:22:29 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.13 2013/06/07 23:32:10 bicatali Exp $
+
+*cpl-6.3.1 (07 Jun 2013)
+
+  07 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +cpl-6.3.1.ebuild:
+  Version bump
 
 *cpl-6.2 (05 Dec 2012)
 
diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest
index a25db1a54625..6dde8cfe5517 100644
--- a/sci-astronomy/cpl/Manifest
+++ b/sci-astronomy/cpl/Manifest
@@ -5,14 +5,16 @@ AUX cpl-6.1.1-check-shared-libs.patch 1010 SHA256 99d448ed80ad6139bb989ffc718942
 AUX cpl-6.1.1-use-system-ltdl.patch 1296 SHA256 55bd2aa8072e621d6a7e4e939f8e6831c598c7000f739756520ff174e1d6ecaf SHA512 bfa2d0f6cadcf7e817314a6a3d587f99b298ea7f1fd919f5c7ef6a4a133a631da7a039f77f572918029ee8284d025a808ff3851112e5836ab824afa5e519ac1e WHIRLPOOL a1ee4c34fde903f14f6805cb312951ead0fa3b1bfaf9b78abbad4e4063d2f15def568b24401695ceeb0613fce933f5fba7cb239d6933b4d5cfeb262fd0a5b1a0
 DIST cpl-6.1.1.tar.gz 2846557 SHA256 74250d8459dcee4a0b814488d3f0f5691bf9888fde3931b66033673575eb95e7 SHA512 1b3156091e1f560d8e24182421fd058772817c057adae479a839007d56c2c887ffa409f31d76120d0ccb06f5ff0260e1d5d2d94d4dd2769768894db1af0e0832 WHIRLPOOL dedaa385c92c4276d745aa163b89061d9d0cf416f73081327e2009afaed4f7010f10b13c30b23d6e5d1a0a8d4e2e5e6fc05bbccc8d2cc5284b275729bf425a85
 DIST cpl-6.2.tar.gz 2909445 SHA256 cd756302ee3990221031b34d343457ea1c4952de968c8b5c74b3830c7021426f SHA512 1ebda47d8784a65e64bbbf219d3d2e7cf1a6c050dfb290fa9dd319597fbcc405bfd14962bf6994d0a720194e4b979bdc5e7c1db439b994158831f6be6cf380e4 WHIRLPOOL 68fc331e7b48722e4b05254dab35b3033e431ca8d79a0fe82a9e593cb4f97c766ed62fa422b0b8769169f6323737403e462070850931d28daa80e2dbaf261882
+DIST cpl-6.3.1.tar.gz 2981414 SHA256 457d54d01cf356e9898fb2f226f057099a481e183a2eaabd34a7b4c865e10089 SHA512 b597968978ca87048b25ee7fd8ff6ebb483e1fd4c6c4fb515720bf468fe67e7b8a25cc9bf7141c18520ba37dcde9654bd5b46d9adcacba8b51780ff671bcdf76 WHIRLPOOL 1f5c224daaa79c689196cfdf2825574881f060d0e5c2ea6c48937a33c5feaec404f30c5f0abf48d352f0240255accdec1223a9c7b11b93b410f1d5e38a8c7e96
 EBUILD cpl-6.1.1.ebuild 1677 SHA256 38c8ff4d1a0463f53221bab84224e2d60c7ec47f9ab238d25b81b6846d2ddffd SHA512 2e1b475fc1a852764ec578de0aab859c7d39aabcab2c01444ba5c59586e2ba01b9a8f8022d1cffc391c78dee4be814cb730ac913af39f0571471c4affb5e8c37 WHIRLPOOL ee55d2ac67ef6ac65c61209419312581867d48cc2c398a2dc533a8a07ece6a744b027c24d8b3b78d312e9c88c070d669566483ca6e1a2f702f1df28e6b4ade6c
 EBUILD cpl-6.2.ebuild 1748 SHA256 08f5093317bd9120f77f1a0604cdb6e62ca4281785ff5c803768b2d5f8b958a7 SHA512 6f95f8b6782cb5dca88fa1256a67193b9000b9bf6c6e761f8fb40563aae252ce07a94e894b7062d2d3bf862eceb837b0000fa26c75c779e99d38044d4c5f88a1 WHIRLPOOL a37dd32de3e7f0b942d0796dcbf5e174adf0de0d2c388a4ba66150aef95b55735789a88d7ea87ad193f7531107dee5e6f6297495886482cd1f8063b653d3e17b
-MISC ChangeLog 2788 SHA256 739ff032ee4a01a84058e5047cb8d44e35c8225014b1ec8f840c8ecff6cd9dc4 SHA512 543efbf358db7a16922686ab2702d57c6b806cdeeb8be2431038195fa7a5d5a574bfd7e1075ebaafed02fc70a3d891bb081eec4384e759c5cd1d78e501d757f2 WHIRLPOOL 5e161149beb3024e6d4f4c2454a2f9e4a2867ba4a0b2a9e1530b3b40399eab3bf26f12c42464791eae505817f20d4d8c28f453abb797754145b28f26aee10e6f
+EBUILD cpl-6.3.1.ebuild 1845 SHA256 f0b0fdd626bac3d0c5177e43b70d60c12192eb7f00ab3dce5a54093edef3cc9e SHA512 c654dfd50161710ab3188271b4256535280e08eff26eab652722d349387f3f8b65a6178f9fae232189fceb9c0d0cc5c993a2b0cb8ff8345163973020e220ded7 WHIRLPOOL f4e72aefef3aa09985d333a097f2ab8ad4012deacce8a72295bd5f56bc6b2b208fd868fcdd37d28624d6c52db46576a919e386852902ec175ce60a96cc24571b
+MISC ChangeLog 2904 SHA256 cb3103f726f880f3eb1c18c382f397f7ffc95f8313a8be1c2117b776f45152d8 SHA512 3e2794fee358d4f85d3f5f0150df4c3dea37fdeb55dd893d2235ca2ee6779bd1bc96d6ba8809841889667b0a0f3e959efb05793815795e98aedb9382e5a9f0eb WHIRLPOOL 561b367a020d4eb6f85272835933a3d10a33c2f2fa2daad0474df6119bda003bf4c03688539fa547819737fb8b4c31691aafe2d4dcc52fee57b680f6a7db14a3
 MISC metadata.xml 979 SHA256 37431826b0c9d429427342e34cc1dc25535068b13d2875ea24dc4156fcaa879e SHA512 15e281ea3ebc94ba0a94dd8a5825515aa6fdd70995e2a4c85da8bb27188d542f68defe8098fe3d7258c8525f19e1799b1ffe266db731d6b5c3ff6290241baf53 WHIRLPOOL 3b76dbc1ea968a4717d46da67c4505e62e6e8d4ea6138eb71eab9223cc4eb3083ff9dcb810d4285f4dd75f07c3698b7a8da2d31ba6d555c9ac99cefdc3c4cd2e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlC/gvsACgkQ1ycZbhPLE2ApxACbBZWnlG47JieyDkcWR46vPeBu
-SA0An3LG4Tb+XyUcpLyoyjEzOmTxxjzB
-=5vf7
+iEYEAREIAAYFAlGybYAACgkQ1ycZbhPLE2CEQACePYbtqMxvQKEeYun+trlg4Ws/
+YYQAn3Wkwk/vlyMRdw+OpocHz/l9D7VF
+=p2wq
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/cpl/cpl-6.3.1.ebuild b/sci-astronomy/cpl/cpl-6.3.1.ebuild
new file mode 100644
index 000000000000..350617ac5936
--- /dev/null
+++ b/sci-astronomy/cpl/cpl-6.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-6.3.1.ebuild,v 1.1 2013/06/07 23:32:10 bicatali Exp $
+
+EAPI=5
+
+JAVA_PKG_OPT_USE=gasgano
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils java-pkg-opt-2 autotools-utils
+
+DESCRIPTION="ESO common pipeline library for astronomical data reduction"
+HOMEPAGE="http://www.eso.org/sci/software/cpl/"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gasgano static-libs threads"
+
+RDEPEND="
+	>=sci-astronomy/wcslib-4.8.4
+	>=sci-libs/cfitsio-3.310
+	>=sci-libs/fftw-3.1.2
+	gasgano? ( sci-astronomy/gasgano )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
+	"${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
+)
+
+src_prepare() {
+	# bug 422455 and remove cpu chcking
+	sed -i \
+		-e '/AM_C_PROTOTYPES/d' \
+		-e '/CPL_CHECK_CPU/d' \
+		configure.ac libcext/configure.ac || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		--disable-ltdl-install
+		--without-included-ltdl
+		--with-cfitsio="${EPREFIX}/usr"
+		--with-wcs="${EPREFIX}/usr"
+		--with-fftw="${EPREFIX}/usr"
+		$(use_enable doc maintainer-mode)
+		$(use_enable threads)
+	)
+	if use gasgano; then
+		myeconfargs+=(
+			--enable-gasgano
+			--with-gasgano="${EPREFIX}/usr"
+			--with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
+			--with-java="$(java-config -O)"
+		)
+	else
+		myeconfargs+=( --disable-gasgano )
+	fi
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile all $(use doc && echo html)
+}
+
+src_install() {
+	autotools-utils_src_install all $(use doc && echo install-html)
+}