gentoo resync : 07.01.2022

4 files changed, 19 insertions, 6 deletions

diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index ae8531cee599..97681d581afb 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,6 +1,7 @@
+AUX dealii-9.1.1-fix_boost_177.patch 470 BLAKE2B 0e701500943bf400d021ac787e089485efaa58a0659e96de3bc92d785c26fbe5f63360a5b81713d868bce2e04a6f02a19bd809e28017e2c2a8ce8ec724350345 SHA512 350da7118fa94b04e5d53c681a51c60f450536ed82093de1106cfb2f5d60111db41dad46929c1831efd4ff902558a17a8a01c71cca85d456c6b17e29fd2cec31
 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-r3.ebuild 5439 BLAKE2B fb0184863504e4a490b5d170d2eef59951846a84b5ea3d002939096a6b7d5bbb7832a36771e06ca1790fca9528d6b4a4b1b723e0185d91270c6367d8ab35a429 SHA512 65bdbce63d914189a6fbefbc149f811f6416d194769aa49f58b74fe2bb2f8b9b7499348334fecfec6a3e0f5e76861203d5eb00890c0de3153a3fdf8f82118ad7
-EBUILD dealii-9999.ebuild 5410 BLAKE2B f43901b5bba82076a93039f408ec7829eab104c6b1e1efd09beb583037532364ea00fe65501abfeb8db96adc6c24ecb6c2875fa65220538091527384024f20b3 SHA512 165db04bca48076e6e52641fe8300f83a75bc30f54031bce366027bd93c93d97826eb51462b141c800190f1003800520e4f03c91ad268c25d6ee74ed178219ad
+EBUILD dealii-9.3.1-r4.ebuild 5478 BLAKE2B a300b5267930af10f9218e4bf2c8ec0aa5ce11455aac32b904d6467cfe5aadc347ffcd908f4af3c46936f42c980a07131344ce5771cc6a4afb531902d001ee13 SHA512 2cdac16a058b06b6d9d40d6076c6bafd9bd35c3e1612857699c12fa98b7e0a99ac23cefed53195786c2b7228493a2ffc0db7ca0db6f344f98135f36233fb0c54
+EBUILD dealii-9999.ebuild 5385 BLAKE2B 775f8ab5e40eb5ac1d12c972c3518fddc212050f920588f68c6e6fa3cf4d4b5cb7d14c91a756770bbe4055f53a6dcf61ee3200e33f71068701ec67c82238323c SHA512 9de81d5d1b0b3fbd9aacb0562397bb373ec66bbf44711e6932908c9f79c45e5a61f05577982efcc7ae4d14ee4c996b631f3e24bb606d56278bf39376a763868b
 MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87
diff --git a/sci-libs/dealii/dealii-9.3.1-r3.ebuild b/sci-libs/dealii/dealii-9.3.1-r4.ebuild
index c52bce06b69d..ebe0f99102e4 100644
--- a/sci-libs/dealii/dealii-9.3.1-r3.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,7 +45,7 @@ REQUIRED_USE="
 # accessible. Just fix the version for the time being.
 CAS_VERSION=7.5.3
 
-RDEPEND="<dev-libs/boost-1.77.0:=
+RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/tbb:=
@@ -80,6 +80,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+	"${FILESDIR}"/${PN}-9.1.1-fix_boost_177.patch
 )
 
 src_configure() {
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 4717fd8600ce..f95f48acaaac 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,6 @@ REQUIRED_USE="
 CAS_VERSION=7.5.3
 
 RDEPEND="dev-libs/boost:=
-	!~dev-libs/boost-1.77.0
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/cpp-taskflow
diff --git a/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch b/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch
new file mode 100644
index 000000000000..b040e240ad61
--- /dev/null
+++ b/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch
@@ -0,0 +1,12 @@
+diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h
+index 1b9d04d..1e1bfd2 100644
+--- a/include/deal.II/numerics/rtree.h
++++ b/include/deal.II/numerics/rtree.h
+@@ -26,6 +26,7 @@
+ #include <deal.II/boost_adaptors/segment.h>
+ 
+ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
++#include <boost/geometry/algorithms/distance.hpp>
+ #include <boost/geometry/index/rtree.hpp>
+ #include <boost/geometry/strategies/strategies.hpp>
+ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS