gentoo auto-resync : 26:01:2024 - 18:57:55

2 files changed, 9 insertions, 20 deletions

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index c17a06acf250..1b4e030489ab 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -16,5 +16,5 @@ EBUILD boost-1.82.0-r1.ebuild 11360 BLAKE2B 0b42b206ee6dd64ea8fbcb48b717f91b4a71
 EBUILD boost-1.83.0-r1.ebuild 11579 BLAKE2B 4dc543767181261fd3777c48524c99e215e354bfd5627a789282b7afbdee7510a9bc01fa3879b785fe9137090b7b9608c5ffa65648eced500dd86a209233cd32 SHA512 d24e18961775931cb8de8875004ba02ec86923ce511e282176c1c15758dac0d20b45300ccd9e9d5a5aff0ae16d618517a2df5c04f3682f588e4c6fd8cc84eab0
 EBUILD boost-1.83.0-r2.ebuild 11627 BLAKE2B 2bc11d9a44247459daf262343d332ce15d3e4f6d1cfd3f613cdc2bc6f9f10c95df0441ed90ad134e3f50a45599c3b65869a94ffd62d481d4494e8f6ac9603286 SHA512 fc246d5b54fa4f08a588608322373fa2f3895ff74f4cbe2dbc02b8841fc2296cfb8534d5ba07bf889ec37abdb634faf40f52fd07364d561d7580c76921189119
 EBUILD boost-1.83.0-r3.ebuild 11672 BLAKE2B b7a30aa91c971072ef7e8a95c384a865aeedbbe7fedc1d7f7a3fefca8fccccf5be6b56d68de7fc75a639279eb83c752b6c828e9ba98b4d27fffe7f62124efa08 SHA512 0e7006907408ecb70e8331883331c6d75a2676e5b2298af4b1eda29dccc76b38ecb1e307a1168deac258e5761a4df37ef775ca5be994d9c4b48739377206ebcf
-EBUILD boost-1.84.0-r2.ebuild 11676 BLAKE2B 1388d8c6efdf5df4d74571dcf0ff1fd7a7ec4101e44700bad618d41d1469c932e50e7ced1769f0c3af95becd3762e3b5e31885c62610c633640a0beeda882973 SHA512 521fb7fcffa13997195f57e9540fa4f33ddfbe84bbac2f78e1e53539e52f135e1ae18f0035761991305830934122d0c3e19275597e7cfe57b63fdc24b28d8b1b
+EBUILD boost-1.84.0-r3.ebuild 11414 BLAKE2B 9314b22910ee32cca85ca378e4578fe840172e34ce599e1cae0ec00abf1aa491bd5f171ab55a48071babec10f9968111ffc90b923902b9e63dbc876cf4c3618a SHA512 f0cfee0825d8b8b8aa3ef9180040efc334aeb05662111f2ffc248dfe37f706bb72fcb135963b837a41721663cd0b4bc0eaa2f63f8f3570311bd339316fddcf9b
 MISC metadata.xml 9162 BLAKE2B c8df087c7fe1e4af3a59f21763777d3f1318aebcd524e077b6a93c374e0910ff31b1e73b8b4908130d63c2bb7d060348602cffd215648f09afd8015c782e2340 SHA512 3c45d74e046e0fd09f152fcfa7af942c9097e3ed91a0915a2541caad14a8b94b9faceccdbc74bf8aa7c8f7b383db7e91e09babba9c2c28fd7855a7b809616839
diff --git a/dev-libs/boost/boost-1.84.0-r2.ebuild b/dev-libs/boost/boost-1.84.0-r3.ebuild
index 8240ff805fc4..a9b31a9a58c3 100644
--- a/dev-libs/boost/boost-1.84.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.84.0-r3.ebuild
@@ -34,10 +34,10 @@ RESTRICT="test"
 
 RDEPEND="
 	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
 	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
 	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	mpi? ( virtual/mpi[${MULTILIB_USEDEP},cxx,threads] )
 	python? (
 		${PYTHON_DEPS}
 		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
@@ -50,24 +50,14 @@ BDEPEND=">=dev-build/b2-4.9.2"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch
 	"${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch
-	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch
-	"${FILESDIR}"/${PN}-1.83.0-math-gcc14.patch
 
 	# upstreamed
+	"${FILESDIR}"/${PN}-1.83.0-math-gcc14.patch
 	"${FILESDIR}"/${PN}-1.79.0-context-x32.patch
 	"${FILESDIR}"/${PN}-1.84.0-signals2-patch1.patch
 	"${FILESDIR}"/${PN}-1.84.0-signals2-patch2.patch
 )
 
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
 create_user-config.jam() {
 	local user_config_jam="${BUILD_DIR}"/user-config.jam
 	if [[ -s ${user_config_jam} ]]; then
@@ -90,7 +80,7 @@ create_user-config.jam() {
 		${mpi_configuration}
 	__EOF__
 
-	if python_bindings_needed; then
+	if multilib_native_use python; then
 		append_to_user_config() {
 			local py_config
 			if tc-is-cross-compiler; then
@@ -103,7 +93,7 @@ create_user-config.jam() {
 		python_foreach_impl append_to_user_config
 	fi
 
-	if python_bindings_needed && use numpy; then
+	if multilib_native_use python && use numpy; then
 		einfo "Enabling support for NumPy extensions in Boost.Python"
 	else
 		einfo "Disabling support for NumPy extensions in Boost.Python"
@@ -138,7 +128,7 @@ ejam() {
 	create_user-config.jam
 
 	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
+	if multilib_native_use python; then
 		append_to_b2_opts() {
 			b2_opts+=( python="${EPYTHON#python}" )
 		}
@@ -212,7 +202,7 @@ multilib_src_compile() {
 		--prefix="${EPREFIX}"/usr \
 		"${OPTIONS[@]}" || die
 
-	if tools_needed; then
+	if multilib_native_use tools; then
 		pushd tools >/dev/null || die
 		ejam \
 			--prefix="${EPREFIX}"/usr \
@@ -229,7 +219,7 @@ multilib_src_install() {
 		--libdir="${ED}"/usr/$(get_libdir) \
 		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
 
-	if tools_needed; then
+	if multilib_native_use tools; then
 		dobin dist/bin/*
 
 		insinto /usr/share
@@ -286,7 +276,6 @@ multilib_src_install_all() {
 		if use mpi; then
 			move_mpi_py_into_sitedir() {
 				python_moduleinto boost
-				python_domodule "${S}"/libs/mpi/build/__init__.py
 
 				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
 				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die