Version bump

Package-Manager: portage-2.2.8-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 63154af509a5..7a9f655447a8 100644
--- a/sci-astronomy/cpl/ChangeLog
+++ b/sci-astronomy/cpl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/cpl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.14 2013/06/11 17:40:51 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.15 2014/03/03 20:50:46 bicatali Exp $
+
+*cpl-6.4 (03 Mar 2014)
+
+  03 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> +cpl-6.4.ebuild:
+  Version bump
 
   11 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> -cpl-6.1.1.ebuild,
   -cpl-6.2.ebuild:
diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest
index 0a72c696abd8..a7a25d68abc3 100644
--- a/sci-astronomy/cpl/Manifest
+++ b/sci-astronomy/cpl/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
 AUX cpl-6.1.1-check-shared-libs.patch 1010 SHA256 99d448ed80ad6139bb989ffc718942570dc8c2646e3936939c9fb6797deb92a5 SHA512 40d060e441222328e92508eef25fa50eea37600d4bfb9f422d47e5cafac115a9e82994ff74e3ca17124b5b83d8cec19b2f681709dbfc1ec975841a74fd273903 WHIRLPOOL 23fc6e83b59e6c10e512d93bde8ff2d62c5bc4a1b3390dea163e6c94f03bc2eb21fe3db12a61d3d869d71f59493f77ff6fdcab416ff564542d436b7850e9a7ad
 AUX cpl-6.1.1-use-system-ltdl.patch 1296 SHA256 55bd2aa8072e621d6a7e4e939f8e6831c598c7000f739756520ff174e1d6ecaf SHA512 bfa2d0f6cadcf7e817314a6a3d587f99b298ea7f1fd919f5c7ef6a4a133a631da7a039f77f572918029ee8284d025a808ff3851112e5836ab824afa5e519ac1e WHIRLPOOL a1ee4c34fde903f14f6805cb312951ead0fa3b1bfaf9b78abbad4e4063d2f15def568b24401695ceeb0613fce933f5fba7cb239d6933b4d5cfeb262fd0a5b1a0
 DIST cpl-6.3.1.tar.gz 2981414 SHA256 457d54d01cf356e9898fb2f226f057099a481e183a2eaabd34a7b4c865e10089 SHA512 b597968978ca87048b25ee7fd8ff6ebb483e1fd4c6c4fb515720bf468fe67e7b8a25cc9bf7141c18520ba37dcde9654bd5b46d9adcacba8b51780ff671bcdf76 WHIRLPOOL 1f5c224daaa79c689196cfdf2825574881f060d0e5c2ea6c48937a33c5feaec404f30c5f0abf48d352f0240255accdec1223a9c7b11b93b410f1d5e38a8c7e96
+DIST cpl-6.4.tar.gz 3012686 SHA256 af3024bccf70632df613a6aff475d3614983cdac31211614fb0412217af0b79f SHA512 26170c144cd72c7b597286458fdbb5c91ebdfff4362d095b47035a8569f930ff5956ffd6b7f86ea066d8dbd6b78ae0569eba5ce6a5c6a20381478e188161ead8 WHIRLPOOL be59b8c9347a701573da97a6e142d725332a6c9f3de291eb6982706cae33d14c0f1edb23a3467a656e1378558e3292c8deba19f2a17a901fe6217f974a229c54
 EBUILD cpl-6.3.1.ebuild 1845 SHA256 f0b0fdd626bac3d0c5177e43b70d60c12192eb7f00ab3dce5a54093edef3cc9e SHA512 c654dfd50161710ab3188271b4256535280e08eff26eab652722d349387f3f8b65a6178f9fae232189fceb9c0d0cc5c993a2b0cb8ff8345163973020e220ded7 WHIRLPOOL f4e72aefef3aa09985d333a097f2ab8ad4012deacce8a72295bd5f56bc6b2b208fd868fcdd37d28624d6c52db46576a919e386852902ec175ce60a96cc24571b
-MISC ChangeLog 3012 SHA256 449268c2b20f5557fdde1f041a75a33429545906584036a15b227be3658a11e8 SHA512 893279f03843beee1f9c65b5ef663d6eb9cac49f6539a60d2df0da36c48d69e9a55ea2a2ae4a493e965f4b31820968f7fba6bcbff2aea881054453f62639d8fa WHIRLPOOL 36f462cd156d0aaed5baaa2306fdcc264fdda41342cf65e46663ccb095dc3c617ddab2770ec17fbd618f02dfcd08987ec7ce10e1e12372dc716b5f91f71fc653
+EBUILD cpl-6.4.ebuild 1846 SHA256 28da2955ee6c5809da32fd033d08678f81e9e3ee43efb6656abeb9762745dfb3 SHA512 cdcf39eedf1622af1ba564a8ca61a2e12f91a54237e7b196f4525c08106840fac19c5267a50b5a46bf1e801cc5bdbc0915a09d9bb43f1fc24b57e253c784841f WHIRLPOOL 9c8849e95ee98a146986668038d2266d27cf5c4c9f7f9f7d4a61719336b2e9148c8642f317db374088d7985c7650a02130d9c249a4545c7c1984cf7cc6c42c75
+MISC ChangeLog 3124 SHA256 484596dbe68fb320933fdf44e8141568f178f3ff3c196571eabb5aece3acdaad SHA512 a7dcdffdcef596b988e618487efa5546228ac236fa809492b8a5c12af7d5bfadc33259fe597735ae86ab74c5db6481b0b4de458f9a79f3266cc79e9bd70d349b WHIRLPOOL bd016ebc681638df6b0f8c3236e40245eb79859a0bd7d1a4d018cc4515e9aec5370f72c920c8261b6ffc53d762ca8ead4f0b51e7ce941bacbd060c21ad1515c5
 MISC metadata.xml 979 SHA256 37431826b0c9d429427342e34cc1dc25535068b13d2875ea24dc4156fcaa879e SHA512 15e281ea3ebc94ba0a94dd8a5825515aa6fdd70995e2a4c85da8bb27188d542f68defe8098fe3d7258c8525f19e1799b1ffe266db731d6b5c3ff6290241baf53 WHIRLPOOL 3b76dbc1ea968a4717d46da67c4505e62e6e8d4ea6138eb71eab9223cc4eb3083ff9dcb810d4285f4dd75f07c3698b7a8da2d31ba6d555c9ac99cefdc3c4cd2e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlG3YSQACgkQ1ycZbhPLE2AZ6wCfRICQ7WOCtwX/LFrluko5imEo
-z1kAnRpjHrTXcNHamuqoROL5CsDkpmj/
-=0vXJ
+iEYEAREIAAYFAlMU6ycACgkQ1ycZbhPLE2CU3QCgsywazlt9+gzq88qslRuKCnsQ
+G48AoKgRE0EPIfGv2FnGCxMrysL54Vnn
+=7UgL
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/cpl/cpl-6.4.ebuild b/sci-astronomy/cpl/cpl-6.4.ebuild
new file mode 100644
index 000000000000..0643d0c52d74
--- /dev/null
+++ b/sci-astronomy/cpl/cpl-6.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-6.4.ebuild,v 1.1 2014/03/03 20:50:46 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/20"
+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)
+}