From 43f85394ba834267589a4e6478ef419d40e22503 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 17 May 2023 04:08:35 +0100
Subject: gentoo auto-resync : 17:05:2023 - 04:08:35

---
 dev-libs/boost/Manifest            |  2 +-
 dev-libs/boost/boost-1.82.0.ebuild | 36 +++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 14 deletions(-)

(limited to 'dev-libs/boost')

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 99cf29b8eb5b..ccad82668d7b 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -7,5 +7,5 @@ AUX boost-1.81.0-phoenix-multiple-definitions.patch 292 BLAKE2B d9bae6f053188f93
 DIST boost_1_81_0.tar.bz2 118797750 BLAKE2B ae57247fb80ee5a952881a99bdbe9a1d5622690879ef59053716647dc1121e70fdd322251837387b43357f1cd63c6d1ba285cf35c0c40e4f5ee28a929d7eacf7 SHA512 a04201e73da59f68fa02761b333c864a96ebaf268247b6b10cb19ed3d70ee9ad3da4c53123f2a7a4a9b9e1408793b51e1adbcc6fd09f60fecef3ca9522bb6b36
 DIST boost_1_82_0.tar.bz2 121325129 BLAKE2B 16ee164ce7114d8134c861b3652c842750cec63ab0e79e4386d8cb9c56f7a454f9a9cfa75f25d9132a8d8d9e6f39d32a8e7535f83f52f355bbc40ef530163fa5 SHA512 6fddc452ca67f99f5c181e21c73d96feb7346e10886477c91b4abc2cdf447750599e0d42f935ef591222200ef6c033de078a7ad2bb577c81fa56a249b17420cb
 EBUILD boost-1.81.0-r1.ebuild 10814 BLAKE2B 19a04444fbbdfc1268f74c10de59129dc2d9e835b7e53ea2fc71035614cd06f4d937a8ff3b72fd448958748696096495b87dce5b6b3d9fefbacc38ee5f8689d3 SHA512 e6f2c24255a220e8e2a9418773ecc628cc91ced1dc50a90e1c2a2eba8cdac8e8449606a1e188582d06d9d34983a01899e71cbed236563b506769743572073eec
-EBUILD boost-1.82.0.ebuild 10910 BLAKE2B 83f48eb651f1c866c151c384aa20d6c872df6e73d688fc43b041c1e48d4a23a24082317d5eb3de2b0a58c6c4a290d707078654fcd4344f2f8ebd63367779ebc9 SHA512 8d92ebfcc2cf4ba635bc6114680f8fe32d7ed1f8e2c8c08238e5d6b3c3778192cc27e76dcae37be8217dedf8377ccd04944161d9bbedb743bb59fc0b0b2f428d
+EBUILD boost-1.82.0.ebuild 11374 BLAKE2B b4734b9f26f32f91648eb027486741b7f621688dfd92a1ce7f4cef958c6caf7c63fcd698ff6c2e6489d89767ba63beb9ce51d5270050d6480ad24b19c6245469 SHA512 76942e9e8e0bad741a6885228794b32484ab7c0a2706b0db81fd60b708533c89ba098aa49a0cd7c3fb7e00f30439e8bb1e5c47f4b03213af77459cb6360165ad
 MISC metadata.xml 9028 BLAKE2B 066cbb57ea9116c9aa13d5bd8e092eb1724e3501b29812fbe0ba46565de94404e96585068af9266fe3a66c556b960e3095b318b376e3689bdb8f11dadaa99d26 SHA512 b489dbb41686b252ad3632d276f9a469405126a81bc16ae5d62f5b6a90851f0438dd7cbf4bad5963a52e9b5037368ef674b0bd4cd8eaac24b22f796d80be56a9
diff --git a/dev-libs/boost/boost-1.82.0.ebuild b/dev-libs/boost/boost-1.82.0.ebuild
index efe85c331913..30ce182a1f86 100644
--- a/dev-libs/boost/boost-1.82.0.ebuild
+++ b/dev-libs/boost/boost-1.82.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~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
@@ -71,13 +71,8 @@ create_user-config.jam() {
 	fi
 
 	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
+	compiler="gcc"
+	compiler_version="$(gcc-version)"
 
 	if use mpi; then
 		local mpi_configuration="using mpi ;"
@@ -194,8 +189,15 @@ src_configure() {
 	# Use C++17 globally as of 1.80
 	append-cxxflags -std=c++17
 
-	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#894564)
-	append-lfs-flags
+	if [[ ${CHOST} != *-darwin* ]]; then
+		# On modern macOS, file I/O is already 64-bit by default,
+		# there's no support for special options like O_LARGEFILE.
+		# Thus, LFS must be disabled.
+		#
+		# On other systems, we need to enable LFS explicitly for 64-bit
+		# offsets on 32-bit hosts (#894564)
+		append-lfs-flags
+	fi
 }
 
 multilib_src_compile() {
@@ -242,16 +244,24 @@ multilib_src_install() {
 				install_name_tool -id "/${d#${D}}" "${d}"
 				eend $?
 				# fix references to other libs
+				# these paths look like this:
+				# bin.v2/libs/thread/build/gcc-12.1/gentoorelease/pch-off/
+				#  threadapi-pthread/threading-multi/visibility-hidden/
+				#  libboost_thread.dylib
 				refs=$(otool -XL "${d}" | \
 					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
+					grep "libboost_" | \
 					cut -f1 -d' ')
 				local r
 				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
+					# strip path prefix from references, so we obtain
+					# something like libboost_thread.dylib.
+					local r_basename=${r##*/}
+
+					ebegin "    correcting reference to ${r_basename}"
 					install_name_tool -change \
 						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
+						"${EPREFIX}/usr/lib/${r_basename}" \
 						"${d}"
 					eend $?
 				done
-- 
cgit v1.2.3