From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- sci-libs/dealii/Manifest | 4 ++-- sci-libs/dealii/dealii-9.3.1-r4.ebuild | 14 ++++---------- sci-libs/dealii/dealii-9999.ebuild | 19 ++++++++----------- 3 files changed, 14 insertions(+), 23 deletions(-) (limited to 'sci-libs/dealii') diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index 97681d581afb..ed2da5a89f9e 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -2,6 +2,6 @@ AUX dealii-9.1.1-fix_boost_177.patch 470 BLAKE2B 0e701500943bf400d021ac787e08948 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09 DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18 DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef -EBUILD dealii-9.3.1-r4.ebuild 5478 BLAKE2B a300b5267930af10f9218e4bf2c8ec0aa5ce11455aac32b904d6467cfe5aadc347ffcd908f4af3c46936f42c980a07131344ce5771cc6a4afb531902d001ee13 SHA512 2cdac16a058b06b6d9d40d6076c6bafd9bd35c3e1612857699c12fa98b7e0a99ac23cefed53195786c2b7228493a2ffc0db7ca0db6f344f98135f36233fb0c54 -EBUILD dealii-9999.ebuild 5385 BLAKE2B 775f8ab5e40eb5ac1d12c972c3518fddc212050f920588f68c6e6fa3cf4d4b5cb7d14c91a756770bbe4055f53a6dcf61ee3200e33f71068701ec67c82238323c SHA512 9de81d5d1b0b3fbd9aacb0562397bb373ec66bbf44711e6932908c9f79c45e5a61f05577982efcc7ae4d14ee4c996b631f3e24bb606d56278bf39376a763868b +EBUILD dealii-9.3.1-r4.ebuild 5153 BLAKE2B aba353f97cf2b1da9bdae7f7bd4ffc1e06c5d11c0a964aadf1869d61c6fda6e5c73270497de48433b909cee319ec6fae30660a845a2ab9f1ed267080314a280b SHA512 c65f30d2ac590dbac3f6bccdd87f7867a8d046d107fa873704124d2e614b0686cb1aef6db5f9e582d1899f33ff4f2ac76378b07d071bd5369ba3cce52204a3eb +EBUILD dealii-9999.ebuild 5157 BLAKE2B c975c52517a60db0c3ba27577f8f33220a8f5366443c0061164b9ad9e6ffdabb66a5df24197dd811d93426050ae2a6318e0acfd46bea1a35cce779065c2a13d6 SHA512 7723a4e89ddcd2701cda2f935cd7b84f2c23d5baacc679abbcc2a6296c1b449c2c7c0462fabc0aa4d2df00dfadd07b18e0250decc9616d8643d11d3d104688fd MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87 diff --git a/sci-libs/dealii/dealii-9.3.1-r4.ebuild b/sci-libs/dealii/dealii-9.3.1-r4.ebuild index ebe0f99102e4..9edb8b2d5a83 100644 --- a/sci-libs/dealii/dealii-9.3.1-r4.ebuild +++ b/sci-libs/dealii/dealii-9.3.1-r4.ebuild @@ -40,11 +40,6 @@ REQUIRED_USE=" slepc? ( petsc ) trilinos? ( mpi )" -# FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where -# the names of the correct include and library directories are not easily -# accessible. Just fix the version for the time being. -CAS_VERSION=7.5.3 - RDEPEND="dev-libs/boost:= app-arch/bzip2 sys-libs/zlib @@ -64,7 +59,7 @@ RDEPEND="dev-libs/boost:= ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) - opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= ) + opencascade? ( >=sci-libs/opencascade-7.6.0:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) @@ -128,13 +123,12 @@ src_configure() { -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" ) - # Do a little dance for purely cosmetic "QA" reasons. + # Do a little dance for purely cosmetic QA reasons. use opencascade && mycmakeargs+=( - -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade-${CAS_VERSION}" - -DOPENCASCADE_INCLUDE_DIR="${CASROOT}/include/opencascade-${CAS_VERSION}" + -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" ) - # Do a little dance for purely cosmetic "QA" reasons. The build system + # Do a little dance for purely cosmetic QA reasons. The build system # does query for the highest instruction set first and skips the other # variables if a "higher" variant is set if use cpu_flags_x86_avx512f; then diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild index f95f48acaaac..2e1f4a47b3ba 100644 --- a/sci-libs/dealii/dealii-9999.ebuild +++ b/sci-libs/dealii/dealii-9999.ebuild @@ -8,7 +8,7 @@ EAPI=7 # any of these modules: CMAKE_REMOVE_MODULES_LIST="" -inherit cmake multilib +inherit cmake flag-o-matic multilib DESCRIPTION="Solving partial differential equations with the finite element method" HOMEPAGE="https://www.dealii.org/" @@ -40,11 +40,6 @@ REQUIRED_USE=" slepc? ( petsc ) trilinos? ( mpi )" -# FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where -# the names of the correct include and library directories are not easily -# accessible. Just fix the version for the time being. -CAS_VERSION=7.5.3 - RDEPEND="dev-libs/boost:= app-arch/bzip2 sys-libs/zlib @@ -65,7 +60,7 @@ RDEPEND="dev-libs/boost:= ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) - opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= ) + opencascade? ( >=sci-libs/opencascade-7.6.0:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) @@ -129,21 +124,23 @@ src_configure() { -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" ) - # Do a little dance for purely cosmetic "QA" reasons. + # Do a little dance for purely cosmetic QA reasons. use opencascade && mycmakeargs+=( - -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade-${CAS_VERSION}" - -DOPENCASCADE_INCLUDE_DIR="${CASROOT}/include/opencascade-${CAS_VERSION}" + -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" ) - # Do a little dance for purely cosmetic "QA" reasons. The build system + # Do a little dance for purely cosmetic QA reasons. The build system # does query for the highest instruction set first and skips the other # variables if a "higher" variant is set if use cpu_flags_x86_avx512f; then mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes ) + append-cxxflags "-mavx512f" elif use cpu_flags_x86_avx; then mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes ) + append-cxxflags "-mavx2" elif use cpu_flags_x86_avx; then mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes ) + append-cxxflags "-msse2" fi cmake_src_configure -- cgit v1.2.3