| 1 |
commit: aedade552fd238280d0f29afa6dcbe4c91c1ee26 |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 7 15:43:29 2017 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 7 20:39:48 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aedade55 |
| 7 |
|
| 8 |
sci-astronomy/casacore: remove buggy old. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
sci-astronomy/casacore/Manifest | 1 - |
| 13 |
sci-astronomy/casacore/casacore-2.1.0.ebuild | 90 ---------------------- |
| 14 |
.../casacore/files/casacore-2.1.0-fix-c++14.patch | 45 ----------- |
| 15 |
.../files/casacore-disable-tpath-test.patch | 49 ------------ |
| 16 |
4 files changed, 185 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-astronomy/casacore/Manifest b/sci-astronomy/casacore/Manifest |
| 19 |
index c940c394f98..bbaac6d36c8 100644 |
| 20 |
--- a/sci-astronomy/casacore/Manifest |
| 21 |
+++ b/sci-astronomy/casacore/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
-DIST casacore-2.1.0.tar.gz 10173155 SHA256 9c0017e741c1c4b14bc09582867910f750cd76ff2673e0ecd554aa5b2db7acb4 SHA512 ab52bed9ebc5aef79c7b46c963c90fe9db2e7bac82249f99ed0def2496065ae337cdd9359fb9a6c0182fc3faa702f476116bf0edffc54585a3353a43ce6ddd9f WHIRLPOOL cda1fba87a02d5564a3f56c93eaad2c674bc7f8795d4bd56152549174405cd761ef1df5a00d27ebd0d2bf37fe663b17bbd961508607d1a39e1c494795f6fa755 |
| 24 |
DIST casacore-2.3.0.tar.gz 10326408 SHA256 d8ed5373f5447885be6d3aac72f26cee24a662df5caf4a6cd23e846b79181700 SHA512 48d09e74b0c3885eb9f7bd048f0fd158397f7c6aa2bf9f713af9dbfcf3ce2c5ba0abb9500d3fe1d32977a35e0941b273fbfd8ee69c991a19df264f5f5a28cbb0 WHIRLPOOL c343a6d419e2e39b888141768abba2c7432e58a8751311e70edd856feb71e4ebcd854ea6e47d72505493bc368d022019178b7dd51c7544f725b332b06f521a00 |
| 25 |
|
| 26 |
diff --git a/sci-astronomy/casacore/casacore-2.1.0.ebuild b/sci-astronomy/casacore/casacore-2.1.0.ebuild |
| 27 |
deleted file mode 100644 |
| 28 |
index 064b4da1bc6..00000000000 |
| 29 |
--- a/sci-astronomy/casacore/casacore-2.1.0.ebuild |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,90 +0,0 @@ |
| 32 |
-# Copyright 1999-2017 Gentoo Foundation |
| 33 |
-# Distributed under the terms of the GNU General Public License v2 |
| 34 |
- |
| 35 |
-EAPI=6 |
| 36 |
- |
| 37 |
-# python3 is experimental and only one python is supported |
| 38 |
-PYTHON_COMPAT=( python2_7 ) |
| 39 |
- |
| 40 |
-inherit cmake-utils eutils toolchain-funcs fortran-2 python-single-r1 |
| 41 |
- |
| 42 |
-DESCRIPTION="Core libraries for the Common Astronomy Software Applications" |
| 43 |
-HOMEPAGE="https://github.com/casacore/casacore" |
| 44 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 45 |
- |
| 46 |
-LICENSE="GPL-2" |
| 47 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 48 |
-SLOT="0" |
| 49 |
-IUSE="c++11 +data doc fftw hdf5 openmp python threads test" |
| 50 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 51 |
- |
| 52 |
-RDEPEND=" |
| 53 |
- sci-astronomy/wcslib:0= |
| 54 |
- sci-libs/cfitsio:0= |
| 55 |
- sys-libs/readline:0= |
| 56 |
- virtual/blas |
| 57 |
- virtual/lapack |
| 58 |
- data? ( sci-astronomy/casa-data ) |
| 59 |
- fftw? ( sci-libs/fftw:3.0= ) |
| 60 |
- hdf5? ( sci-libs/hdf5:0= ) |
| 61 |
- python? ( |
| 62 |
- ${PYTHON_DEPS} |
| 63 |
- dev-libs/boost:0=[python,${PYTHON_USEDEP}] |
| 64 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 65 |
- )" |
| 66 |
-DEPEND="${RDEPEND} |
| 67 |
- virtual/pkgconfig |
| 68 |
- doc? ( app-doc/doxygen ) |
| 69 |
- test? ( sci-astronomy/casa-data sci-astronomy/sofa_c )" |
| 70 |
- |
| 71 |
-PATCHES=( |
| 72 |
- "${FILESDIR}/${PN}-disable-tpath-test.patch" |
| 73 |
- "${FILESDIR}/${PN}-2.1.0-fix-c++14.patch" |
| 74 |
-) |
| 75 |
- |
| 76 |
-pkg_pretend() { |
| 77 |
- if [[ $(tc-getCC)$ == *gcc* ]] && [[ ${MERGE_TYPE} != binary ]]; then |
| 78 |
- use c++11 && [[ $(gcc-major-version) -lt 4 ]] || \ |
| 79 |
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) && \ |
| 80 |
- die "You are using gcc but gcc-4.7 or higher is required for C++11" |
| 81 |
- use openmp && ! tc-has-openmp && \ |
| 82 |
- die "You are using gcc but without OpenMP capabilities that you requested" |
| 83 |
- fi |
| 84 |
-} |
| 85 |
- |
| 86 |
-pkg_setup() { |
| 87 |
- use python && python-single-r1_pkg_setup |
| 88 |
- fortran-2_pkg_setup |
| 89 |
-} |
| 90 |
- |
| 91 |
-src_configure() { |
| 92 |
- has_version sci-libs/hdf5[mpi] && export CXX=mpicxx |
| 93 |
- local mycmakeargs=( |
| 94 |
- -DENABLE_SHARED=ON |
| 95 |
- -DPYTHON_EXECUTABLE="${PYTHON}" |
| 96 |
- -DDATA_DIR="${EPREFIX}/usr/share/casa/data" |
| 97 |
- -DBUILD_PYTHON="$(usex python)" |
| 98 |
- -DBUILD_TESTING="$(usex test)" |
| 99 |
- -DCXX11="$(usex c++11)" |
| 100 |
- -DUSE_FFTW3="$(usex fftw)" |
| 101 |
- -DUSE_HDF5="$(usex hdf5)" |
| 102 |
- -DUSE_OPENMP="$(usex openmp)" |
| 103 |
- -DUSE_THREADS="$(usex threads)" |
| 104 |
- ) |
| 105 |
- cmake-utils_src_configure |
| 106 |
-} |
| 107 |
- |
| 108 |
-src_compile() { |
| 109 |
- cmake-utils_src_compile |
| 110 |
- if use doc; then |
| 111 |
- doxygen doxygen.cfg || die |
| 112 |
- fi |
| 113 |
-} |
| 114 |
- |
| 115 |
-src_install(){ |
| 116 |
- cmake-utils_src_install |
| 117 |
- if use doc; then |
| 118 |
- insinto /usr/share/doc/${PF} |
| 119 |
- doins -r doc/html |
| 120 |
- fi |
| 121 |
-} |
| 122 |
|
| 123 |
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 |
| 124 |
deleted file mode 100644 |
| 125 |
index b14b7035c60..00000000000 |
| 126 |
--- a/sci-astronomy/casacore/files/casacore-2.1.0-fix-c++14.patch |
| 127 |
+++ /dev/null |
| 128 |
@@ -1,45 +0,0 @@ |
| 129 |
-From 3a45f84ccb6f08270fd6fd299eaf1b5401199d77 Mon Sep 17 00:00:00 2001 |
| 130 |
-From: Tammo Jan Dijkema <T.J.Dijkema@×××××.com> |
| 131 |
-Date: Fri, 18 Mar 2016 10:43:13 +0100 |
| 132 |
-Subject: [PATCH] Add std to isinf and isnan, fixes #337 |
| 133 |
- |
| 134 |
---- |
| 135 |
- casa/BasicMath/Math.cc | 4 ++-- |
| 136 |
- casa/BasicMath/test/tMathNaN.cc | 2 +- |
| 137 |
- 2 files changed, 3 insertions(+), 3 deletions(-) |
| 138 |
- |
| 139 |
-diff --git a/casa/BasicMath/Math.cc b/casa/BasicMath/Math.cc |
| 140 |
-index d1bd984..00659e3 100644 |
| 141 |
---- a/casa/BasicMath/Math.cc |
| 142 |
-+++ b/casa/BasicMath/Math.cc |
| 143 |
-@@ -178,7 +178,7 @@ Bool isInf(Float val) { |
| 144 |
- // infinite. I can only have access to Solaris, Linux and SGI machines to |
| 145 |
- // determine this. |
| 146 |
- #if defined(AIPS_LINUX) |
| 147 |
-- return (isinf(Double(val))); |
| 148 |
-+ return (std::isinf(Double(val))); |
| 149 |
- #elif defined(AIPS_DARWIN) |
| 150 |
- return (std::isinf(Double(val))); |
| 151 |
- #elif defined(AIPS_SOLARIS) || defined(AIPS_IRIX) |
| 152 |
-@@ -212,7 +212,7 @@ Bool isInf(Double val) { |
| 153 |
- // infinite. I can only have access to Solaris, Linux and SGI machines to |
| 154 |
- // determine this. |
| 155 |
- #if defined(AIPS_LINUX) |
| 156 |
-- return (isinf(Double(val))); |
| 157 |
-+ return (std::isinf(Double(val))); |
| 158 |
- #elif defined(AIPS_DARWIN) |
| 159 |
- return (std::isinf(Double(val))); |
| 160 |
- #elif defined(AIPS_SOLARIS) || defined(AIPS_IRIX) |
| 161 |
-diff --git a/casa/BasicMath/test/tMathNaN.cc b/casa/BasicMath/test/tMathNaN.cc |
| 162 |
-index f1a73bc..0c330d1 100644 |
| 163 |
---- a/casa/BasicMath/test/tMathNaN.cc |
| 164 |
-+++ b/casa/BasicMath/test/tMathNaN.cc |
| 165 |
-@@ -43,7 +43,7 @@ |
| 166 |
- ((*(Int *)(x) & 0x007fffff) != 0x00000000)) |
| 167 |
- |
| 168 |
- inline Bool isNaN_isnan(Float val) { |
| 169 |
-- return (isnan(Double(val))); |
| 170 |
-+ return (std::isnan(Double(val))); |
| 171 |
- } |
| 172 |
- |
| 173 |
- inline Bool isNaN_isnanf(const Float& val) { |
| 174 |
|
| 175 |
diff --git a/sci-astronomy/casacore/files/casacore-disable-tpath-test.patch b/sci-astronomy/casacore/files/casacore-disable-tpath-test.patch |
| 176 |
deleted file mode 100644 |
| 177 |
index e92e1e7ac4f..00000000000 |
| 178 |
--- a/sci-astronomy/casacore/files/casacore-disable-tpath-test.patch |
| 179 |
+++ /dev/null |
| 180 |
@@ -1,49 +0,0 @@ |
| 181 |
-From: Benda Xu <heroxbd@g.o> |
| 182 |
-Date: Wed, 29 Oct 2014 16:40:47 +0900 |
| 183 |
-Subject: disable tPath test |
| 184 |
-MIME-Version: 1.0 |
| 185 |
-Content-Type: text/plain; charset="utf-8" |
| 186 |
-Content-Transfer-Encoding: 8bit |
| 187 |
- |
| 188 |
-Forwarded: no need |
| 189 |
-Description: sbuild gets HOME variable leaked into the build environment |
| 190 |
- Debian uses sbuild as official build farm. Until the cause is pinned down, |
| 191 |
- this test is disabled. |
| 192 |
- |
| 193 |
- 98/425 Test #101: tPath ...............................***Failed 0.64 sec |
| 194 |
-1,16d0 |
| 195 |
-< expanded: /home/heroxbd |
| 196 |
-< expected: /«PKGBUILDDIR» |
| 197 |
-< absolute: /home/heroxbd |
| 198 |
-< expected: /«PKGBUILDDIR» |
| 199 |
-< expanded: /home/heroxbd/test/test2 |
| 200 |
-< expected: /«PKGBUILDDIR»/test/test2 |
| 201 |
-< absolute: /home/heroxbd/test/test2 |
| 202 |
-< expected: /«PKGBUILDDIR»/test/test2 |
| 203 |
-< expanded: /home/heroxbd/test |
| 204 |
-< expected: /«PKGBUILDDIR»/test |
| 205 |
-< absolute: /home/heroxbd/test |
| 206 |
-< expected: /«PKGBUILDDIR»/test |
| 207 |
-< expanded: /home/heroxbd/test |
| 208 |
-< expected: /«PKGBUILDDIR»/test |
| 209 |
-< absolute: /home/heroxbd/test |
| 210 |
-< expected: /«PKGBUILDDIR»/test |
| 211 |
-33a18 |
| 212 |
-> OK |
| 213 |
-FAIL (output not verified): ./tPath |
| 214 |
---- |
| 215 |
- casa/OS/test/CMakeLists.txt | 1 - |
| 216 |
- 1 file changed, 1 deletion(-) |
| 217 |
- |
| 218 |
-diff --git a/casa/OS/test/CMakeLists.txt b/casa/OS/test/CMakeLists.txt |
| 219 |
-index 4a31f7a..10d5b80 100644 |
| 220 |
---- a/casa/OS/test/CMakeLists.txt |
| 221 |
-+++ b/casa/OS/test/CMakeLists.txt |
| 222 |
-@@ -12,7 +12,6 @@ tMemory |
| 223 |
- tMemoryTrace |
| 224 |
- tModcompConversion |
| 225 |
- tMutex |
| 226 |
--tPath |
| 227 |
- tPrecTimer |
| 228 |
- tTime |
| 229 |
- tTimer |
Archives