aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2016-07-09 11:46:52 -0500
committerMatthias Maier <tamiko@gentoo.org>2016-07-09 11:46:52 -0500
commit3a32915aa5012cc6b76a4073de1e6719de910ef5 (patch)
tree12d3c8043a14e2c89815d4cfbd4052b86c1f4d5a
parentsci-mathematics/petsc: version bump to 3.5.4 (diff)
downloadsci-3a32915aa5012cc6b76a4073de1e6719de910ef5.tar.gz
sci-3a32915aa5012cc6b76a4073de1e6719de910ef5.tar.bz2
sci-3a32915aa5012cc6b76a4073de1e6719de910ef5.zip
sci-libs/dealii: drop old
Package-Manager: portage-2.2.28
-rw-r--r--sci-libs/dealii/Manifest2
-rw-r--r--sci-libs/dealii/dealii-8.1.0-r2.ebuild121
-rw-r--r--sci-libs/dealii/files/dealii-8.1.0-p4est1.0-support.patch271
3 files changed, 0 insertions, 394 deletions
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 5fbe9683a..cd7c25bce 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,5 +1,3 @@
-DIST dealii-8.1.0-offline_documentation.tar.gz 96865280 SHA256 c39f309ff5296a05dfdc1b8e585ddcfe658794f16bbd9f235bdf7b5e00558b65 SHA512 9ff9ab5bcdbe3b1d127a6580f9b5d39dfc5b3840ff9278496c71b56bd5e2e33a781a0d555f08e46fdf96847510e58960ad2cf144e9d48aea31fc5080961a1e7b WHIRLPOOL e841c440899fc5a933501bfdf6c8694863678382cd223d0941af0649b6452218e53e912c53be9cee4588e0be657dad8cc521ad162189cbfb5a39fbf9f4fe71cf
-DIST dealii-8.1.0.tar.gz 13353502 SHA256 d666bbda2a17b41b80221d7029468246f2658051b8c00d9c5907cd6434c4df99 SHA512 9d6e913e7a8c54f386839d031f2931a74e8ac6e7db8693c201a11ec6ca34962626a42a57b727297c9f3d8b9efebddb4f2397c27bbee4212e726ce2714f1c3f70 WHIRLPOOL 8cd7aeb47c28bc473bb24d1632f6074de893b20d995d6077c80b88834693b8f9ad1aee181b7abda55a5567efa6c6d169da4c6061cd939b63351330f7e4b767c5
DIST dealii-8.2.1-offline_documentation.tar.gz 98861605 SHA256 4622e8ef96c5105dc9cf6e35c54a6fd072956235320646c4f53b5def7748b2fd SHA512 721d963991d53f2c23010f6c398cddd9e058385375a3a77245fbe95b10dbfe1a452d1c2ead2cb8d8a0174b0b2262ed40832f100a545af49dc923d19f42e8e283 WHIRLPOOL 5a1d070d8336c9d9a3a582a73457fa1831f737ecd5def1787bcbffef30f718eef03c57c58ea80e79d6735b73d6f8c83d498a366f002fa5078ef51c71af74b2f9
DIST dealii-8.2.1.tar.gz 13667634 SHA256 d75674e45fe63cd9fa294460fe45228904d51a68f744dbb99cd7b60720f3b2a0 SHA512 9cd3ed9a4330aa7464ecfe92677fcddae0aadcca7885c898eb8a746caa30fff587ccf5614cec61ffb6b27280c94b423d6370661a1791c601d7abce163502daeb WHIRLPOOL d7b86adcf7dc5dddf63aac4d37be6512aff9889279eb58f9d79cbc5d0c467a1ba50892a08495057f20a3352767f88a42bff7d82f9ba2b5567b02511cb806b7f5
DIST dealii-8.3.0-offline_documentation.tar.gz 152228920 SHA256 474b1b64a392b1a77b3e628b4c5f83099ed3b4cd5bc87966454645607f2f3851 SHA512 f3ba395204b18b9b8a0e5a1ea0d59260f3ed556d866820c78ed52d9fd16cc4702870eec9bfa0a3e6996696256f6d371d88a9642392eab135291f6a2411038c48 WHIRLPOOL aabcb6b951f1331fbf1cc0cef3f9dc92f8f4c08698f6ddbafff9b5a59d4344bab75346d353cb9b4582e8233230598501d13eecfa021a52e5692fcd3849581ba0
diff --git a/sci-libs/dealii/dealii-8.1.0-r2.ebuild b/sci-libs/dealii/dealii-8.1.0-r2.ebuild
deleted file mode 100644
index 4beb1fe18..000000000
--- a/sci-libs/dealii/dealii-8.1.0-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils multilib
-
-# deal.II uses its own FindLAPACK.cmake file that calls into the system
-# FindLAPACK.cmake module and does additional internal setup. Do not remove
-# any of these modules:
-CMAKE_REMOVE_MODULES_LIST=""
-
-DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="http://www.dealii.org/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://github.com/dealii/dealii.git"
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
- doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz )"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/deal.II"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="
- arpack cpu_flags_x86_avx cpu_flags_x86_sse2 +debug doc +examples hdf5
- +lapack mesh_converter metis mpi mumps netcdf p4est parameter_gui petsc
- +sparse static-libs +tbb trilinos
-"
-
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE="
- mumps? ( mpi lapack )
- p4est? ( mpi )
- trilinos? ( mpi )"
-
-RDEPEND="dev-libs/boost
- app-arch/bzip2
- sys-libs/zlib
- arpack? ( sci-libs/arpack[mpi=] )
- hdf5? ( sci-libs/hdf5[mpi=] )
- lapack? ( virtual/lapack )
- metis? ( >=sci-libs/parmetis-4 )
- mpi? ( virtual/mpi )
- mumps? ( sci-libs/mumps[mpi] )
- netcdf? ( sci-libs/netcdf-cxx:0 )
- p4est? ( sci-libs/p4est[mpi] )
- parameter_gui? ( dev-qt/qtgui:4 )
- petsc? ( sci-mathematics/petsc[mpi=] )
- sparse? ( sci-libs/umfpack )
- tbb? ( dev-cpp/tbb )
- trilinos? ( sci-libs/trilinos )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] dev-lang/perl )"
-
-src_configure() {
- # deal.II needs a custom build type:
- local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
-
- local mycmakeargs=(
- -DDEAL_II_ALLOW_AUTODETECTION=OFF
- -DDEAL_II_ALLOW_BUNDLED=OFF
- -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
- -DDEAL_II_COMPONENT_COMPAT_FILES=OFF
- -DDEAL_II_CMAKE_MACROS_RELDIR=share/${PN}/cmake/macros
- -DDEAL_II_DOCHTML_RELDIR=share/doc/${PF}/html
- -DDEAL_II_DOCREADME_RELDIR=share/doc/${PF}/
- -DDEAL_II_EXAMPLES_RELDIR=share/doc/${PF}/examples
- -DDEAL_II_LIBRARY_RELDIR=$(get_libdir)
- -DDEAL_II_WITH_BZIP2=ON
- -DDEAL_II_WITH_ZLIB=ON
- $(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
- $(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX)
- $(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2)
- $(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
- $(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)
- $(cmake-utils_use hdf5 DEAL_II_WITH_HDF5)
- $(cmake-utils_use lapack DEAL_II_WITH_LAPACK)
- $(cmake-utils_use mesh_converter DEAL_II_COMPONENT_MESH_CONVERTER)
- $(cmake-utils_use metis DEAL_II_WITH_METIS)
- $(cmake-utils_use mpi DEAL_II_WITH_MPI)
- $(cmake-utils_use mumps DEAL_II_WITH_MUMPS)
- $(cmake-utils_use netcdf DEAL_II_WITH_NETCDF)
- $(cmake-utils_use p4est DEAL_II_WITH_P4EST)
- $(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI)
- $(cmake-utils_use petsc DEAL_II_WITH_PETSC)
- $(cmake-utils_use sparse DEAL_II_WITH_UMFPACK)
- $(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
- $(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS)
- $(cmake-utils_use tbb DEAL_II_WITH_THREADS)
- $(cmake-utils_use trilinos DEAL_II_WITH_TRILINOS)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- DOCS=( README )
-
- if use doc && [[ ${PV} != *9999* ]]; then
- # copy missing images to the build directory:
- cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
- "${BUILD_DIR}"/doc/doxygen/deal.II || die
- # replace links:
- sed -i \
- 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
- "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
- fi
- cmake-utils_src_install
-
- # decompress the installed example sources:
- use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/dealii/files/dealii-8.1.0-p4est1.0-support.patch b/sci-libs/dealii/files/dealii-8.1.0-p4est1.0-support.patch
deleted file mode 100644
index 3ef8d99e0..000000000
--- a/sci-libs/dealii/files/dealii-8.1.0-p4est1.0-support.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-Upstream commits:
- 4b6a6a9aae750941723890c44f0cb3326e5ba87b
- 67d70862aa2b2c2e925a2b1262c9934ea0f9a873
- dc0308a408360bfa5e21a58d10c2c2a7dca3a8ad
-
-diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc
-index 5687fae..a6e5e85 100644
---- a/source/distributed/tria.cc
-+++ b/source/distributed/tria.cc
-@@ -155,10 +155,17 @@ namespace internal
- types<2>::balance_type btype,
- p4est_init_t init_fn);
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ static
-+ p4est_gloidx_t (&partition) (types<2>::forest *p4est,
-+ int partition_for_coarsening,
-+ p4est_weight_t weight_fn);
-+#else
- static
- void (&partition) (types<2>::forest *p4est,
- int partition_for_coarsening,
- p4est_weight_t weight_fn);
-+#endif
-
- static
- void (&save) (const char *filename,
-@@ -173,16 +180,28 @@ namespace internal
- void *user_pointer,
- types<2>::connectivity **p4est);
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ static
-+ int (&connectivity_save) (const char *filename,
-+ types<2>::connectivity *connectivity);
-+#else
- static
- void (&connectivity_save) (const char *filename,
- types<2>::connectivity *connectivity);
-+#endif
-
- static
- int (&connectivity_is_valid) (types<2>::connectivity *connectivity);
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ static
-+ types<2>::connectivity *(&connectivity_load) (const char *filename,
-+ long unsigned *length);
-+#else
- static
- types<2>::connectivity *(&connectivity_load) (const char *filename,
- long *length);
-+#endif
-
- static
- unsigned int (&checksum) (types<2>::forest *p4est);
-@@ -301,10 +320,17 @@ namespace internal
- p4est_init_t init_fn)
- = p4est_balance;
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ p4est_gloidx_t (&functions<2>::partition) (types<2>::forest *p4est,
-+ int partition_for_coarsening,
-+ p4est_weight_t weight_fn)
-+ = p4est_partition_ext;
-+#else
- void (&functions<2>::partition) (types<2>::forest *p4est,
- int partition_for_coarsening,
- p4est_weight_t weight_fn)
- = p4est_partition_ext;
-+#endif
-
- void (&functions<2>::save) (const char *filename,
- types<2>::forest *p4est,
-@@ -320,18 +346,31 @@ namespace internal
- types<2>::connectivity **p4est)
- = p4est_load;
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ int (&functions<2>::connectivity_save) (const char *filename,
-+ types<2>::connectivity *connectivity)
-+ = p4est_connectivity_save;
-+#else
- void (&functions<2>::connectivity_save) (const char *filename,
- types<2>::connectivity *connectivity)
- = p4est_connectivity_save;
-+#endif
-
- int (&functions<2>::connectivity_is_valid) (types<2>::connectivity
- *connectivity)
- = p4est_connectivity_is_valid;
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ types<2>::connectivity *
-+ (&functions<2>::connectivity_load) (const char *filename,
-+ long unsigned *length)
-+ = p4est_connectivity_load;
-+#else
- types<2>::connectivity *
- (&functions<2>::connectivity_load) (const char *filename,
- long *length)
- = p4est_connectivity_load;
-+#endif
-
- unsigned int (&functions<2>::checksum) (types<2>::forest *p4est)
- = p4est_checksum;
-@@ -451,10 +490,17 @@ namespace internal
- types<3>::balance_type btype,
- p8est_init_t init_fn);
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ static
-+ p4est_gloidx_t (&partition) (types<3>::forest *p8est,
-+ int partition_for_coarsening,
-+ p8est_weight_t weight_fn);
-+#else
- static
- void (&partition) (types<3>::forest *p8est,
- int partition_for_coarsening,
- p8est_weight_t weight_fn);
-+#endif
-
- static
- void (&save) (const char *filename,
-@@ -469,16 +515,28 @@ namespace internal
- void *user_pointer,
- types<3>::connectivity **p4est);
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ static
-+ int (&connectivity_save) (const char *filename,
-+ types<3>::connectivity *connectivity);
-+#else
- static
- void (&connectivity_save) (const char *filename,
- types<3>::connectivity *connectivity);
-+#endif
-
- static
- int (&connectivity_is_valid) (types<3>::connectivity *connectivity);
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ static
-+ types<3>::connectivity *(&connectivity_load) (const char *filename,
-+ long unsigned *length);
-+#else
- static
- types<3>::connectivity *(&connectivity_load) (const char *filename,
- long *length);
-+#endif
-
- static
- unsigned int (&checksum) (types<3>::forest *p8est);
-@@ -600,10 +658,17 @@ namespace internal
- p8est_init_t init_fn)
- = p8est_balance;
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ p4est_gloidx_t (&functions<3>::partition) (types<3>::forest *p8est,
-+ int partition_for_coarsening,
-+ p8est_weight_t weight_fn)
-+ = p8est_partition_ext;
-+#else
- void (&functions<3>::partition) (types<3>::forest *p8est,
- int partition_for_coarsening,
- p8est_weight_t weight_fn)
- = p8est_partition_ext;
-+#endif
-
- void (&functions<3>::save) (const char *filename,
- types<3>::forest *p4est,
-@@ -619,18 +684,31 @@ namespace internal
- types<3>::connectivity **p4est)
- = p8est_load;
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ int (&functions<3>::connectivity_save) (const char *filename,
-+ types<3>::connectivity *connectivity)
-+ = p8est_connectivity_save;
-+#else
- void (&functions<3>::connectivity_save) (const char *filename,
- types<3>::connectivity *connectivity)
- = p8est_connectivity_save;
-+#endif
-
- int (&functions<3>::connectivity_is_valid) (types<3>::connectivity
- *connectivity)
- = p8est_connectivity_is_valid;
-
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ types<3>::connectivity *
-+ (&functions<3>::connectivity_load) (const char *filename,
-+ long unsigned *length)
-+ = p8est_connectivity_load;
-+#else
- types<3>::connectivity *
- (&functions<3>::connectivity_load) (const char *filename,
- long *length)
- = p8est_connectivity_load;
-+#endif
-
- unsigned int (&functions<3>::checksum) (types<3>::forest *p8est)
- = p8est_checksum;
-diff --git a/cmake/modules/FindP4EST.cmake b/cmake/modules/FindP4EST.cmake
-index f2bf417..44846c7 100644
---- a/cmake/modules/FindP4EST.cmake
-+++ b/cmake/modules/FindP4EST.cmake
-@@ -179,17 +179,28 @@
- STRING(REGEX REPLACE
- "^[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1"
- P4EST_VERSION_SUBMINOR "${P4EST_VERSION}")
--
-- # Now for the patch number such as in 0.3.4.1. If there
-- # is no patch number, then the REGEX REPLACE will fail,
-- # setting P4EST_VERSION_PATCH to P4EST_VERSION. If that
-- # is the case, then set the patch number to zero
- STRING(REGEX REPLACE
-- "^[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)?.*$" "\\1"
-+ "^[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1"
- P4EST_VERSION_PATCH "${P4EST_VERSION}")
-- IF(${P4EST_VERSION_PATCH} STREQUAL "${P4EST_VERSION}")
-+
-+ #
-+ # We cannot rely on the fact that SUBMINOR or PATCH are defined.
-+ # Nevertheless, we need a full version number for our preprocessor macros
-+ # to work. If the p4est version number is only of the form x.y instead of
-+ # a.b.c.d, then the last two REGEX_REPLACE calls above will have failed
-+ # because the regular expression didn't match the version string,
-+ # and P4EST_VERSION_SUBMINOR and P4EST_VERSION_PATCH will either be
-+ # empty or be the full version string. In those cases, set those numbers
-+ # to 0 if necessary.
-+ #
-+ IF("${P4EST_VERSION_SUBMINOR}" MATCHES "^(|${P4EST_VERSION})$")
-+ SET(P4EST_VERSION_SUBMINOR "0")
-+ ENDIF()
-+
-+ IF("${P4EST_VERSION_PATCH}" MATCHES "^(|${P4EST_VERSION})$")
- SET(P4EST_VERSION_PATCH "0")
- ENDIF()
-+
-
-
- MARK_AS_ADVANCED(P4EST_DIR)
-diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h
-index ea3e88b..8daa70d 100644
---- a/include/deal.II/distributed/tria.h
-+++ b/include/deal.II/distributed/tria.h
-@@ -88,7 +88,11 @@ namespace internal
- typedef p4est_quadrant_t quadrant;
- typedef p4est_topidx_t topidx;
- typedef p4est_locidx_t locidx;
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ typedef p4est_connect_type_t balance_type;
-+#else
- typedef p4est_balance_type_t balance_type;
-+#endif
- typedef p4est_ghost_t ghost;
- };
-
-@@ -101,7 +105,11 @@ namespace internal
- typedef p8est_quadrant_t quadrant;
- typedef p4est_topidx_t topidx;
- typedef p4est_locidx_t locidx;
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+ typedef p8est_connect_type_t balance_type;
-+#else
- typedef p8est_balance_type_t balance_type;
-+#endif
- typedef p8est_ghost_t ghost;
- };
-