Version bump. Now adds the data package

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

6 files changed, 93 insertions, 23 deletions

diff --git a/sci-astronomy/casacore/ChangeLog b/sci-astronomy/casacore/ChangeLog
index 47318f9c2e60..114dd6719096 100644
--- a/sci-astronomy/casacore/ChangeLog
+++ b/sci-astronomy/casacore/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/casacore
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/casacore/ChangeLog,v 1.3 2012/05/11 21:51:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/casacore/ChangeLog,v 1.4 2012/06/05 22:35:34 bicatali Exp $
+
+*casacore-1.5.0 (05 Jun 2012)
+
+  05 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/1.5.0-gcc47.patch, +files/1.5.0-sysdep.patch, -casacore-1.3.0.ebuild,
+  +casacore-1.5.0.ebuild, metadata.xml:
+  Version bump. Now adds the data package
 
 *casacore-1.4.0 (11 May 2012)
 
diff --git a/sci-astronomy/casacore/Manifest b/sci-astronomy/casacore/Manifest
index c4b165ac5a9d..88214b692653 100644
--- a/sci-astronomy/casacore/Manifest
+++ b/sci-astronomy/casacore/Manifest
@@ -4,16 +4,18 @@ Hash: SHA1
 AUX 1.3.0-headers.patch 1276 RMD160 2c009bf947d9775b5a1bffb031372e6d5e65abf0 SHA1 090ebe620e9a2ccbb48e53bb0c26a35c530e4409 SHA256 179d3e93530f4173769f597ec2dc9e6a86a89daa18f5b7bc9b6dbb7eb5ffdf55
 AUX 1.3.0-implicits.patch 6143 RMD160 ca010a2bff71f94f5d58c5c54d54d333ed42d0a7 SHA1 4cdad33cec9fea64040c76aed2b08ab4f21e51a6 SHA256 88a66a6138a4f97fb23e5da4e7f14999e749d54bec1639e13f6d2ce575e1a932
 AUX 1.3.0-libdir.patch 7892 RMD160 e99c74ac1d7e9bb08243fda4c53d279fe6108041 SHA1 842afa49f59e7bafd8841d6d4ad4c2d1f3140679 SHA256 931a3bf15738b4d6381d2cdccbcf78f46ab48298a369d8ee7e79b09fd8b8cffb
-DIST casacore-1.3.0.tar.bz2 4689830 RMD160 2bc1952bca57958c8f04b1718fd78d2b025d0b59 SHA1 bc60efc5624c3787352cbaa3f22e32c431a0391f SHA256 50d91cd6b817de1e3a263e46ad339cdaa6e0c32bba517888dd707476bb64188a
+AUX 1.5.0-gcc47.patch 862 RMD160 c78fce7016e28ff79025230c0dc1deb4fceef0d2 SHA1 b454c4430aefdcce36804c6271c05c23156644aa SHA256 a314ce2cb93929e4e9e53e948ad404b48400fcef18ab96ecc698e6bb2c48a4e7
+AUX 1.5.0-sysdep.patch 526 RMD160 befe07537e1cfd163775c517c22bd27be614ffdb SHA1 0b7914bf02f03de8ce1bd78b927f8c89a1ff84f5 SHA256 99899be7d3973ec5575a11f35bf15cbe318efb83b3467199f27532b1348805be
 DIST casacore-1.4.0.tar.bz2 6334470 RMD160 3d487e4af1bd93bbc78fb2d2b31b8f35fa002ffb SHA1 ec509bbec6dcd79e7790242b692605a5f2bef2f3 SHA256 0770c93d9319bf48a863d6adb0793ea91a4e64a0e13a73feea919651fcfd080a
-EBUILD casacore-1.3.0.ebuild 1278 RMD160 3264b11f55e6d4c001700cf83cf8118aba5dd084 SHA1 c5a89737df6d83e52dbbe6428ea01bea21708021 SHA256 935dac7cccaedff73bbd5d909eb01768a5ebb0739429fc8e01ec673fd5a64195
+DIST casacore-1.5.0.tar.bz2 6327906 RMD160 1f7b8e0e376efb96d7369fdda1dea94250fffb50 SHA1 dca7a451c02b141b9e338ba4ffa713693693ce42 SHA256 95ec894b5721ee2391c0d79fc45528c431edb2c6b335ad67fe0b6afabf0c70cb
 EBUILD casacore-1.4.0.ebuild 1584 RMD160 c7565917cc219663109711001b046b0d37975801 SHA1 32a2610d2302176b047aaa6abefe9bfe6bfc7048 SHA256 441e351031e102a874c1e93d570dcf3e28060fae0eaa484805f68c5b1cd1906c
-MISC ChangeLog 958 RMD160 a20f354ac1d39b1f5d9b0d10c8a75b3911ca5bcf SHA1 14567c4c5ac606acedfa75c0751b839889b4a433 SHA256 f801649e7f760018c8d5c8a4050fd90378aabf8e4038e65dd3c88041d0ef2a24
-MISC metadata.xml 477 RMD160 0e758bb0088f9992a0203c4756ac6e827ab6af90 SHA1 89cce58a9590f0569014dd1eeb8758940e26fe8a SHA256 ffce283d5a383ec71f5f142173d30989926f8f87bccd66e44f2bcb77248ed680
+EBUILD casacore-1.5.0.ebuild 1763 RMD160 52f387014b46975cf5e7ba6e5668d85e5fa1a049 SHA1 3b1bc906632250b5fe9323f803454f7f3cd849ff SHA256 1919ca79ba8836258bef05ee3628e4b234d342e932e53f21ab183966bbd8de14
+MISC ChangeLog 1206 RMD160 0c783f2d00bb442e7ce8c2d191359c1277ec0010 SHA1 6a1dfa6963a7686d36180db50a1fe6c11460e099 SHA256 ba6060654124eaa6b503bbf226d85bc8ad4262ccefebb12e7fd52013722a529e
+MISC metadata.xml 587 RMD160 55a2eae6c8b3ab4ed8cdd267d39eb1accea213fe SHA1 ba798d1e3ee87e9413629b2fee14569df39ecdd2 SHA256 d21856d684c73246162c6d1642eb56592231f96ac119917f6f13f61d83ea23e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+tigAACgkQ1ycZbhPLE2DyrACgtE4IiActSe/2fAPKvw0ZYYib
-iNMAoLLhslmhlY9tT1cWmhLAqs1lTzUG
-=61Ai
+iEYEARECAAYFAk/OicAACgkQ1ycZbhPLE2A87wCcDXgOv+21gcDeIf9GJFoH+083
+YWQAnidl6/RV8NpOQj64vjIjeLxNi/OM
+=h+ec
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/casacore/casacore-1.3.0.ebuild b/sci-astronomy/casacore/casacore-1.5.0.ebuild
index 7c13257579cf..241e0d654267 100644
--- a/sci-astronomy/casacore/casacore-1.3.0.ebuild
+++ b/sci-astronomy/casacore/casacore-1.5.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/casacore/casacore-1.3.0.ebuild,v 1.3 2012/05/11 21:51:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/casacore/casacore-1.5.0.ebuild,v 1.1 2012/06/05 22:35:34 bicatali Exp $
 
 EAPI=4
 
-inherit cmake-utils eutils
+inherit cmake-utils eutils toolchain-funcs fortran-2
 
 DESCRIPTION="Core libraries for the Common Astronomy Software Applications"
 HOMEPAGE="http://code.google.com/p/casacore/"
@@ -13,30 +13,47 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="doc fftw hdf5 threads test"
+IUSE="+data doc fftw hdf5 openmp threads test"
 
 RDEPEND="sci-libs/cfitsio
 	sci-astronomy/wcslib
+	sys-libs/readline
 	virtual/blas
+	virtual/fortran
 	virtual/lapack
