commit: 3a32915aa5012cc6b76a4073de1e6719de910ef5 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Sat Jul 9 16:46:52 2016 +0000 Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> CommitDate: Sat Jul 9 16:46:52 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3a32915a
sci-libs/dealii: drop old Package-Manager: portage-2.2.28 sci-libs/dealii/dealii-8.1.0-r2.ebuild | 121 --------- .../files/dealii-8.1.0-p4est1.0-support.patch | 271 --------------------- 2 files changed, 392 deletions(-) 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 4beb1fe..0000000 --- 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 3ef8d99..0000000 --- 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; - }; -
