commit: 75b81c60327b92dedd6d8a072c170d9b87105402
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 4 19:16:48 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 21:49:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b81c60
sci-libs/dealii: fix build with boost 1.77
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
.../{dealii-9.3.1-r3.ebuild => dealii-9.3.1-r4.ebuild} | 5 +++--
sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch | 12 ++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/sci-libs/dealii/dealii-9.3.1-r3.ebuild
b/sci-libs/dealii/dealii-9.3.1-r4.ebuild
similarity index 97%
rename from sci-libs/dealii/dealii-9.3.1-r3.ebuild
rename to 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/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