-	sys-libs/readline
-	hdf5? ( sci-libs/hdf5 )
-	fftw? ( >=sci-libs/fftw-3 )"
+	data? ( sci-astronomy/casa-data )
+	fftw? ( >=sci-libs/fftw-3 )
+	hdf5? ( sci-libs/hdf5 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	test? ( sci-astronomy/casa-data )"
 
-PATCHES=( "${FILESDIR}"/${PV}-{headers,implicits,libdir}.patch )
+PATCHES=(
+	"${FILESDIR}"/1.3.0-implicits.patch
+	"${FILESDIR}"/1.3.0-libdir.patch
+	"${FILESDIR}"/1.5.0-sysdep.patch
+	"${FILESDIR}"/1.5.0-gcc47.patch
+)
+
+pkg_setup() {
+	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+		ewarn "You are using gcc but without OpenMP capabilities"
+		die "Need an OpenMP capable compiler"
+	fi
+	fortran-2_pkg_setup
+}
 
 src_configure() {
 	has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
 	mycmakeargs+=(
 		-DENABLE_SHARED=ON
-		-DCMAKE_SKIP_RPATH=ON
+		-DDATA_DIR="${EPREFIX}/usr/share/casa/data"
 		$(cmake-utils_use_build test TESTING)
 		$(cmake-utils_use_use fftw FFTW3)
 		$(cmake-utils_use_use hdf5 HDF5)
 		$(cmake-utils_use_use threads THREADS)
+		$(cmake-utils_use_use openmp OPENMP)
 	)
 	cmake-utils_src_configure
 }
diff --git a/sci-astronomy/casacore/files/1.5.0-gcc47.patch b/sci-astronomy/casacore/files/1.5.0-gcc47.patch
new file mode 100644
index 000000000000..30295d8d0701
--- /dev/null
+++ b/sci-astronomy/casacore/files/1.5.0-gcc47.patch
@@ -0,0 +1,22 @@
+diff -Nur casacore-1.5.0.orig/casa/Arrays/IPosition.h casacore-1.5.0/casa/Arrays/IPosition.h
+--- casacore-1.5.0.orig/casa/Arrays/IPosition.h	2012-03-14 14:30:48.000000000 +0000
++++ casacore-1.5.0/casa/Arrays/IPosition.h	2012-06-05 22:07:39.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include <casa/BasicSL/String.h>
+ #include <vector>
+ #include <cstddef>                  // for ptrdiff_t
++#include <unistd.h> // for ssize_t
+ 
+ namespace casa { //# NAMESPACE CASA - BEGIN
+ 
+diff -Nur casacore-1.5.0.orig/casa/System/Casarc.cc casacore-1.5.0/casa/System/Casarc.cc
+--- casacore-1.5.0.orig/casa/System/Casarc.cc	2011-10-18 08:39:05.000000000 +0100
++++ casacore-1.5.0/casa/System/Casarc.cc	2012-06-05 22:11:31.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ #include <cstdio>
++#include <unistd.h>
+ 
+ #define USE_FLOCK 0
+ #define CASARC_DEBUG 0
diff --git a/sci-astronomy/casacore/files/1.5.0-sysdep.patch b/sci-astronomy/casacore/files/1.5.0-sysdep.patch
new file mode 100644
index 000000000000..35eef56daf08
--- /dev/null
+++ b/sci-astronomy/casacore/files/1.5.0-sysdep.patch
@@ -0,0 +1,17 @@
+--- casacore-1.5.0/mirlib/sysdep.h.orig	2012-06-05 05:35:29.000000000 +0100
++++ casacore-1.5.0/mirlib/sysdep.h	2012-06-05 05:37:07.000000000 +0100
+@@ -28,7 +28,8 @@
+  *                removed 'trace' clutter from the old multiflow
+  *    pjt 24jun01 PPC/powerpc is a BIGENDIAN (linux) machine
+  */
+-
++#ifndef MIRIAD_SYSDEP_H
++#define MIRIAD_SYSDEP_H
+ #ifndef Null
+ #define Null '\0'
+ #endif
+@@ -133,3 +134,4 @@
+ #  define unpack32_c(a,b,c) memcpy((char *)(b),(a),sizeof(int)*(c))
+ #endif
+ #endif
++#endif /* MIRIAD_SYSDEP_H */
diff --git a/sci-astronomy/casacore/metadata.xml b/sci-astronomy/casacore/metadata.xml
index 5e6d69344baa..3f17c8233202 100644
--- a/sci-astronomy/casacore/metadata.xml
+++ b/sci-astronomy/casacore/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-astronomy</herd>
-	<longdescription lang="en">A set of libraries for the the Common Astronomy Software
+<herd>sci-astronomy</herd>
+<longdescription lang="en">
+  A set of libraries for the the Common Astronomy Software
   Applications for radioastronomy. This project contains C++ libraries
-  which were the code of the discontinued AIPS++ package.</longdescription>
-	<upstream>
-		<remote-id type="google-code">casacore</remote-id>
-	</upstream>
+  which were the code of the discontinued AIPS++ package.
+</longdescription>
+<upstream>
+  <remote-id type="google-code">casacore</remote-id>
+</upstream>
+<use>
+  <flag name="data">Installs measures and data (pulls <pkg>sci-astronomy/casa-data</pkg>)</flag>
+</use>
 </pkgmetadata>