* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/casacore/, sci-astronomy/casacore/files/
@ 2016-02-26 1:08 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2016-02-26 1:08 UTC (permalink / raw
To: gentoo-commits
commit: 761ed9021b56763e34df0caa7b86fcca3df7f2b7
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 02:03:09 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 02:03:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761ed902
sci-astronomy/casacore: Version bump and re-keywording
Package-Manager: portage-2.2.27
sci-astronomy/casacore/Manifest | 2 +-
sci-astronomy/casacore/casacore-1.5.0-r1.ebuild | 72 --------
sci-astronomy/casacore/casacore-2.0.3.ebuild | 82 +++++++++
sci-astronomy/casacore/files/1.3.0-implicits.patch | 166 -----------------
sci-astronomy/casacore/files/1.3.0-libdir.patch | 196 ---------------------
sci-astronomy/casacore/files/1.5.0-gcc47.patch | 22 ---
sci-astronomy/casacore/files/1.5.0-gcc48.patch | 11 --
sci-astronomy/casacore/files/1.5.0-sysdep.patch | 17 --
sci-astronomy/casacore/metadata.xml | 1 +
9 files changed, 84 insertions(+), 485 deletions(-)
diff --git a/sci-astronomy/casacore/Manifest b/sci-astronomy/casacore/Manifest
index 204609b..bed219b 100644
--- a/sci-astronomy/casacore/Manifest
+++ b/sci-astronomy/casacore/Manifest
@@ -1 +1 @@
-DIST casacore-1.5.0.tar.bz2 6327906 SHA256 95ec894b5721ee2391c0d79fc45528c431edb2c6b335ad67fe0b6afabf0c70cb SHA512 a3e108f525775ec5022005ce73810a6bc8eb0a6abcbcaed96f2af3ba7911a3675872708ea53afbfb8a143312709a336aabca21cf1fea0396cc4adc56ba08f3f1 WHIRLPOOL c0aa888a9123ec5b7a5e0eedc8c5fe88241c6e7a9f9d138361e68b0f2da17a8a6275250a07eaa7ac55d2a7c17145478ca1668ae8ce11fb17def61e86afb534b8
+DIST casacore-2.0.3.tar.gz 7250964 SHA256 44746633113e16f8daabb38c404d2b316b1acfd9304a4df91cb1849d2786d726 SHA512 f434e52cfd2903730c18857126c11eb4fbfe5f7a0555d82f423562d6f41c682262c7bf4775954b16ed60d872a067fc5495ac9aaa17deb9555381436b1a26c741 WHIRLPOOL 8836a27f07f231d676879c69504a32dbd893092a9378ac259698ffe07ee050cedb24dd298b38e4ef86b1c6ea4fac42e9941cd6e9317cf1d404da897c34b6866f
diff --git a/sci-astronomy/casacore/casacore-1.5.0-r1.ebuild b/sci-astronomy/casacore/casacore-1.5.0-r1.ebuild
deleted file mode 100644
index 182b3c5..0000000
--- a/sci-astronomy/casacore/casacore-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils toolchain-funcs fortran-2
-
-DESCRIPTION="Core libraries for the Common Astronomy Software Applications"
-HOMEPAGE="https://github.com/casacore/casacore"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-# de-keyworded until casa-data catches up
-KEYWORDS=""
-SLOT="0"
-IUSE="+data doc fftw hdf5 openmp threads test"
-
-RDEPEND="
- sci-libs/cfitsio:0=
- sci-astronomy/wcslib:0=
- sys-libs/readline:0=
- virtual/blas
- virtual/lapack
- data? ( sci-astronomy/casa-data )
- fftw? ( sci-libs/fftw:3.0= )
- hdf5? ( sci-libs/hdf5:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( sci-astronomy/casa-data )"
-
-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
- "${FILESDIR}"/1.5.0-gcc48.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
- local mycmakeargs=(
- -DENABLE_SHARED=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
-}
-
-src_compile() {
- cmake-utils_src_compile
- use doc && doxygen doxygen.cfg
-}
-
-src_install(){
- cmake-utils_src_install
- use doc && dohtml -r doc/html/*
-}
diff --git a/sci-astronomy/casacore/casacore-2.0.3.ebuild b/sci-astronomy/casacore/casacore-2.0.3.ebuild
new file mode 100644
index 0000000..e795684
--- /dev/null
+++ b/sci-astronomy/casacore/casacore-2.0.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# python3 is experimental and only one python is supported
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils toolchain-funcs fortran-2 python-single-r1
+
+DESCRIPTION="Core libraries for the Common Astronomy Software Applications"
+HOMEPAGE="https://github.com/casacore/casacore"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="c++11 +data doc fftw hdf5 openmp python threads test"
+
+RDEPEND="
+ sci-astronomy/wcslib:0=
+ sci-libs/cfitsio:0=
+ sys-libs/readline:0=
+ virtual/blas
+ virtual/lapack
+ data? ( sci-astronomy/casa-data )
+ fftw? ( sci-libs/fftw:3.0= )
+ hdf5? ( sci-libs/hdf5:0= )
+ python? ( dev-libs/boost:0=[python,${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( sci-astronomy/casa-data )"
+
+pkg_pretend() {
+ if [[ $(tc-getCC)$ == *gcc* ]] && [[ ${MERGE_TYPE} != binary ]]; then
+ use c++11 && [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) && \
+ die "You are using gcc but gcc-4.7 or higher is required for C++11"
+ use openmp && ! tc-has-openmp && \
+ die "You are using gcc but without OpenMP capabilities that you requested"
+ fi
+}
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ fortran-2_pkg_setup
+}
+
+src_configure() {
+ has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+ local mycmakeargs=(
+ -DENABLE_SHARED=ON
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DDATA_DIR="${EPREFIX}/usr/share/casa/data"
+ -DBUILD_PYTHON="$(usex python)"
+ -DBUILD_TESTING="$(usex test)"
+ -DCXX11="$(usex c++11)"
+ -DUSE_FFTW3="$(usex fftw)"
+ -DUSE_HDF5="$(usex hdf5)"
+ -DUSE_OPENMP="$(usex openmp)"
+ -DUSE_THREADS="$(usex threads)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use doc; then
+ doxygen doxygen.cfg || die
+ fi
+}
+
+src_install(){
+ cmake-utils_src_install
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ doins -r doc/html
+ fi
+}
diff --git a/sci-astronomy/casacore/files/1.3.0-implicits.patch b/sci-astronomy/casacore/files/1.3.0-implicits.patch
deleted file mode 100644
index 0ff631a..0000000
--- a/sci-astronomy/casacore/files/1.3.0-implicits.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -Nur casacore-1.3.0.orig/casa/HDF5/HDF5DataSet.cc casacore-1.3.0/casa/HDF5/HDF5DataSet.cc
---- casacore-1.3.0.orig/casa/HDF5/HDF5DataSet.cc 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/casa/HDF5/HDF5DataSet.cc 2011-05-16 17:29:12.000000000 +0100
-@@ -174,7 +174,7 @@
- H5Pset_chunk(itsPLid, rank, cs.storage());
- // Create the data set.
- setHid (H5Dcreate(parentHid, name.chars(), itsDataType.getHidFile(),
-- itsDSid, NULL, itsPLid, NULL));
-+ itsDSid, 0, itsPLid, 0));
- if (! isValid()) {
- throw HDF5Error("Data set array " + name + " could not be created");
- }
-@@ -185,7 +185,7 @@
- itsParent = &parentHid;
- setName (name);
- // Open the dataset.
-- setHid (H5Dopen(parentHid, name.chars(), NULL));
-+ setHid (H5Dopen(parentHid, name.chars(), 0));
- if (! isValid()) {
- throw HDF5Error("Data set array " + name + " does not exist");
- }
-@@ -271,7 +271,7 @@
-
- DataType HDF5DataSet::getDataType (hid_t parentHid, const String& name)
- {
-- hid_t id = H5Dopen(parentHid, name.chars(), NULL);
-+ hid_t id = H5Dopen(parentHid, name.chars(), 0);
- if (id < 0) {
- throw HDF5Error("Data set array " + name + " does not exist");
- }
-diff -Nur casacore-1.3.0.orig/casa/HDF5/test/tHDF5.cc casacore-1.3.0/casa/HDF5/test/tHDF5.cc
---- casacore-1.3.0.orig/casa/HDF5/test/tHDF5.cc 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/casa/HDF5/test/tHDF5.cc 2011-05-16 17:29:12.000000000 +0100
-@@ -126,7 +126,7 @@
- H5Pset_chunk (plId, rank, chunkShp);
- // Create the data set.
- setId = H5Dcreate (fileId, "dataset", typeIdFile,
-- dsId, NULL, plId, NULL);
-+ dsId, 0, plId, 0);
- check (setId, "Failed to create dataset");
- }
-
-@@ -136,7 +136,7 @@
- typeIdFile = H5Tcopy (H5T_NATIVE_FLOAT);
- typeIdMem = H5Tcopy (typeIdFile);
- // Open the dataset.
-- setId = H5Dopen (fileId, "dataset", NULL);
-+ setId = H5Dopen (fileId, "dataset", 0);
- check (setId, "Failed to open dataset");
- // Get the data space (for the shape).
- dsId = H5Dget_space(setId);
-diff -Nur casacore-1.3.0.orig/mirlib/bug.c casacore-1.3.0/mirlib/bug.c
---- casacore-1.3.0.orig/mirlib/bug.c 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/mirlib/bug.c 2011-05-16 17:29:12.000000000 +0100
-@@ -12,6 +12,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+void habort_c();
-
- static char *errmsg_c();
- void bug_c();
-diff -Nur casacore-1.3.0.orig/mirlib/dio.c casacore-1.3.0/mirlib/dio.c
---- casacore-1.3.0.orig/mirlib/dio.c 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/mirlib/dio.c 2011-05-16 17:29:12.000000000 +0100
-@@ -45,6 +45,7 @@
- extern int errno;
- #endif
- #include <errno.h>
-+void bug_c();
-
- #define MAXPATH 128
-
-diff -Nur casacore-1.3.0.orig/mirlib/hio.c casacore-1.3.0/mirlib/hio.c
---- casacore-1.3.0.orig/mirlib/hio.c 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/mirlib/hio.c 2011-05-16 17:29:12.000000000 +0100
-@@ -36,7 +36,7 @@
-
- #include <stdlib.h>
- #include <string.h>
--
-+#include "sysdep.h"
- #include "hio.h"
-
- #define private static
-diff -Nur casacore-1.3.0.orig/mirlib/maskio.c casacore-1.3.0/mirlib/maskio.c
---- casacore-1.3.0.orig/mirlib/maskio.c 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/mirlib/maskio.c 2011-05-16 17:29:12.000000000 +0100
-@@ -25,7 +25,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--
-+void bug_c();
-+void bugno_c();
-
- private void mkfill();
- void mkflush_c();
-diff -Nur casacore-1.3.0.orig/mirlib/scrio.c casacore-1.3.0/mirlib/scrio.c
---- casacore-1.3.0.orig/mirlib/scrio.c 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/mirlib/scrio.c 2011-05-16 17:29:12.000000000 +0100
-@@ -9,6 +9,8 @@
- /************************************************************************/
-
- #include "io.h"
-+void bug_c();
-+void bugno_c();
-
- /* char *sprintf(); */
- #include <stdio.h>
-@@ -100,7 +102,7 @@
- /************************************************************************/
- void scrwrite_c(handle,buffer,offset,length)
- int handle,offset,length;
--float *buffer;
-+Const float *buffer;
- /**scrwrite -- Write real data to the scratch file. */
- /*:scratch-i/o */
- /*+ FORTRAN call sequence:
-diff -Nur casacore-1.3.0.orig/mirlib/sysdep.h casacore-1.3.0/mirlib/sysdep.h
---- casacore-1.3.0.orig/mirlib/sysdep.h 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/mirlib/sysdep.h 2011-05-16 17:41:07.000000000 +0100
-@@ -131,5 +131,13 @@
- # define unpackd_c(a,b,c) memcpy((char *)(b),(a),sizeof(double)*(c))
- # define pack32_c(a,b,c) memcpy((b),(char *)(a),sizeof(int)*(c))
- # define unpack32_c(a,b,c) memcpy((char *)(b),(a),sizeof(int)*(c))
-+#else
-+void pack32_c(int* in, char* out, int n);
-+void unpack32_c(char* in, int* out,int n);
-+void packr_c(float* in, char* out, int n);
-+void unpackr_c(char* in, float* out, int n);
-+void packd_c(double* in, char* out, int n);
-+void unpackd_c(char* in, double* out, int n);
- #endif
-+
- #endif
-diff -Nur casacore-1.3.0.orig/mirlib/xyio.c casacore-1.3.0/mirlib/xyio.c
---- casacore-1.3.0.orig/mirlib/xyio.c 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/mirlib/xyio.c 2011-05-16 17:29:12.000000000 +0100
-@@ -37,7 +37,7 @@
- #define Strcpy (void)strcpy
- void bug_c(),bugno_c();
- void rdhdi_c(),wrhdi_c();
--void mkclose_c(),mkwrite_c();
-+void mkclose_c(),mkwrite_c(),mkflush_c();
- char *mkopen_c();
- int mkread_c();
- static void xymkopen_c();
-diff -Nur casacore-1.3.0.orig/mirlib/xyzio.c casacore-1.3.0/mirlib/xyzio.c
---- casacore-1.3.0.orig/mirlib/xyzio.c 2011-05-16 02:24:06.000000000 +0100
-+++ casacore-1.3.0/mirlib/xyzio.c 2011-05-16 17:29:12.000000000 +0100
-@@ -55,6 +55,14 @@
- #include <string.h>
- #include <stdlib.h>
- void bug_c();
-+void bugno_c();
-+char *mkopen_c(int tno, char* name, char* status);
-+void mkclose_c(char *handle);
-+int mkread_c(char* handle, int mode, int* flags, int offset, int n, int nsize);
-+void mkwrite_c(char* handle, int mode, int* flags, int offset, int n, int nsize);
-+void mkflush_c(char* handle);
-+int limprint(char *string, int lower[], int upper[]);
-+int ferr(char* string, char arg );
- #define check(x) if(x)bugno_c('f',x)
-
-
diff --git a/sci-astronomy/casacore/files/1.3.0-libdir.patch b/sci-astronomy/casacore/files/1.3.0-libdir.patch
deleted file mode 100644
index e024398..0000000
--- a/sci-astronomy/casacore/files/1.3.0-libdir.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff -Nur casacore-1.3.0.orig/casa/CMakeLists.txt casacore-1.3.0/casa/CMakeLists.txt
---- casacore-1.3.0.orig/casa/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/casa/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -209,8 +209,8 @@
-
- install (
- TARGETS casa_casa
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/components/CMakeLists.txt casacore-1.3.0/components/CMakeLists.txt
---- casacore-1.3.0.orig/components/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/components/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -30,8 +30,8 @@
- install (
- TARGETS casa_components
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/coordinates/CMakeLists.txt casacore-1.3.0/coordinates/CMakeLists.txt
---- casacore-1.3.0.orig/coordinates/CMakeLists.txt 2011-05-17 06:03:05.000000000 +0100
-+++ casacore-1.3.0/coordinates/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -25,8 +25,8 @@
-
- install (TARGETS casa_coordinates
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/derivedmscal/CMakeLists.txt casacore-1.3.0/derivedmscal/CMakeLists.txt
---- casacore-1.3.0.orig/derivedmscal/CMakeLists.txt 2011-05-17 06:03:05.000000000 +0100
-+++ casacore-1.3.0/derivedmscal/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -14,8 +14,8 @@
-
- install (TARGETS casa_derivedmscal
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/fits/CMakeLists.txt casacore-1.3.0/fits/CMakeLists.txt
---- casacore-1.3.0.orig/fits/CMakeLists.txt 2011-05-17 06:03:05.000000000 +0100
-+++ casacore-1.3.0/fits/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -34,8 +34,8 @@
-
- install (TARGETS casa_fits
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/images/CMakeLists.txt casacore-1.3.0/images/CMakeLists.txt
---- casacore-1.3.0.orig/images/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/images/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -71,8 +71,8 @@
- install (
- TARGETS casa_images
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/lattices/CMakeLists.txt casacore-1.3.0/lattices/CMakeLists.txt
---- casacore-1.3.0.orig/lattices/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/lattices/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -67,8 +67,8 @@
-
- install (TARGETS casa_lattices
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/measures/CMakeLists.txt casacore-1.3.0/measures/CMakeLists.txt
---- casacore-1.3.0.orig/measures/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/measures/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -69,8 +69,8 @@
- install (
- TARGETS casa_measures
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/mirlib/CMakeLists.txt casacore-1.3.0/mirlib/CMakeLists.txt
---- casacore-1.3.0.orig/mirlib/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/mirlib/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -22,8 +22,8 @@
- install (
- TARGETS casa_mirlib
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/ms/CMakeLists.txt casacore-1.3.0/ms/CMakeLists.txt
---- casacore-1.3.0.orig/ms/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/ms/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -148,8 +148,8 @@
-
- install (TARGETS casa_ms
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/msfits/CMakeLists.txt casacore-1.3.0/msfits/CMakeLists.txt
---- casacore-1.3.0.orig/msfits/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/msfits/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -29,8 +29,8 @@
-
- install (
- TARGETS casa_msfits
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/scimath/CMakeLists.txt casacore-1.3.0/scimath/CMakeLists.txt
---- casacore-1.3.0.orig/scimath/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/scimath/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -38,8 +38,8 @@
-
- install (TARGETS casa_scimath
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/scimath_f/CMakeLists.txt casacore-1.3.0/scimath_f/CMakeLists.txt
---- casacore-1.3.0.orig/scimath_f/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/scimath_f/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -34,8 +34,8 @@
-
- install (
- TARGETS casa_scimath_f
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
-diff -Nur casacore-1.3.0.orig/tables/CMakeLists.txt casacore-1.3.0/tables/CMakeLists.txt
---- casacore-1.3.0.orig/tables/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
-+++ casacore-1.3.0/tables/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
-@@ -181,8 +181,8 @@
-
- install (TARGETS casa_tables
- RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib
-+LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-
diff --git a/sci-astronomy/casacore/files/1.5.0-gcc47.patch b/sci-astronomy/casacore/files/1.5.0-gcc47.patch
deleted file mode 100644
index 30295d8..0000000
--- a/sci-astronomy/casacore/files/1.5.0-gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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-gcc48.patch b/sci-astronomy/casacore/files/1.5.0-gcc48.patch
deleted file mode 100644
index dfbe074..0000000
--- a/sci-astronomy/casacore/files/1.5.0-gcc48.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- casa/aipsdef.h.orig 2014-03-06 22:05:25.000000000 +0000
-+++ casa/aipsdef.h 2014-03-06 22:06:09.000000000 +0000
-@@ -91,7 +91,7 @@
- #else
- #define WHATEVER_SUN_TYPEDEF(X)
- #define WHATEVER_TYPENAME typename
--#if defined(AIPS_CRAY_PGI)
-+#if defined(AIPS_CRAY_PGI) || defined(AIPS_GCC4)
- #define WHATEVER_SUN_EXCEPTSPEC(X) throw(X)
- #else
- #define WHATEVER_SUN_EXCEPTSPEC(X)
diff --git a/sci-astronomy/casacore/files/1.5.0-sysdep.patch b/sci-astronomy/casacore/files/1.5.0-sysdep.patch
deleted file mode 100644
index 35eef56..0000000
--- a/sci-astronomy/casacore/files/1.5.0-sysdep.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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 92acc6e..048e5b3 100644
--- a/sci-astronomy/casacore/metadata.xml
+++ b/sci-astronomy/casacore/metadata.xml
@@ -16,5 +16,6 @@
</upstream>
<use>
<flag name="data">Installs measures and data (pulls <pkg>sci-astronomy/casa-data</pkg>)</flag>
+ <flag name="c++11">Build casacore using the C++11 standard</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/casacore/, sci-astronomy/casacore/files/
@ 2017-07-07 20:40 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2017-07-07 20:40 UTC (permalink / raw
To: gentoo-commits
commit: aedade552fd238280d0f29afa6dcbe4c91c1ee26
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 7 15:43:29 2017 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jul 7 20:39:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aedade55
sci-astronomy/casacore: remove buggy old.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sci-astronomy/casacore/Manifest | 1 -
sci-astronomy/casacore/casacore-2.1.0.ebuild | 90 ----------------------
.../casacore/files/casacore-2.1.0-fix-c++14.patch | 45 -----------
.../files/casacore-disable-tpath-test.patch | 49 ------------
4 files changed, 185 deletions(-)
diff --git a/sci-astronomy/casacore/Manifest b/sci-astronomy/casacore/Manifest
index c940c394f98..bbaac6d36c8 100644
--- a/sci-astronomy/casacore/Manifest
+++ b/sci-astronomy/casacore/Manifest
@@ -1,2 +1 @@
-DIST casacore-2.1.0.tar.gz 10173155 SHA256 9c0017e741c1c4b14bc09582867910f750cd76ff2673e0ecd554aa5b2db7acb4 SHA512 ab52bed9ebc5aef79c7b46c963c90fe9db2e7bac82249f99ed0def2496065ae337cdd9359fb9a6c0182fc3faa702f476116bf0edffc54585a3353a43ce6ddd9f WHIRLPOOL cda1fba87a02d5564a3f56c93eaad2c674bc7f8795d4bd56152549174405cd761ef1df5a00d27ebd0d2bf37fe663b17bbd961508607d1a39e1c494795f6fa755
DIST casacore-2.3.0.tar.gz 10326408 SHA256 d8ed5373f5447885be6d3aac72f26cee24a662df5caf4a6cd23e846b79181700 SHA512 48d09e74b0c3885eb9f7bd048f0fd158397f7c6aa2bf9f713af9dbfcf3ce2c5ba0abb9500d3fe1d32977a35e0941b273fbfd8ee69c991a19df264f5f5a28cbb0 WHIRLPOOL c343a6d419e2e39b888141768abba2c7432e58a8751311e70edd856feb71e4ebcd854ea6e47d72505493bc368d022019178b7dd51c7544f725b332b06f521a00
diff --git a/sci-astronomy/casacore/casacore-2.1.0.ebuild b/sci-astronomy/casacore/casacore-2.1.0.ebuild
deleted file mode 100644
index 064b4da1bc6..00000000000
--- a/sci-astronomy/casacore/casacore-2.1.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# python3 is experimental and only one python is supported
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils toolchain-funcs fortran-2 python-single-r1
-
-DESCRIPTION="Core libraries for the Common Astronomy Software Applications"
-HOMEPAGE="https://github.com/casacore/casacore"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="c++11 +data doc fftw hdf5 openmp python threads test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- sci-astronomy/wcslib:0=
- sci-libs/cfitsio:0=
- sys-libs/readline:0=
- virtual/blas
- virtual/lapack
- data? ( sci-astronomy/casa-data )
- fftw? ( sci-libs/fftw:3.0= )
- hdf5? ( sci-libs/hdf5:0= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:0=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( sci-astronomy/casa-data sci-astronomy/sofa_c )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-tpath-test.patch"
- "${FILESDIR}/${PN}-2.1.0-fix-c++14.patch"
-)
-
-pkg_pretend() {
- if [[ $(tc-getCC)$ == *gcc* ]] && [[ ${MERGE_TYPE} != binary ]]; then
- use c++11 && [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) && \
- die "You are using gcc but gcc-4.7 or higher is required for C++11"
- use openmp && ! tc-has-openmp && \
- die "You are using gcc but without OpenMP capabilities that you requested"
- fi
-}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- fortran-2_pkg_setup
-}
-
-src_configure() {
- has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
- local mycmakeargs=(
- -DENABLE_SHARED=ON
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DDATA_DIR="${EPREFIX}/usr/share/casa/data"
- -DBUILD_PYTHON="$(usex python)"
- -DBUILD_TESTING="$(usex test)"
- -DCXX11="$(usex c++11)"
- -DUSE_FFTW3="$(usex fftw)"
- -DUSE_HDF5="$(usex hdf5)"
- -DUSE_OPENMP="$(usex openmp)"
- -DUSE_THREADS="$(usex threads)"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use doc; then
- doxygen doxygen.cfg || die
- fi
-}
-
-src_install(){
- cmake-utils_src_install
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins -r doc/html
- fi
-}
diff --git a/sci-astronomy/casacore/files/casacore-2.1.0-fix-c++14.patch b/sci-astronomy/casacore/files/casacore-2.1.0-fix-c++14.patch
deleted file mode 100644
index b14b7035c60..00000000000
--- a/sci-astronomy/casacore/files/casacore-2.1.0-fix-c++14.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3a45f84ccb6f08270fd6fd299eaf1b5401199d77 Mon Sep 17 00:00:00 2001
-From: Tammo Jan Dijkema <T.J.Dijkema@gmail.com>
-Date: Fri, 18 Mar 2016 10:43:13 +0100
-Subject: [PATCH] Add std to isinf and isnan, fixes #337
-
----
- casa/BasicMath/Math.cc | 4 ++--
- casa/BasicMath/test/tMathNaN.cc | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/casa/BasicMath/Math.cc b/casa/BasicMath/Math.cc
-index d1bd984..00659e3 100644
---- a/casa/BasicMath/Math.cc
-+++ b/casa/BasicMath/Math.cc
-@@ -178,7 +178,7 @@ Bool isInf(Float val) {
- // infinite. I can only have access to Solaris, Linux and SGI machines to
- // determine this.
- #if defined(AIPS_LINUX)
-- return (isinf(Double(val)));
-+ return (std::isinf(Double(val)));
- #elif defined(AIPS_DARWIN)
- return (std::isinf(Double(val)));
- #elif defined(AIPS_SOLARIS) || defined(AIPS_IRIX)
-@@ -212,7 +212,7 @@ Bool isInf(Double val) {
- // infinite. I can only have access to Solaris, Linux and SGI machines to
- // determine this.
- #if defined(AIPS_LINUX)
-- return (isinf(Double(val)));
-+ return (std::isinf(Double(val)));
- #elif defined(AIPS_DARWIN)
- return (std::isinf(Double(val)));
- #elif defined(AIPS_SOLARIS) || defined(AIPS_IRIX)
-diff --git a/casa/BasicMath/test/tMathNaN.cc b/casa/BasicMath/test/tMathNaN.cc
-index f1a73bc..0c330d1 100644
---- a/casa/BasicMath/test/tMathNaN.cc
-+++ b/casa/BasicMath/test/tMathNaN.cc
-@@ -43,7 +43,7 @@
- ((*(Int *)(x) & 0x007fffff) != 0x00000000))
-
- inline Bool isNaN_isnan(Float val) {
-- return (isnan(Double(val)));
-+ return (std::isnan(Double(val)));
- }
-
- inline Bool isNaN_isnanf(const Float& val) {
diff --git a/sci-astronomy/casacore/files/casacore-disable-tpath-test.patch b/sci-astronomy/casacore/files/casacore-disable-tpath-test.patch
deleted file mode 100644
index e92e1e7ac4f..00000000000
--- a/sci-astronomy/casacore/files/casacore-disable-tpath-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Benda Xu <heroxbd@gentoo.org>
-Date: Wed, 29 Oct 2014 16:40:47 +0900
-Subject: disable tPath test
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Forwarded: no need
-Description: sbuild gets HOME variable leaked into the build environment
- Debian uses sbuild as official build farm. Until the cause is pinned down,
- this test is disabled.
-
- 98/425 Test #101: tPath ...............................***Failed 0.64 sec
-1,16d0
-< expanded: /home/heroxbd
-< expected: /«PKGBUILDDIR»
-< absolute: /home/heroxbd
-< expected: /«PKGBUILDDIR»
-< expanded: /home/heroxbd/test/test2
-< expected: /«PKGBUILDDIR»/test/test2
-< absolute: /home/heroxbd/test/test2
-< expected: /«PKGBUILDDIR»/test/test2
-< expanded: /home/heroxbd/test
-< expected: /«PKGBUILDDIR»/test
-< absolute: /home/heroxbd/test
-< expected: /«PKGBUILDDIR»/test
-< expanded: /home/heroxbd/test
-< expected: /«PKGBUILDDIR»/test
-< absolute: /home/heroxbd/test
-< expected: /«PKGBUILDDIR»/test
-33a18
-> OK
-FAIL (output not verified): ./tPath
----
- casa/OS/test/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/casa/OS/test/CMakeLists.txt b/casa/OS/test/CMakeLists.txt
-index 4a31f7a..10d5b80 100644
---- a/casa/OS/test/CMakeLists.txt
-+++ b/casa/OS/test/CMakeLists.txt
-@@ -12,7 +12,6 @@ tMemory
- tMemoryTrace
- tModcompConversion
- tMutex
--tPath
- tPrecTimer
- tTime
- tTimer
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-07 20:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-26 1:08 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/casacore/, sci-astronomy/casacore/files/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2017-07-07 20:40 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox