gentoo resync : 28.04.2021

4 files changed, 33 insertions, 8 deletions

diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 44b33ed8de55..08bf8c916684 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,6 +1,7 @@
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
+AUX dealii-9.2.0-fix-boost-include-file.patch 533 BLAKE2B f8aad2b17a3083da8c1aaf5461e5cf2b4aac2e78b34c46c7a3b965495a9c263687db6d75498a404be44f09bb952e7eeea0ac005da047f98ae526edd5ee8af473 SHA512 9a05e7787b7352c59e4756729ca4080f6c2a21bcd84429f2ed22d3fcd8e6d7183cb5686a7d88b0fd5868b2bfe53130d1fb2e9c3940ca0ccb8c8119a5e7532625
 DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481707b04e9ca3fd05b5469035537a099466a8272fa1d56833c99d845871534df75bbb2efb29063e738700a5a2815b653cdd14b49b3a93add368 SHA512 9680731b4d837561c3682a65391b442cfb8d2a947b0e4e37cad1df83877b371997d084eac52e2bf34b190ea54996d41ddd89bee79fff24d710199417f3f345ab
 DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
-EBUILD dealii-9.2.0.ebuild 5223 BLAKE2B aa83be23d21ed3717298ba48d0ccb452c5b90e3ee29f024be57793a18e91fa1c28dd6e074fb69efdf4ffe06c01f4d8949f04e34a909ef87c789051d33dc7bcce SHA512 a268cda47adf2dbce2922babd92371dd31b3f40be975ea63ca06fe60bfdd3971ad5679236f902451c4f8df06f5e07249cb95cc4b89d61f98caf46ce0bdf40661
-EBUILD dealii-9999.ebuild 5003 BLAKE2B e437c909fc248fd9b5bdf72093f4c04583ca6123a5fabcb4c9b95d989091ae0f6993e4d39c498c28dd14c49ae148b552cc65ce3b5adffb4d71c6eebf2ac1dafe SHA512 5cc9e9a4e4599dc3cbe3d07feb276304becf235dbf8099fae8c8833f57bff194103e9960fa4cb2dbda600dfabe6dff3071c7412a688abd08f01fcf8d04cb3600
+EBUILD dealii-9.2.0.ebuild 5189 BLAKE2B 536b0a1974c989ccf822846c45f99cfd665d5ea5132b0650319d55e562b1ac5e1e80fbaa880f2b0765346bc0d39d5fef1e1af5a51f09eaa0be06ccb353318c08 SHA512 7ebd8a28a7dc806a4e235ed3e93b756e1af5b2e488e61aa3cd3bb92c6b1ca9c2c710f7d417c221b58796f1d91e77bee7e1490c8bc286d36c13bdae18b4e24e09
+EBUILD dealii-9999.ebuild 4993 BLAKE2B 4c897f1fcd5af319ce209cee9cde4634ee30f9669f2094218cc481f076c3f5d1543101c83a6e64857b7191f73ef2fba4b50e0a5fe0741072d8a7e38cfd60adbe SHA512 0ac3d5e2333d5d3cb3a20c5f0c7ed2ca6c11cc55f976e6b1b4348acaa64071268a5e3ef4b71e9a45108f9d92dd719e1d0975bfb0d40e0ae6f13a5db023f36b78
 MISC metadata.xml 2636 BLAKE2B 8874dd9c20a2dbd781f4a157b3639b1d66faf1b3f32dc6ac1c42fea274c0035b9632108117472b62d9161fab705f5a365aeaaaa44f555a5c2658ebd0a0fff045 SHA512 149082068c7287346a42b901501eddeea6feaaf9cc91c46681f63e63c68dd2a7e3161c3520417a44dc7eec7e673c76c6e967b5b46e898714ce65c4ea4924d25d
diff --git a/sci-libs/dealii/dealii-9.2.0.ebuild b/sci-libs/dealii/dealii-9.2.0.ebuild
index 84251e8e9386..00d5f0fe2429 100644
--- a/sci-libs/dealii/dealii-9.2.0.ebuild
+++ b/sci-libs/dealii/dealii-9.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils multilib
+inherit cmake-utils 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
@@ -30,7 +30,7 @@ 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
+	+lapack metis mpi muparser nanoflann opencascade p4est petsc
 	scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
 "
 
@@ -56,7 +56,6 @@ RDEPEND="dev-libs/boost
 	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=] )
@@ -74,6 +73,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+	"${FILESDIR}"/${PN}-9.2.0-fix-boost-include-file.patch
 )
 
 src_configure() {
@@ -109,7 +109,6 @@ src_configure() {
 		-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)"
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 64d3092167ea..61619c7dc3d0 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils multilib
+inherit cmake-utils 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
@@ -62,7 +62,7 @@ RDEPEND="dev-libs/boost
 	scalapack? ( sci-libs/scalapack )
 	slepc? ( sci-mathematics/slepc[mpi=] )
 	sparse? ( sci-libs/umfpack )
-	sundials? ( <sci-libs/sundials-4:= )
+	sundials? ( sci-libs/sundials:= )
 	symengine? ( >=sci-libs/symengine-0.4:= )
 	trilinos? ( sci-libs/trilinos )"
 
diff --git a/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch b/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
new file mode 100644
index 000000000000..9fc6365d01c7
--- /dev/null
+++ b/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
@@ -0,0 +1,25 @@
+From 9c1a580139f557433a226da437382b3f4307f7c8 Mon Sep 17 00:00:00 2001
+From: Luca Heltai <luca.heltai@sissa.it>
+Date: Wed, 30 Dec 2020 09:54:02 +0100
+Subject: [PATCH] Fix boost include file.
+
+---
+ source/fe/mapping.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc
+index 288a9debcb..4ef3ef7714 100644
+--- a/source/fe/mapping.cc
++++ b/source/fe/mapping.cc
+@@ -20,6 +20,8 @@
+ 
+ #include <deal.II/grid/tria.h>
+ 
++#include <boost/geometry.hpp>
++
+ DEAL_II_NAMESPACE_OPEN
+ 
+ 
+-- 
+2.26.3
+