| 1 |
commit: 26ef084df3e43be1b257bfc99772ce75b7eea38c |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 25 15:51:09 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 25 15:55:29 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ef084d |
| 7 |
|
| 8 |
dev-cpp/eigen: Drop old |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/577262 |
| 11 |
Closes: https://bugs.gentoo.org/466360 |
| 12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-cpp/eigen/Manifest | 2 - |
| 16 |
dev-cpp/eigen/eigen-3.2.8-r2.ebuild | 112 --------------------- |
| 17 |
dev-cpp/eigen/eigen-3.3.5-r1.ebuild | 101 ------------------- |
| 18 |
.../eigen/files/eigen-3.2.7-adaolc-backport.patch | 40 -------- |
| 19 |
.../files/eigen-3.2.7-pastix-5.2-backport.patch | 42 -------- |
| 20 |
.../eigen/files/eigen-3.3.5-fix-prototype.patch | 19 ---- |
| 21 |
6 files changed, 316 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest |
| 24 |
index 7f25631de66..81084cf0e54 100644 |
| 25 |
--- a/dev-cpp/eigen/Manifest |
| 26 |
+++ b/dev-cpp/eigen/Manifest |
| 27 |
@@ -1,3 +1 @@ |
| 28 |
-DIST eigen-3.2.8.tar.bz2 1161201 BLAKE2B 35bace5138f601e73d56412e87bf591ef2f96778050b0a2a4fc8f1e75f02498fb4eb80bf79988dd4bd6b985945a122d44581ccedd925f398f7d282790da06385 SHA512 53c27ba530c985dfef52188e03273eeef33abbc67e3f150cacd3371c8b9ddbd399228730595821c4c56c061d109cf509266c1dab2b8a7c730902cbd6fb18c100 |
| 29 |
-DIST eigen-3.3.5.tar.bz2 1663467 BLAKE2B 7f4b6339f8cea815004057361734e53129b5bde45c9c310eab87f0aa20da90e46dd67359e669f8b36477339df7bd7c8bd8eb18baaf0f1a779372ec3623c50aca SHA512 740ed41862c1e422a751b205513754e9c7bd04cc8ad4e3b08e2ccd1c1d30dea43a90896bc8eecd0cb4253b4adf803a814ddd48d6166fb5a53f507cf3e6940a38 |
| 30 |
DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d |
| 31 |
|
| 32 |
diff --git a/dev-cpp/eigen/eigen-3.2.8-r2.ebuild b/dev-cpp/eigen/eigen-3.2.8-r2.ebuild |
| 33 |
deleted file mode 100644 |
| 34 |
index 91ae1429ee0..00000000000 |
| 35 |
--- a/dev-cpp/eigen/eigen-3.2.8-r2.ebuild |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,112 +0,0 @@ |
| 38 |
-# Copyright 1999-2018 Gentoo Foundation |
| 39 |
-# Distributed under the terms of the GNU General Public License v2 |
| 40 |
- |
| 41 |
-EAPI=6 |
| 42 |
- |
| 43 |
-FORTRAN_NEEDED="test" |
| 44 |
- |
| 45 |
-inherit cmake-utils fortran-2 |
| 46 |
- |
| 47 |
-DESCRIPTION="C++ template library for linear algebra" |
| 48 |
-HOMEPAGE="http://eigen.tuxfamily.org/" |
| 49 |
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2" |
| 50 |
- |
| 51 |
-LICENSE="LGPL-2 GPL-3" |
| 52 |
-SLOT="3" |
| 53 |
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" |
| 54 |
-IUSE="altivec debug doc openmp test" |
| 55 |
-IUSE+=" cpu_flags_x86_sse2" |
| 56 |
-IUSE+=" cpu_flags_x86_sse3" |
| 57 |
-IUSE+=" cpu_flags_x86_sse4_1" |
| 58 |
-IUSE+=" cpu_flags_x86_sse4_2" |
| 59 |
-IUSE+=" cpu_flags_x86_ssse3" |
| 60 |
-#IUSE+=" cpu_flags_x86_x87" |
| 61 |
-RESTRICT="!test? ( test )" |
| 62 |
- |
| 63 |
-RDEPEND="!dev-cpp/eigen:0" |
| 64 |
-DEPEND=" |
| 65 |
- doc? ( app-doc/doxygen[dot,latex] ) |
| 66 |
- test? ( |
| 67 |
- dev-libs/gmp:0 |
| 68 |
- dev-libs/mpfr:0 |
| 69 |
- media-libs/freeglut |
| 70 |
- media-libs/glew |
| 71 |
- sci-libs/adolc |
| 72 |
- sci-libs/cholmod |
| 73 |
- sci-libs/fftw:3.0 |
| 74 |
- sci-libs/pastix |
| 75 |
- sci-libs/umfpack |
| 76 |
- sci-libs/scotch |
| 77 |
- sci-libs/spqr |
| 78 |
- sci-libs/superlu |
| 79 |
- virtual/opengl |
| 80 |
- virtual/pkgconfig |
| 81 |
- ) |
| 82 |
- " |
| 83 |
-# Missing: |
| 84 |
-# METIS-5 |
| 85 |
-# GOOGLEHASH |
| 86 |
- |
| 87 |
-PATCHES=( |
| 88 |
- "${FILESDIR}"/${PN}-3.2.7-pastix-5.2-backport.patch |
| 89 |
- "${FILESDIR}"/${PN}-3.2.7-adaolc-backport.patch |
| 90 |
-) |
| 91 |
- |
| 92 |
-src_unpack() { |
| 93 |
- default |
| 94 |
- mv ${PN}* ${P} || die |
| 95 |
-} |
| 96 |
- |
| 97 |
-src_prepare() { |
| 98 |
- sed \ |
| 99 |
- -e 's:-g2::g' \ |
| 100 |
- -i cmake/EigenConfigureTesting.cmake || die |
| 101 |
- |
| 102 |
- sed -i CMakeLists.txt \ |
| 103 |
- -e "/add_subdirectory(demos/d" \ |
| 104 |
- || die "sed disable unused bundles failed" |
| 105 |
- |
| 106 |
- if ! use test; then |
| 107 |
- sed -i CMakeLists.txt \ |
| 108 |
- -e "/add_subdirectory(blas/d" \ |
| 109 |
- -e "/add_subdirectory(lapack/d" \ |
| 110 |
- || die "sed disable unused bundles failed" |
| 111 |
- fi |
| 112 |
- |
| 113 |
- sed -i -e "/Unknown build type/d" CMakeLists.txt || die |
| 114 |
- |
| 115 |
- cmake-utils_src_prepare |
| 116 |
-} |
| 117 |
- |
| 118 |
-src_compile() { |
| 119 |
- cmake-utils_src_compile |
| 120 |
- use doc && cmake-utils_src_compile doc |
| 121 |
-} |
| 122 |
- |
| 123 |
-src_test() { |
| 124 |
- local mycmakeargs=( |
| 125 |
- -DEIGEN_BUILD_TESTS=ON |
| 126 |
- -DEIGEN_TEST_NOQT=ON |
| 127 |
- -DEIGEN_TEST_ALTIVEC="$(usex altivec)" |
| 128 |
- -DEIGEN_TEST_OPENMP="$(usex openmp)" |
| 129 |
- -DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)" |
| 130 |
- -DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)" |
| 131 |
- -DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)" |
| 132 |
- -DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)" |
| 133 |
- -DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)" |
| 134 |
-# -DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)" |
| 135 |
- ) |
| 136 |
- cmake-utils_src_configure |
| 137 |
- cmake-utils_src_compile blas |
| 138 |
- cmake-utils_src_compile buildtests |
| 139 |
- cmake-utils_src_test |
| 140 |
-} |
| 141 |
- |
| 142 |
-src_install() { |
| 143 |
- cmake-utils_src_install |
| 144 |
- use doc && dodoc -r "${BUILD_DIR}"/doc/html |
| 145 |
- |
| 146 |
- # Debian installs it and some projects started using it. |
| 147 |
- insinto /usr/share/cmake/Modules/ |
| 148 |
- doins "${S}/cmake/FindEigen3.cmake" |
| 149 |
-} |
| 150 |
|
| 151 |
diff --git a/dev-cpp/eigen/eigen-3.3.5-r1.ebuild b/dev-cpp/eigen/eigen-3.3.5-r1.ebuild |
| 152 |
deleted file mode 100644 |
| 153 |
index 2e8c6f919e8..00000000000 |
| 154 |
--- a/dev-cpp/eigen/eigen-3.3.5-r1.ebuild |
| 155 |
+++ /dev/null |
| 156 |
@@ -1,101 +0,0 @@ |
| 157 |
-# Copyright 1999-2018 Gentoo Foundation |
| 158 |
-# Distributed under the terms of the GNU General Public License v2 |
| 159 |
- |
| 160 |
-EAPI=6 |
| 161 |
- |
| 162 |
-FORTRAN_NEEDED="test" |
| 163 |
-inherit cmake-utils cuda fortran-2 |
| 164 |
- |
| 165 |
-DESCRIPTION="C++ template library for linear algebra" |
| 166 |
-HOMEPAGE="http://eigen.tuxfamily.org/" |
| 167 |
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2" |
| 168 |
- |
| 169 |
-LICENSE="MPL-2.0" |
| 170 |
-SLOT="3" |
| 171 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 172 |
-IUSE="altivec c++11 cuda debug doc neon openmp test" #zvector vsx |
| 173 |
-RESTRICT="!test? ( test )" |
| 174 |
- |
| 175 |
-RDEPEND="!dev-cpp/eigen:0" |
| 176 |
-DEPEND=" |
| 177 |
- doc? ( app-doc/doxygen[dot,latex] ) |
| 178 |
- test? ( |
| 179 |
- dev-libs/gmp:0 |
| 180 |
- dev-libs/mpfr:0 |
| 181 |
- media-libs/freeglut |
| 182 |
- media-libs/glew |
| 183 |
- sci-libs/adolc[sparse] |
| 184 |
- sci-libs/cholmod |
| 185 |
- sci-libs/fftw:3.0 |
| 186 |
- sci-libs/pastix |
| 187 |
- sci-libs/umfpack |
| 188 |
- sci-libs/scotch |
| 189 |
- sci-libs/spqr |
| 190 |
- sci-libs/superlu |
| 191 |
- virtual/opengl |
| 192 |
- virtual/pkgconfig |
| 193 |
- cuda? ( dev-util/nvidia-cuda-toolkit ) |
| 194 |
- ) |
| 195 |
-" |
| 196 |
-# Missing: |
| 197 |
-# METIS-5 |
| 198 |
-# GOOGLEHASH |
| 199 |
- |
| 200 |
-PATCHES=( "${FILESDIR}/${P}-fix-prototype.patch" ) |
| 201 |
- |
| 202 |
-src_unpack() { |
| 203 |
- default |
| 204 |
- mv ${PN}* ${P} || die |
| 205 |
-} |
| 206 |
- |
| 207 |
-src_prepare() { |
| 208 |
- cmake-utils_src_prepare |
| 209 |
- |
| 210 |
- sed -e 's:-g2::g' \ |
| 211 |
- -i cmake/EigenConfigureTesting.cmake || die |
| 212 |
- |
| 213 |
- sed -e "/add_subdirectory(demos/d" \ |
| 214 |
- -i CMakeLists.txt || die |
| 215 |
- |
| 216 |
- if ! use test; then |
| 217 |
- sed -e "/add_subdirectory(test/d" \ |
| 218 |
- -i CMakeLists.txt || die |
| 219 |
- |
| 220 |
- sed -e "/add_subdirectory(blas/d" \ |
| 221 |
- -e "/add_subdirectory(lapack/d" \ |
| 222 |
- -i CMakeLists.txt || die |
| 223 |
- fi |
| 224 |
- sed -e "/Unknown build type/d" \ |
| 225 |
- -i CMakeLists.txt || die |
| 226 |
- |
| 227 |
- use cuda && cuda_src_prepare |
| 228 |
-} |
| 229 |
- |
| 230 |
-src_compile() { |
| 231 |
- cmake-utils_src_compile |
| 232 |
- use doc && cmake-utils_src_compile doc |
| 233 |
-} |
| 234 |
- |
| 235 |
-src_test() { |
| 236 |
- local mycmakeargs=( |
| 237 |
- -DEIGEN_TEST_NOQT=ON |
| 238 |
- -DEIGEN_TEST_ALTIVEC="$(usex altivec)" |
| 239 |
- -DEIGEN_TEST_CXX11="$(usex c++11)" |
| 240 |
- -DEIGEN_TEST_CUDA="$(usex cuda)" |
| 241 |
- -DEIGEN_TEST_OPENMP="$(usex openmp)" |
| 242 |
- -DEIGEN_TEST_NEON64="$(usex neon)" |
| 243 |
- ) |
| 244 |
- cmake-utils_src_configure |
| 245 |
- cmake-utils_src_compile blas |
| 246 |
- cmake-utils_src_compile buildtests |
| 247 |
- cmake-utils_src_test |
| 248 |
-} |
| 249 |
- |
| 250 |
-src_install() { |
| 251 |
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) |
| 252 |
- cmake-utils_src_install |
| 253 |
- |
| 254 |
- # Debian installs it and some projects started using it. |
| 255 |
- insinto /usr/share/cmake/Modules/ |
| 256 |
- doins "${S}/cmake/FindEigen3.cmake" |
| 257 |
-} |
| 258 |
|
| 259 |
diff --git a/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch b/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch |
| 260 |
deleted file mode 100644 |
| 261 |
index 82547e11951..00000000000 |
| 262 |
--- a/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch |
| 263 |
+++ /dev/null |
| 264 |
@@ -1,40 +0,0 @@ |
| 265 |
-# HG changeset patch |
| 266 |
-# User Gael Guennebaud <g.gael@××××.fr> |
| 267 |
-# Date 1448895622 -3600 |
| 268 |
-# Node ID e515e2706d00294a5749db7832d10ea366b9389f |
| 269 |
-# Parent eb4bf011a2ea5fc4ddb0aa5332d6e616198ed886 |
| 270 |
-Update ADOL-C support. |
| 271 |
- |
| 272 |
-diff --git a/unsupported/Eigen/AdolcForward b/unsupported/Eigen/AdolcForward |
| 273 |
---- a/unsupported/Eigen/AdolcForward |
| 274 |
-+++ b/unsupported/Eigen/AdolcForward |
| 275 |
-@@ -25,7 +25,7 @@ |
| 276 |
- #ifndef NUMBER_DIRECTIONS |
| 277 |
- # define NUMBER_DIRECTIONS 2 |
| 278 |
- #endif |
| 279 |
--#include <adolc/adouble.h> |
| 280 |
-+#include <adolc/adtl.h> |
| 281 |
- |
| 282 |
- // adolc defines some very stupid macros: |
| 283 |
- #if defined(malloc) |
| 284 |
-diff --git a/unsupported/test/forward_adolc.cpp b/unsupported/test/forward_adolc.cpp |
| 285 |
---- a/unsupported/test/forward_adolc.cpp |
| 286 |
-+++ b/unsupported/test/forward_adolc.cpp |
| 287 |
-@@ -13,8 +13,6 @@ |
| 288 |
- #define NUMBER_DIRECTIONS 16 |
| 289 |
- #include <unsupported/Eigen/AdolcForward> |
| 290 |
- |
| 291 |
--int adtl::ADOLC_numDir; |
| 292 |
-- |
| 293 |
- template<typename Vector> |
| 294 |
- EIGEN_DONT_INLINE typename Vector::Scalar foo(const Vector& p) |
| 295 |
- { |
| 296 |
-@@ -123,7 +121,7 @@ |
| 297 |
- |
| 298 |
- void test_forward_adolc() |
| 299 |
- { |
| 300 |
-- adtl::ADOLC_numDir = NUMBER_DIRECTIONS; |
| 301 |
-+ adtl::setNumDir(NUMBER_DIRECTIONS); |
| 302 |
- |
| 303 |
- for(int i = 0; i < g_repeat; i++) { |
| 304 |
- CALL_SUBTEST(( adolc_forward_jacobian(TestFunc1<double,2,2>()) )); |
| 305 |
|
| 306 |
diff --git a/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch b/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch |
| 307 |
deleted file mode 100644 |
| 308 |
index fafaf3a6862..00000000000 |
| 309 |
--- a/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch |
| 310 |
+++ /dev/null |
| 311 |
@@ -1,42 +0,0 @@ |
| 312 |
-# HG changeset patch |
| 313 |
-# User Gael Guennebaud <g.gael@××××.fr> |
| 314 |
-# Date 1393589499 -3600 |
| 315 |
-# Node ID b88efb384b160880131ad17e39bb690719112bfa |
| 316 |
-# Parent 576120ad694efe29b70999576964d3816288fb4e |
| 317 |
-Fix PaStiX support for Pastix 5.2 |
| 318 |
- |
| 319 |
-diff --git a/Eigen/src/PaStiXSupport/PaStiXSupport.h b/Eigen/src/PaStiXSupport/PaStiXSupport.h |
| 320 |
---- a/Eigen/src/PaStiXSupport/PaStiXSupport.h |
| 321 |
-+++ b/Eigen/src/PaStiXSupport/PaStiXSupport.h |
| 322 |
-@@ -12,6 +12,14 @@ |
| 323 |
- |
| 324 |
- namespace Eigen { |
| 325 |
- |
| 326 |
-+#if defined(DCOMPLEX) |
| 327 |
-+ #define PASTIX_COMPLEX COMPLEX |
| 328 |
-+ #define PASTIX_DCOMPLEX DCOMPLEX |
| 329 |
-+#else |
| 330 |
-+ #define PASTIX_COMPLEX std::complex<float> |
| 331 |
-+ #define PASTIX_DCOMPLEX std::complex<double> |
| 332 |
-+#endif |
| 333 |
-+ |
| 334 |
- /** \ingroup PaStiXSupport_Module |
| 335 |
- * \brief Interface to the PaStix solver |
| 336 |
- * |
| 337 |
-@@ -74,14 +82,14 @@ |
| 338 |
- { |
| 339 |
- if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; } |
| 340 |
- if (nbrhs == 0) {x = NULL; nbrhs=1;} |
| 341 |
-- c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<COMPLEX*>(vals), perm, invp, reinterpret_cast<COMPLEX*>(x), nbrhs, iparm, dparm); |
| 342 |
-+ c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_COMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_COMPLEX*>(x), nbrhs, iparm, dparm); |
| 343 |
- } |
| 344 |
- |
| 345 |
- void eigen_pastix(pastix_data_t **pastix_data, int pastix_comm, int n, int *ptr, int *idx, std::complex<double> *vals, int *perm, int * invp, std::complex<double> *x, int nbrhs, int *iparm, double *dparm) |
| 346 |
- { |
| 347 |
- if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; } |
| 348 |
- if (nbrhs == 0) {x = NULL; nbrhs=1;} |
| 349 |
-- z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<DCOMPLEX*>(vals), perm, invp, reinterpret_cast<DCOMPLEX*>(x), nbrhs, iparm, dparm); |
| 350 |
-+ z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_DCOMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_DCOMPLEX*>(x), nbrhs, iparm, dparm); |
| 351 |
- } |
| 352 |
- |
| 353 |
- // Convert the matrix to Fortran-style Numbering |
| 354 |
|
| 355 |
diff --git a/dev-cpp/eigen/files/eigen-3.3.5-fix-prototype.patch b/dev-cpp/eigen/files/eigen-3.3.5-fix-prototype.patch |
| 356 |
deleted file mode 100644 |
| 357 |
index e4d128f502e..00000000000 |
| 358 |
--- a/dev-cpp/eigen/files/eigen-3.3.5-fix-prototype.patch |
| 359 |
+++ /dev/null |
| 360 |
@@ -1,19 +0,0 @@ |
| 361 |
-# HG changeset patch |
| 362 |
-# User Gael Guennebaud <g.gael@××××.fr> |
| 363 |
-# Date 1528444561 -7200 |
| 364 |
-# Node ID 27cac8430247a65739fcd0b83ef984d0a9c010c7 |
| 365 |
-# Parent d4cbff8d06baf95045869ed7d0c012d641c88fcf |
| 366 |
-fix prototype |
| 367 |
- |
| 368 |
-diff --git a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h |
| 369 |
---- a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h |
| 370 |
-+++ b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h |
| 371 |
-@@ -173,7 +173,7 @@ |
| 372 |
- /** |
| 373 |
- * Set the restart value (default is 30) |
| 374 |
- */ |
| 375 |
-- Index set_restart(const Index restart) { m_restart=restart; } |
| 376 |
-+ void set_restart(const Index restart) { m_restart=restart; } |
| 377 |
- |
| 378 |
- /** |
| 379 |
- * Set the number of eigenvalues to deflate at each restart |
| 380 |
\ No newline at end of file |
Archives