gentoo resync : 30.10.2021

4 files changed, 13 insertions, 10 deletions

diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index a160556499a5..a78bc6da7168 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -3,7 +3,7 @@ DIST dealii-9.3.0-offline_documentation.tar.gz 342390250 BLAKE2B 5ed1e5d5f7cd6a4
 DIST dealii-9.3.0.tar.gz 24458373 BLAKE2B 27cdaee4e7ec9c170e11c5ba9bff8fd654bb2a9452df3402d5639268a6fe31565faa38d240810a0323b7253f2ed665c25fa0948c56b9924f1836531f2414bc92 SHA512 d558b5dda1067f7d995bc5f265614e3bc5e70190d24c1c61047af1ddc52fa007013c51901b9b8eacfbe8b360dffcb22aca87e0019ee09581b928e00c39198c98
 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.0-r1.ebuild 5321 BLAKE2B eca44c7fcfd31077a67291a6f295d2416a82c8176950d14cc975edbe9ff64fb55d8eb0697d30f774e34b4d5a8d259408d775f153b0c5c284373f286a5e50137d SHA512 e1b1a0e3acbf3502dd1cd8c1cb72ea35ce75ec63cf6efdabbe260cdedf9605d5a12dcee9a88c5c203369604438f09d7beaf73b89edb562ea5441ef2f8bd6b1bb
-EBUILD dealii-9.3.1.ebuild 5321 BLAKE2B b66f4d31cd9e8b659839659eb25479e149c08b107ec05fd2ba1eab27c3ada02e0a57b50b3ee6bbb8f98c38cf3a702c39696ffcc6b29c51d33d0e39c97c1d3edb SHA512 73c7b9bd5115ff36121f159ab04f3ab58945fd89d77bc1292430e97849ce5587e2424545f3d08f2f66d2cad8c387a5ef629761f57c3b719e50abf68044d3d8e1
-EBUILD dealii-9999.ebuild 5372 BLAKE2B 10d4601b948476fca4070ac7d209a882726310e2327e125c8f1ec8b3fa032c0e9bc450d04c7a280bece4b39fab2d9fed720425af8f256f09320f719cdafabfd0 SHA512 c7b270207385c998ce82c6fea458c07ec933e9c29e11de2dceb92be6b2953fd39e59ae23e413300969bf5dc6a0f9f91a4eb0eb3de6918f976daa266c38d653c3
+EBUILD dealii-9.3.0-r2.ebuild 5325 BLAKE2B 2ccdf092e3872661328bee434776862e44483fbd747d7d44d652d91a29e0dd3a809813f1dde5cbff5bb80a7b9c58d1561a7b173152175ecf721e105a026736c8 SHA512 330c7d209a2b0050591de9256cc69c583a7a46ae45d8fe68846ca355ded2f1289147cb2a60e9b2eda338cbe46a541f615491bc611e775d3c516c0f45bb4482dd
+EBUILD dealii-9.3.1-r1.ebuild 5422 BLAKE2B 895d7b04be25b9d4d712cae74c52bf48af0481eef22eda28c650e141cc95e9e1157a504dac995af5b3a70aecb95c64f4bccbef3fd3e6a9db7a5359f1471c1da8 SHA512 ba94cce899ee5bc2a76509e582b7f402097a0db57fce5d125830e13253bf34bd52fee0e3110dd09dc27165b686c45f5bb036ec82606a33655463458f010022ed
+EBUILD dealii-9999.ebuild 5376 BLAKE2B 5628c124d9c39b6fdf9ca74097fc56c710241fcbe92b450380cc16c11d4374b287074afde2cf368766e63775de8c1f5591ee00b784144dc0caad90dcf5f05a85 SHA512 3cc0cacdd17236d8d23243d72824d81b5272bed8c29554c35209ea5a33e67387e1bc6bf3c86ef2fc71bc4ba3c36f9ccdb995e3bf0ee58c84295c691f04c4987d
 MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87
diff --git a/sci-libs/dealii/dealii-9.3.0-r1.ebuild b/sci-libs/dealii/dealii-9.3.0-r2.ebuild
index 81010cd4fd98..883959073dba 100644
--- a/sci-libs/dealii/dealii-9.3.0-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.0-r2.ebuild
@@ -45,10 +45,10 @@ REQUIRED_USE="
 # accessible. Just fix the version for the time being.
 CAS_VERSION=7.5.1
 
-RDEPEND="dev-libs/boost
+RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
 	sys-libs/zlib
-	dev-cpp/tbb
+	dev-cpp/tbb:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
diff --git a/sci-libs/dealii/dealii-9.3.1.ebuild b/sci-libs/dealii/dealii-9.3.1-r1.ebuild
index 7e56f6af0e23..ef012f290e0f 100644
--- a/sci-libs/dealii/dealii-9.3.1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1-r1.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/"
@@ -45,10 +45,10 @@ REQUIRED_USE="
 # accessible. Just fix the version for the time being.
 CAS_VERSION=7.5.2
 
-RDEPEND="dev-libs/boost
+RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
 	sys-libs/zlib
-	dev-cpp/tbb
+	dev-cpp/tbb:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
@@ -138,10 +138,13 @@ src_configure() {
 	# 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
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 9688a1d91718..f1bc0ba2589b 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -45,11 +45,11 @@ REQUIRED_USE="
 # accessible. Just fix the version for the time being.
 CAS_VERSION=7.5.2
 
-RDEPEND="dev-libs/boost
+RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/cpp-taskflow
-	dev-cpp/tbb
+	dev-cpp/tbb:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )