gentoo resync : 16.09.2020

3 files changed, 7 insertions, 12 deletions

diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 5e197d86a26b..6017cdc72ae6 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -5,5 +5,5 @@ DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481
 DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
 EBUILD dealii-9.1.1.ebuild 5117 BLAKE2B 34f64a3b243be3c1ee3575b02ae90b895eb41d943b0e91cf05f5209287f107fec13a2c75e14c08045f67feca30e627593ad0e6c0da695e56a1e335a0717974b0 SHA512 695cc9c803d9348f276cf9544dbdbd2729ef080ed2f7ab122d1e500b755a954e4680813f623556c3caf83d7a989968f6fe1228e03950e8e617fd26c6539c80a6
 EBUILD dealii-9.2.0.ebuild 5233 BLAKE2B 0883544d93f43cec78bbbb45a2eecaa817d932bcf4aacf22347cb4a52d62b1fb3d5b44a0ccba7b426c3279807c67e8fd74e21c3f2e418270331a97c3e903172c SHA512 0b2269670e392941aed4a37235979f6e39ac15474e94caba55752563c2c8c945b7dd19173abe3518c2ef6560a4f15e6b31ddc65423e5a53f5e67b59d02b526f6
-EBUILD dealii-9999.ebuild 5233 BLAKE2B 0883544d93f43cec78bbbb45a2eecaa817d932bcf4aacf22347cb4a52d62b1fb3d5b44a0ccba7b426c3279807c67e8fd74e21c3f2e418270331a97c3e903172c SHA512 0b2269670e392941aed4a37235979f6e39ac15474e94caba55752563c2c8c945b7dd19173abe3518c2ef6560a4f15e6b31ddc65423e5a53f5e67b59d02b526f6
-MISC metadata.xml 2636 BLAKE2B 904145ebd056a89ab5a376c38b2c132275303a575d987259f4b0de9bd016fa6194a31b995ed2c516a315367b40300875f769297451768e3f0c659fcd97a8fd9d SHA512 631e38056db1583ed6966110a9b6f6ae83dca41a573040d4f9e0d5fc56dea3052bcb6893b80419508f3d5adc3dad79eb95a5e3e15feed831e7a064c2f5dbaed6
+EBUILD dealii-9999.ebuild 5013 BLAKE2B 397b871df5bf15d90c5359dc04dc00237ab2140d71f0ab0e51266e775de19838abaa893ebf2da22d30025d4058b0a97420d2a5139f92a6a071ef606863f0bbbd SHA512 f5ef22a021dc4dd9fd2fa80de3e7c1678d70636392d7cc4d894858efb3b6e46f06e6b8d7eb7a01e38be0b47c5d826cfa50d6eb191713fc0486c39fb9a179d417
+MISC metadata.xml 2636 BLAKE2B 8874dd9c20a2dbd781f4a157b3639b1d66faf1b3f32dc6ac1c42fea274c0035b9632108117472b62d9161fab705f5a365aeaaaa44f555a5c2658ebd0a0fff045 SHA512 149082068c7287346a42b901501eddeea6feaaf9cc91c46681f63e63c68dd2a7e3161c3520417a44dc7eec7e673c76c6e967b5b46e898714ce65c4ea4924d25d
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index c13b60b49523..e7437c82a96d 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -31,8 +31,8 @@ SLOT="0"
 IUSE="
 	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
 	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
-	+lapack metis mpi muparser nanoflann opencascade netcdf p4est petsc
-	scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
+	+lapack metis mpi muparser opencascade p4est petsc
+	scalapack slepc +sparse static-libs sundials symengine trilinos
 "
 
 # TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -44,6 +44,7 @@ REQUIRED_USE="
 RDEPEND="dev-libs/boost
 	app-arch/bzip2
 	sys-libs/zlib
+	dev-cpp/cpp-taskflow
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
@@ -56,8 +57,6 @@ RDEPEND="dev-libs/boost
 	metis? ( >=sci-libs/parmetis-4 )
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
-	nanoflann? ( sci-libs/nanoflann )
-	netcdf? ( sci-libs/netcdf-cxx:0 )
 	opencascade? ( sci-libs/opencascade:* )
 	p4est? ( sci-libs/p4est[mpi] )
 	petsc? ( sci-mathematics/petsc[mpi=] )
@@ -66,7 +65,6 @@ RDEPEND="dev-libs/boost
 	sparse? ( sci-libs/umfpack )
 	sundials? ( <sci-libs/sundials-4:= )
 	symengine? ( >=sci-libs/symengine-0.4:= )
-	tbb? ( dev-cpp/tbb )
 	trilinos? ( sci-libs/trilinos )"
 
 DEPEND="${RDEPEND}
@@ -85,7 +83,6 @@ src_configure() {
 		-DDEAL_II_PACKAGE_VERSION=9999
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
 		-DDEAL_II_ALLOW_AUTODETECTION=OFF
-		-DDEAL_II_ALLOW_BUNDLED=OFF
 		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
 		-DDEAL_II_COMPILE_EXAMPLES=OFF
 		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
@@ -109,8 +106,6 @@ src_configure() {
 		-DDEAL_II_WITH_METIS="$(usex metis)"
 		-DDEAL_II_WITH_MPI="$(usex mpi)"
 		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
-		-DDEAL_II_WITH_NANOFLANN="$(usex nanoflann)"
-		-DDEAL_II_WITH_NETCDF="$(usex netcdf)"
 		-DOPENCASCADE_DIR="${CASROOT}"
 		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
 		-DDEAL_II_WITH_P4EST="$(usex p4est)"
@@ -122,7 +117,7 @@ src_configure() {
 		-DDEAL_II_WITH_UMFPACK="$(usex sparse)"
 		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
 		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
-		-DDEAL_II_WITH_THREADS="$(usex tbb)"
+		-DDEAL_II_WITH_TASKFLOW=ON
 		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
 	)
 
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index 90bacf01225a..cfcb25d9e502 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -25,10 +25,10 @@ and extra output. If you want to get meaningful backtraces see
 		<flag name="gmsh">Add support for gmsh (<pkg>sci-libs/gmsh</pkg>)</flag>
 		<flag name="metis">Add support for metis (<pkg>sci-libs/metis</pkg>)</flag>
 		<flag name="muparser">Add support for muparser (<pkg>dev-cpp/muParser</pkg>)</flag>
-		<flag name="nanoflann">Adds support for nanoflann (<pkg>sci-libs/nanoflann</pkg>)</flag>
 		<flag name="opencascade">Add support for opencascade (<pkg>sci-libs/opencascade</pkg>)</flag>
 		<flag name="p4est">Add support for p4est (<pkg>sci-libs/p4est</pkg>)</flag>
 		<flag name="petsc">Add support for petsc (<pkg>sci-mathematics/petsc</pkg>)</flag>
+		<flag name="nanoflann">Adds support for nanoflann (<pkg>sci-libs/nanoflann</pkg>)</flag>
 		<flag name="scalapack">Add support for ScaLAPACK (<pkg>sci-libs/scalapack</pkg>)</flag>
 		<flag name="slepc">Add support for slepc (<pkg>sci-mathematics/slepc</pkg>)</flag>
 		<flag name="sparse">Add support for suitesparse (<pkg>sci-libs/suitesparse</pkg>)</flag>