[gentoo-commits] proj/portage:multilib commit in: /

["Thomas Sachau" <tommy@gentoo.org>]

commit:     c492a43e90013713e05ba3e0ede1de30dc9a48e2
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 11:42:33 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 11:42:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=c492a43e

Merge tag 'portage-3.0.29' into multilib

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 .github/workflows/ci.yml                           |  2 +-
 .gitignorerevs                                     |  2 +
 NEWS                                               | 10 +++
 RELEASE-NOTES                                      |  5 ++
 bin/ebuild-ipc.py                                  |  6 +-
 bin/ebuild.sh                                      | 39 ---------
 bin/estrip                                         | 99 +++++++++++++---------
 bin/isolated-functions.sh                          | 39 +++++++++
 bin/phase-functions.sh                             |  4 +-
 bin/phase-helpers.sh                               | 14 ++-
 cnf/make.conf.example.riscv.diff                   | 61 +++++++++++++
 cnf/make.globals                                   |  2 +-
 lib/_emerge/AbstractEbuildProcess.py               |  4 +-
 lib/_emerge/Binpkg.py                              | 15 +++-
 lib/_emerge/EbuildBuild.py                         | 19 ++++-
 lib/_emerge/EbuildIpcDaemon.py                     |  2 +-
 lib/_emerge/actions.py                             | 33 +++++---
 lib/_emerge/create_depgraph_params.py              |  2 +-
 lib/_emerge/depgraph.py                            | 27 +++---
 lib/_emerge/main.py                                | 10 +++
 lib/portage/const.py                               |  1 +
 lib/portage/dbapi/bintree.py                       |  9 +-
 lib/portage/dep/dep_check.py                       |  6 +-
 lib/portage/output.py                              |  6 +-
 lib/portage/package/ebuild/doebuild.py             | 17 +++-
 lib/portage/package/ebuild/fetch.py                |  7 +-
 lib/portage/package/ebuild/prepare_build_dirs.py   |  9 ++
 lib/portage/process.py                             |  2 -
 lib/portage/tests/ebuild/test_doebuild_spawn.py    |  1 +
 lib/portage/tests/ebuild/test_ipc_daemon.py        |  6 +-
 .../tests/resolver/test_unecessary_slot_upgrade.py | 62 ++++++++++++++
 lib/portage/util/_dyn_libs/dyn_libs.py             | 28 ++++++
 lib/portage/util/_xattr.py                         |  1 -
 lib/portage/util/futures/unix_events.py            |  1 -
 man/color.map.5                                    |  6 +-
 man/emerge.1                                       | 12 ++-
 man/make.conf.5                                    |  7 +-
 setup.py                                           | 10 ++-
 38 files changed, 434 insertions(+), 152 deletions(-)

diff --cc bin/phase-functions.sh
index f549832e4,5eb031805..32cf85b33
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -312,14 -288,13 +312,14 @@@ __dyn_clean() 
  	fi
  
  	if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
 -		rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,pretended,setuped,unpacked,prepared} \
 -			"$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged,instprepped} \
 +		rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,pretended*,setuped*,unpacked*,prepared*} \
 +			"$PORTAGE_BUILDDIR"/.{configured*,compiled*,tested*,packaged*,instprepped} \
 +			"$PORTAGE_BUILDDIR"/.abi \
  			"$PORTAGE_BUILDDIR"/.die_hooks \
- 			"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
  			"$PORTAGE_BUILDDIR"/.exit_status
  
- 		rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code}
 -		rm -rf "${PORTAGE_BUILDDIR}/build-info" \
++		rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code} \
+ 			"${PORTAGE_BUILDDIR}/.ipc"
  		rm -rf "${WORKDIR}"
  		rm -f "${PORTAGE_BUILDDIR}/files"
  	fi