gentoo resync : 10.09.2021

3 files changed, 12 insertions, 50 deletions

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 89012d26f17c..f0671ac816dd 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -5,9 +5,9 @@ AUX boost-1.73-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166a
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
 AUX boost-1.76-boost-numpy.patch 910 BLAKE2B 6f0b8fdf908e7be43556ba61301d0465f0b8464120d342b6ddbd053eecc432bf2c4a60e84eced622bd3fe0da468c5941fa2d5b9592490c453193ef3eaf239a8a SHA512 245cb97c493e85eae3567a720eebac7eb53d1691d22015edc27f7a56e379c9f59f5a89c49889149ec203c28ede2ed1b9853c742e604fa4b60f7a83f8b2698fba
 AUX boost-1.76-sparc-define.patch 1026 BLAKE2B ad88b1c5231c0cbbd6bfb1f01d050ff20fbee145a656a439b2920f23f116693e6a999dce9db6bb0cac94ad2f98580f0669198d026b28c05fe7a82b5887fbadff SHA512 62d63bc3db7352daf6ad47a25bbeef2bed3405e4e43650d4c34ad8535a96ae13f875837b727082c8a5b7671c35a67a20978baf44d59f15a57053308a31827373
-AUX boost-1.77-math-deprecated-include.patch 1676 BLAKE2B 8f709daa0b68cece73487f887f4cfdeae5568f0614752e4223f15d25052caa9ae2718dbc3f4edad94cd4a82c3fba642f4ccff91318cd1d9ce58e2bd6cfc20fb0 SHA512 351b5ff6b3186a888861ad060ff8340412096a3ee369de76a888af0f1c45a07f6a5a62f6b95602b4d733b02b33dfb76f41aedd3d54bc9831c541782a91f08872
+DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f040832829e63fb0ae47f02fb1aa54720311f56e68b4d4d53557952bb280d60316ecf64ffc1a1e9c9411b70a733690270b85c2d2 SHA512 1358fa6d3afa45fe414f0c11bb583cc8b95737405c6fc3831f7485e22edac990e98849c06c851a4d0fe26bbeec7b8b40103090dc80417ae717ba33caa2088d86
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 EBUILD boost-1.76.0-r1.ebuild 10966 BLAKE2B 90d0fdd0d832da9f503999914fec8c8d6c49aeee20ac7bab0d943eaa42ce518fb9193da12877304693d55a2bddc62605ad40c7a61b92a202737b43b751f7e590 SHA512 1910cdf860922e7794ccf2a7a7afe316c96e2ae2a2b4b0ee2f87571ac3b44202aab7d328006f962d5ad970bd295bb0b387d2969578e7f14c23a123a9817256cb
-EBUILD boost-1.77.0-r1.ebuild 10638 BLAKE2B 974853fc7db70ec206f12d41cfd064d404ba726144910b725cca6c6b0f1f65dee6a154bf260d66d1282d1e23ecdde38d6fac28a7d004922603ebf36754fa5cc5 SHA512 b67dce21bdce5b8e4f80b061ef03b72fa9d3c881070720ce76d758b707ab6cc744878b24d8cce330fee4acac4a92613151b401dcb9efed4550fd7d57988867c9
+EBUILD boost-1.77.0-r2.ebuild 10759 BLAKE2B 908381800fbe0a3cfcbba00c1f6b47bdc36e400c6da70408607ad20b298d9a1f664ba17e25ef1b74c9ca2baa272686e5ded781fc46de5442bafd35d0c03c0e16 SHA512 89ca69dd4a2e50568ab2b92178177aabca956bb5aa867b8031fbdc4f05bed0cf6bddca60e1ef6534f1e8e4378621af87bbd767da6bdc4e1a63e1b6930c7b6a20
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.77.0-r1.ebuild b/dev-libs/boost/boost-1.77.0-r2.ebuild
index 9a715e088959..d1061034e9ec 100644
--- a/dev-libs/boost/boost-1.77.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.77.0-r2.ebuild
@@ -13,11 +13,12 @@ MAJOR_V="$(ver_cut 1-2)"
 DESCRIPTION="Boost Libraries for C++"
 HOMEPAGE="https://www.boost.org/"
 SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-1.tar.xz"
 S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # the tests will never fail because these are not intended as sanity
@@ -46,14 +47,15 @@ DEPEND="${RDEPEND}"
 BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	"${WORKDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${WORKDIR}"/${PN}-1.71.0-context-x32.patch
+	"${WORKDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
 	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
-	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
-	"${FILESDIR}"/${PN}-1.76-sparc-define.patch
-	"${FILESDIR}"/${PN}-1.77-math-deprecated-include.patch
+	"${WORKDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
+	"${WORKDIR}"/${PN}-1.74-CVE-2012-2677.patch
+	"${WORKDIR}"/${PN}-1.76-sparc-define.patch
+	"${WORKDIR}"/${PN}-1.77-math-deprecated-include.patch
+	"${WORKDIR}"/${PN}-1.77-geometry.patch
 )
 
 python_bindings_needed() {
diff --git a/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch b/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch
deleted file mode 100644
index 44943243eaac..000000000000
--- a/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/boostorg/math/commit/720536a08e4e33639869e1b7a99d9ec923409c0b
-https://github.com/boostorg/math/issues/675
-https://github.com/boostorg/math/pull/676
-
-From 720536a08e4e33639869e1b7a99d9ec923409c0b Mon Sep 17 00:00:00 2001
-From: Matt Borland <matt@mattborland.com>
-Date: Mon, 23 Aug 2021 17:48:28 +0300
-Subject: [PATCH] Fix for issue 675 (#676)
-
---- a/boost/math/tools/header_deprecated.hpp
-+++ a/boost/math/tools/header_deprecated.hpp
-@@ -6,12 +6,22 @@
- #ifndef BOOST_MATH_TOOLS_HEADER_DEPRECATED
- #define BOOST_MATH_TOOLS_HEADER_DEPRECATED
- 
--#ifdef _MSC_VER
--// Expands to "This header is deprecated; use expr instead."
--#define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
--#else // GNU, Clang, Intel, IBM, etc.
-+#ifndef BOOST_MATH_STANDALONE
-+
-+#   include <boost/config/header_deprecated.hpp>
-+#   define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_HEADER_DEPRECATED(expr)
-+
-+#else
-+
-+#   ifdef _MSC_VER
- // Expands to "This header is deprecated; use expr instead."
--#define BOOST_MATH_HEADER_DEPRECATED(expr) _Pragma("This header is deprecated; use " expr " instead.")
--#endif
-+#       define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
-+#   else // GNU, Clang, Intel, IBM, etc.
-+// Expands to "This header is deprecated use expr instead"
-+#       define BOOST_MATH_HEADER_DEPRECATED_MESSAGE(expr) _Pragma(#expr)
-+#       define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_MATH_HEADER_DEPRECATED_MESSAGE(message "This header is deprecated use " expr " instead")
-+#   endif
-+
-+#endif // BOOST_MATH_STANDALONE
- 
- #endif // BOOST_MATH_TOOLS_HEADER_DEPRECATED