[gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/, dev-libs/boost/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     bd7deb456020b9b3329b05c3aaa0d26a7997caf3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 13:13:29 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  8 13:23:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7deb45

dev-libs/boost: Drop 1.77.0-r4

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/boost/Manifest                            |   2 -
 dev-libs/boost/boost-1.77.0-r4.ebuild              | 341 ---------------------
 .../files/boost-1.77.0-fix-process-include.patch   |  19 --
 .../boost/files/boost-1.77.0-python-3.10.patch     |  44 ---
 4 files changed, 406 deletions(-)

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 0d1e5b8ce3d8..dda317544a26 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,4 +1,2 @@
-DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f040832829e63fb0ae47f02fb1aa54720311f56e68b4d4d53557952bb280d60316ecf64ffc1a1e9c9411b70a733690270b85c2d2 SHA512 1358fa6d3afa45fe414f0c11bb583cc8b95737405c6fc3831f7485e22edac990e98849c06c851a4d0fe26bbeec7b8b40103090dc80417ae717ba33caa2088d86
-DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312

diff --git a/dev-libs/boost/boost-1.77.0-r4.ebuild b/dev-libs/boost/boost-1.77.0-r4.ebuild
deleted file mode 100644
index 5ec5337f1703..000000000000
--- a/dev-libs/boost/boost-1.77.0-r4.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-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 ~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"
-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
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	!<dev-libs/leatherman-1.12.0-r1
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2"
-
-PATCHES=(
-	"${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
-	"${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
-	"${FILESDIR}"/${P}-python-3.10.patch
-	"${FILESDIR}"/${P}-fix-process-include.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
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${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
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usev !mpi --without-mpi)
-		$(usev !nls --without-locale)
-		$(usev !context '--without-context --without-coroutine --without-fiber')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build/src
-		--layout=system
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=shared
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam \
-		--prefix="${EPREFIX}"/usr \
-		"${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			--prefix="${EPREFIX}"/usr \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		--prefix="${ED}"/usr \
-		--includedir="${ED}"/usr/include \
-		--libdir="${ED}"/usr/$(get_libdir) \
-		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if use python; then
-		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
-
-				python_optimize
-			}
-			python_foreach_impl move_mpi_py_into_sitedir
-		else
-			rm -r "${ED}"/usr/include/boost/mpi/python* || die
-		fi
-	else
-		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-pkg_preinst() {
-	# Yay for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
-	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
-	elog
-	elog "Then you need to recompile Boost and all its reverse dependencies"
-	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
-	elog "requires a complete rebuild of the Boost-dependent ecosystem."
-	elog
-	elog "See for instance https://bugs.gentoo.org/638138"
-}

diff --git a/dev-libs/boost/files/boost-1.77.0-fix-process-include.patch b/dev-libs/boost/files/boost-1.77.0-fix-process-include.patch
deleted file mode 100644
index 566603b360ac..000000000000
--- a/dev-libs/boost/files/boost-1.77.0-fix-process-include.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/boostorg/process/commit/e08374ed95ac33865bda40602c94909e7cd9607f.patch
-https://bugs.gentoo.org/827899
-
-From: Eddie-cz <48474051+Eddie-cz@users.noreply.github.com>
-Date: Mon, 2 Aug 2021 10:49:42 +0200
-Subject: [PATCH] Update wchar_t.hpp
-
---- a/boost/process/detail/traits/wchar_t.hpp
-+++ b/boost/process/detail/traits/wchar_t.hpp
-@@ -12,6 +12,8 @@
- #include <boost/process/detail/traits/env.hpp>
- #include <boost/process/locale.hpp>
- 
-+#include <algorithm>
-+
- namespace boost { namespace process { namespace detail {
- 
- //template
-

diff --git a/dev-libs/boost/files/boost-1.77.0-python-3.10.patch b/dev-libs/boost/files/boost-1.77.0-python-3.10.patch
deleted file mode 100644
index 69181b1fa42b..000000000000
--- a/dev-libs/boost/files/boost-1.77.0-python-3.10.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://github.com/boostorg/boost_install/commit/0605dadfacf51994dcd8c5c82fb733dc6fa24073
-
-From: Martin Jansa <martin.jansa@lge.com>
-Date: Tue, 19 Oct 2021 12:24:31 +0000
-Subject: [PATCH] BoostConfig.cmake: allow searching for python310
-
-* accept double digits in Python3_VERSION_MINOR
-
-* if someone is using e.g.:
-  find_package(Python3 REQUIRED)
-  find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
-
-  with python-3.10 then it currently fails with:
-
-  -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0")
-  -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter
-  CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package):
-    Could not find a package configuration file provided by "boost_python310"
-    (requested version 1.77.0) with any of the following names:
-
-      boost_python310Config.cmake
-      boost_python310-config.cmake
-
-    Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or
-    set "boost_python310_DIR" to a directory containing one of the above files.
-    If "boost_python310" provides a separate development package or SDK, be
-    sure it has been installed.
-  Call Stack (most recent call first):
-    /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component)
-    /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package)
-    CMakeLists.txt:18 (find_package)
-
-Signed-off-by: Martin Jansa <martin.jansa@lge.com>
---- a/tools/boost_install/BoostConfig.cmake
-+++ b/tools/boost_install/BoostConfig.cmake
-@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet)
-     set(_BOOST_REQUIRED REQUIRED)
-   endif()
- 
--  if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$")
-+  if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$")
- 
-     # handle pythonXY and numpyXY versioned components for compatibility
-