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

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

commit:     baf9799818ebdd09c291c94419cd5a427a21c9f5
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 15:22:31 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:22:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=baf97998

Merge 2.2_alpha130


 bin/bashrc-functions.sh                            |   59 +----
 bin/ebuild-helpers/dobin                           |    6 +-
 bin/ebuild-helpers/doconfd                         |    2 +-
 bin/ebuild-helpers/dodir                           |    2 +-
 bin/ebuild-helpers/dodoc                           |    4 +-
 bin/ebuild-helpers/doenvd                          |    2 +-
 bin/ebuild-helpers/doexe                           |    6 +-
 bin/ebuild-helpers/doheader                        |    4 +-
 bin/ebuild-helpers/dohtml                          |    2 +-
 bin/ebuild-helpers/doinfo                          |    6 +-
 bin/ebuild-helpers/doinitd                         |    2 +-
 bin/ebuild-helpers/doins                           |   14 +-
 bin/ebuild-helpers/dolib                           |    6 +-
 bin/ebuild-helpers/doman                           |    6 +-
 bin/ebuild-helpers/domo                            |    4 +-
 bin/ebuild-helpers/dosbin                          |    6 +-
 bin/ebuild-helpers/dosym                           |    4 +-
 bin/ebuild-helpers/ecompress                       |   14 +-
 bin/ebuild-helpers/ecompressdir                    |   22 +-
 bin/ebuild-helpers/emake                           |    2 +-
 bin/ebuild-helpers/fowners                         |    2 +-
 bin/ebuild-helpers/fperms                          |    2 +-
 bin/ebuild-helpers/newins                          |   10 +-
 bin/ebuild-helpers/prepalldocs                     |    2 +-
 bin/ebuild-helpers/prepinfo                        |    2 +-
 bin/ebuild-helpers/prepstrip                       |   22 +-
 bin/ebuild.sh                                      |   42 +--
 bin/egencache                                      |    4 +-
 bin/emerge-webrsync                                |   20 +-
 bin/helper-functions.sh                            |   26 +-
 bin/isolated-functions.sh                          |   82 ++---
 bin/misc-functions.sh                              |   90 +++---
 bin/phase-functions.sh                             |  332 ++++++++++----------
 bin/phase-helpers.sh                               |   80 +++---
 bin/save-ebuild-env.sh                             |   52 ++--
 doc/package/ebuild/eapi/5.docbook                  |   40 ++--
 man/ebuild.5                                       |  149 +++++++++-
 man/emerge.1                                       |    8 +-
 man/make.conf.5                                    |    9 -
 man/portage.5                                      |   89 ++++--
 misc/emerge-delta-webrsync                         |    4 +
 pym/_emerge/EbuildMetadataPhase.py                 |    9 +-
 pym/_emerge/MetadataRegen.py                       |    6 +-
 pym/_emerge/Package.py                             |   17 +-
 pym/portage/cache/sqlite.py                        |   16 +-
 pym/portage/const.py                               |    4 +-
 pym/portage/dbapi/__init__.py                      |   10 +
 pym/portage/dep/__init__.py                        |    2 +
 pym/portage/dep/dep_check.py                       |   13 +-
 pym/portage/package/ebuild/config.py               |   39 ++-
 .../package/ebuild/deprecated_profile_check.py     |   21 +-
 pym/portage/package/ebuild/doebuild.py             |   41 +++-
 pym/portage/tests/dep/testAtom.py                  |    1 -
 pym/portage/tests/dep/test_isvalidatom.py          |    2 +-
 pym/portage/tests/dep/test_match_from_list.py      |    2 -
 pym/portage/tests/repoman/test_simple.py           |    4 +-
 pym/portage/tests/update/test_update_dbentry.py    |   48 +++
 pym/portage/update.py                              |   82 ++++--
 58 files changed, 902 insertions(+), 655 deletions(-)

diff --cc bin/phase-functions.sh
index 9a1679c,2b93231..6ebcbe0
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -211,86 -208,51 +211,86 @@@ __ebuild_phase_with_hooks() 
  	done
  }
  
- dyn_pretend() {
+ __dyn_pretend() {
  	if [[ -e $PORTAGE_BUILDDIR/.pretended ]] ; then
- 		vecho ">>> It appears that '$PF' is already pretended; skipping."
- 		vecho ">>> Remove '$PORTAGE_BUILDDIR/.pretended' to force pretend."
+ 		__vecho ">>> It appears that '$PF' is already pretended; skipping."
+ 		__vecho ">>> Remove '$PORTAGE_BUILDDIR/.pretended' to force pretend."
  		return 0
  	fi
- 	ebuild_phase pre_pkg_pretend
- 	ebuild_phase pkg_pretend
+ 	__ebuild_phase pre_pkg_pretend
+ 	__ebuild_phase pkg_pretend
  	>> "$PORTAGE_BUILDDIR/.pretended" || \
  		die "Failed to create $PORTAGE_BUILDDIR/.pretended"
- 	ebuild_phase post_pkg_pretend
+ 	__ebuild_phase post_pkg_pretend
  }
  
- dyn_setup() {
+ __dyn_setup() {
 -	if [[ -e $PORTAGE_BUILDDIR/.setuped ]] ; then
 -		__vecho ">>> It appears that '$PF' is already setup; skipping."
 -		__vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force setup."
 -		return 0
 +	if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +		if ! is_auto-multilib && ! use multilib_abi_"${DEFAULT_ABI}" ; then
 +			ewarn
 +			ewarn "You disabled all ABIs"
 +			ewarn "You should enable at least one ABI"
 +			ewarn "Enabling the default ABI now"
 +			ewarn
 +		fi
  	fi
 +	for LOOP_ABI in $(get_abi_list); do
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			set_abi ${LOOP_ABI}
 +			if is_ebuild; then
 +				source "${T}"/environment || die
 +			else
 +				rm -f "${T}"/environment
 +			fi
 +			if [[ -e $PORTAGE_BUILDDIR/.setuped.${ABI} ]] ; then
- 				vecho ">>> It appears that '$PF' is already setup; skipping."
- 				vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped.${ABI}' to force setup."
++				__vecho ">>> It appears that '$PF' is already setup; skipping."
++				__vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped.${ABI}' to force setup."
 +				return 0
 +			fi
 +		fi
- 	ebuild_phase pre_pkg_setup
- 	ebuild_phase pkg_setup
+ 	__ebuild_phase pre_pkg_setup
+ 	__ebuild_phase pkg_setup
 +	>> "$PORTAGE_BUILDDIR/.setuped.${ABI}" || \
 +		die "Failed to create $PORTAGE_BUILDDIR/.setuped"
 +
 +		[[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { unset_abi; source "${T}"/environment || die ; }
 +	done
 +
  	>> "$PORTAGE_BUILDDIR/.setuped" || \
  		die "Failed to create $PORTAGE_BUILDDIR/.setuped"
- 	ebuild_phase post_pkg_setup
+ 	__ebuild_phase post_pkg_setup
 +
 +	[[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
  }
  
- dyn_unpack() {
+ __dyn_unpack() {
  	if [[ -f ${PORTAGE_BUILDDIR}/.unpacked ]] ; then
- 		vecho ">>> WORKDIR is up-to-date, keeping..."
+ 		__vecho ">>> WORKDIR is up-to-date, keeping..."
  		return 0
  	fi
  	if [ ! -d "${WORKDIR}" ]; then
  		install -m${PORTAGE_WORKDIR_MODE:-0700} -d "${WORKDIR}" || die "Failed to create dir '${WORKDIR}'"
  	fi
  	cd "${WORKDIR}" || die "Directory change failed: \`cd '${WORKDIR}'\`"
- 	ebuild_phase pre_src_unpack
- 	vecho ">>> Unpacking source$(_get_abi_string)..."
- 	ebuild_phase src_unpack
+ 	__ebuild_phase pre_src_unpack
 -	__vecho ">>> Unpacking source..."
++	__vecho ">>> Unpacking source$(_get_abi_string)..."
+ 	__ebuild_phase src_unpack
 +
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			if is_auto-multilib && is_ebuild; then
 +				>> "$PORTAGE_BUILDDIR"/.unpacked."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .unpacked.${LOOP_ABI}'"
 +			fi
 +			is_ebuild && { unset_abi; source "${T}"/environment || die ; }
 +
 +			is_ebuild && { rm "${T}"/environment || die ; }
 +		fi
  	>> "$PORTAGE_BUILDDIR/.unpacked" || \
  		die "Failed to create $PORTAGE_BUILDDIR/.unpacked"
- 	vecho ">>> Source unpacked in ${WORKDIR}"
- 	ebuild_phase post_src_unpack
+ 	__vecho ">>> Source unpacked in ${WORKDIR}"
+ 	__ebuild_phase post_src_unpack
  }
  
- dyn_clean() {
+ __dyn_clean() {
  	if [ -z "${PORTAGE_BUILDDIR}" ]; then
  		echo "Aborting clean phase because PORTAGE_BUILDDIR is unset!"
  		return 1
@@@ -421,25 -372,15 +421,25 @@@ __dyn_prepare() 
  		die "The source directory '${S}' doesn't exist"
  	fi
  
- 	trap abort_prepare SIGINT SIGQUIT
+ 	trap __abort_prepare SIGINT SIGQUIT
  
- 	ebuild_phase pre_src_prepare
- 	vecho ">>> Preparing source in $PWD$(_get_abi_string) ..."
- 	ebuild_phase src_prepare
+ 	__ebuild_phase pre_src_prepare
 -	__vecho ">>> Preparing source in $PWD ..."
++	__vecho ">>> Preparing source in $PWD$(_get_abi_string) ..."
+ 	__ebuild_phase src_prepare
 +
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			if is_auto-multilib && is_ebuild; then
 +				>> "$PORTAGE_BUILDDIR"/.prepared."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .prepared.${LOOP_ABI}'"
 +			fi
 +			is_ebuild && { unset_abi; source "${T}"/environment || die ; }
 +		fi
 +	done
 +	[[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
 +
  	>> "$PORTAGE_BUILDDIR/.prepared" || \
  		die "Failed to create $PORTAGE_BUILDDIR/.prepared"
- 	vecho ">>> Source prepared."
- 	ebuild_phase post_src_prepare
+ 	__vecho ">>> Source prepared."
+ 	__ebuild_phase post_src_prepare
  
  	trap - SIGINT SIGQUIT
  }
@@@ -472,26 -403,17 +472,26 @@@ __dyn_configure() 
  		die "The source directory '${S}' doesn't exist"
  	fi
  
- 	trap abort_configure SIGINT SIGQUIT
+ 	trap __abort_configure SIGINT SIGQUIT
  
- 	ebuild_phase pre_src_configure
+ 	__ebuild_phase pre_src_configure
  
- 	vecho ">>> Configuring source in $PWD$(_get_abi_string) ..."
- 	ebuild_phase src_configure
 -	__vecho ">>> Configuring source in $PWD ..."
++	__vecho ">>> Configuring source in $PWD$(_get_abi_string) ..."
+ 	__ebuild_phase src_configure
 +
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			if is_auto-multilib && is_ebuild; then
 +				>> "$PORTAGE_BUILDDIR"/.configured."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .configured.${LOOP_ABI}'"
 +			fi
 +			is_ebuild && { unset_abi; source "${T}"/environment || die ; }
 +		fi
 +	done
 +	[[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
  	>> "$PORTAGE_BUILDDIR/.configured" || \
  		die "Failed to create $PORTAGE_BUILDDIR/.configured"
- 	vecho ">>> Source configured."
+ 	__vecho ">>> Source configured."
  
- 	ebuild_phase post_src_configure
+ 	__ebuild_phase post_src_configure
  
  	trap - SIGINT SIGQUIT
  }
@@@ -533,24 -445,15 +533,24 @@@ __dyn_compile() 
  		fi
  	fi
  
- 	ebuild_phase pre_src_compile
+ 	__ebuild_phase pre_src_compile
  
- 	vecho ">>> Compiling source in $PWD$(_get_abi_string) ..."
- 	ebuild_phase src_compile
 -	__vecho ">>> Compiling source in $PWD ..."
++	__vecho ">>> Compiling source in $PWD$(_get_abi_string) ..."
+ 	__ebuild_phase src_compile
 +
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			if is_auto-multilib && is_ebuild; then
 +				>> "$PORTAGE_BUILDDIR"/.compiled."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .compiled.${LOOP_ABI}'"
 +			fi
 +			is_ebuild && { unset_abi; source "${T}"/environment || die ; }
 +		fi
 +	done
 +	[[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm "${T}"/environment || die ; }
  	>> "$PORTAGE_BUILDDIR/.compiled" || \
  		die "Failed to create $PORTAGE_BUILDDIR/.compiled"
- 	vecho ">>> Source compiled."
+ 	__vecho ">>> Source compiled."
  
- 	ebuild_phase post_src_compile
+ 	__ebuild_phase post_src_compile
  
  	trap - SIGINT SIGQUIT
  }
@@@ -568,10 -472,7 +569,10 @@@ __dyn_test() 
  		! has test ${USE} && export USE="${USE} test"
  	fi
  
- 	trap "abort_test" SIGINT SIGQUIT
+ 	trap "__abort_test" SIGINT SIGQUIT
 +	for LOOP_ABI in $(get_abi_list); do
 +		[[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; }
 +
  	if [ -d "${S}" ]; then
  		cd "${S}"
  	else
@@@ -579,32 -480,18 +580,32 @@@
  	fi
  
  	if ! has test $FEATURES && [ "${EBUILD_FORCE_TEST}" != "1" ]; then
- 		vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
+ 		__vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
  	elif has test $RESTRICT; then
  		einfo "Skipping make test/check due to ebuild restriction."
- 		vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}"
+ 		__vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}"
  	else
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			if [ ${PORTAGE_BUILDDIR}/.tested.${LOOP_ABI} -nt "${WORKDIR}" ]; then
 +				echo ">>> It appears that ${PN} is already tested for ABI=${LOOP_ABI}; skipping."
 +				echo ">>> Remove '$PORTAGE_BUILDDIR/.tested.${LOOP_ABI}' to force testing."
 +				continue
 +			fi
 +		fi
 +
  		local save_sp=${SANDBOX_PREDICT}
  		addpredict /
- 		ebuild_phase pre_src_test
- 		ebuild_phase src_test
+ 		__ebuild_phase pre_src_test
+ 		__ebuild_phase src_test
 +
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			if is_auto-multilib && is_ebuild; then
 +				>> "$PORTAGE_BUILDDIR"/.tested."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .tested.${LOOP_ABI}'"
 +			fi
 +		fi
  		>> "$PORTAGE_BUILDDIR/.tested" || \
  			die "Failed to create $PORTAGE_BUILDDIR/.tested"
- 		ebuild_phase post_src_test
+ 		__ebuild_phase post_src_test
  		SANDBOX_PREDICT=${save_sp}
  	fi
  
@@@ -661,35 -541,12 +662,35 @@@ __dyn_install() 
  	export _E_EXEDESTTREE_=""
  	export _E_DOCDESTTREE_=""
  
- 	ebuild_phase src_install
+ 	__ebuild_phase src_install
 +
 +		if ( [[ " ${FEATURES} " == *" force-multilib "* ]] && is_auto-multilib ) ; then
 +			_finalize_abi_install
 +			cp "${T}"/environment "${PORTAGE_BUILDDIR}"/build-info/environment.${LOOP_ABI} || die
 +			if is_ebuild; then
 +				unset_abi; source "${T}"/environment || die
 +				touch "$PORTAGE_BUILDDIR"/.installed."${LOOP_ABI}" || die "IO Failure -- Failed to 'touch .installed.${LOOP_ABI}'"
 +			fi
 +		fi
 +	done
 +	if [[ -d "${D}" ]]; then
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			if [[ ${CATEGORY}/${PN} == sys-devel/libtool ]] ; then
 +				ewarn "Preserving libltdl.la because of extensive usage"
 +				ewarn "even in m4 macros of libtool"
 +			elif [[ ${CATEGORY}/${PN} == media-libs/gst-plugins-* ]] ; then
 +				ewarn "Preserving .la files for gst plugins"
 +				ewarn "because of broken Gentoo package"
 +			else
 +				find "${D}" -name '*.la' ! -exec grep -q shouldnotlink=yes {} \; -exec rm {} \;
 +			fi
 +		fi
 +
  	>> "$PORTAGE_BUILDDIR/.installed" || \
  		die "Failed to create $PORTAGE_BUILDDIR/.installed"
- 	vecho ">>> Completed installing ${PF} into ${D}"
- 	vecho
- 	ebuild_phase post_src_install
+ 	__vecho ">>> Completed installing ${PF} into ${D}"
+ 	__vecho
+ 	__ebuild_phase post_src_install
  
  	cd "${PORTAGE_BUILDDIR}"/build-info
  	set -f
@@@ -1042,98 -861,31 +1031,109 @@@ __ebuild_main() 
  
  	case ${1} in
  	nofetch)
- 		ebuild_phase_with_hooks pkg_nofetch
+ 		__ebuild_phase_with_hooks pkg_nofetch
  		;;
 -	prerm|postrm|preinst|postinst|config|info)
 +	config|info)
  		if has "${1}" config info && \
  			! declare -F "pkg_${1}" >/dev/null ; then
  			ewarn  "pkg_${1}() is not defined: '${EBUILD##*/}'"
  		fi
  		export SANDBOX_ON="0"
  		if [ "${PORTAGE_DEBUG}" != "1" ] || [ "${-/x/}" != "$-" ]; then
- 			ebuild_phase_with_hooks pkg_${1}
+ 			__ebuild_phase_with_hooks pkg_${1}
  		else
  			set -x
- 			ebuild_phase_with_hooks pkg_${1}
+ 			__ebuild_phase_with_hooks pkg_${1}
  			set +x
  		fi
+ 		if [[ -n $PORTAGE_UPDATE_ENV ]] ; then
+ 			# Update environment.bz2 in case installation phases
+ 			# need to pass some variables to uninstallation phases.
+ 			__save_ebuild_env --exclude-init-phases | \
+ 				__filter_readonly_variables --filter-path \
+ 				--filter-sandbox --allow-extra-vars \
+ 				| ${PORTAGE_BZIP2_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
+ 			assert "__save_ebuild_env failed"
+ 		fi
  		;;
- 	prerm|postrm|postinst)
++	prerm|postrm|preinst|postinst)
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			for LOOP_ABI in $(get_abi_order); do
 +				if is_auto-multilib ; then
 +					case ${1} in
- 						postinst)
++						preinst|postinst)
 +							set_abi ${LOOP_ABI}
++							source "${T}"/environment
 +							;;
 +						prerm|postrm)
 +							# if = backward compactibility for previous versions, which did not
 +							# install a per-ABI environment
 +							if [[ -f "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 ]] ; then
 +								bzcat "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 > "${T}"/environment || die
 +								preprocess_ebuild_env --filter-metadata
 +							fi
 +							;;
 +					esac
 +					# >/dev/null = backward compactibility for prerm/postrm
 +					source "${T}"/environment 2>/dev/null || die
 +				fi
 +				export SANDBOX_ON="0"
 +				if [ "${PORTAGE_DEBUG}" != "1" ] || [ "${-/x/}" != "$-" ]; then
- 					ebuild_phase_with_hooks pkg_${1}
++					__ebuild_phase_with_hooks pkg_${1}
 +				else
 +					set -x
- 					ebuild_phase_with_hooks pkg_${1}
++					__ebuild_phase_with_hooks pkg_${1}
 +					set +x
 +				fi
 +
- 				if [[ $EBUILD_PHASE == postinst ]] && [[ -n $PORTAGE_UPDATE_ENV ]]; then
++				if [[ -n $PORTAGE_UPDATE_ENV ]] ; then
 +					# Update environment.bz2 in case installation phases
 +					# need to pass some variables to uninstallation phases.
- 					save_ebuild_env --exclude-init-phases | \
- 						filter_readonly_variables --filter-path \
++					__save_ebuild_env --exclude-init-phases | \
++						__filter_readonly_variables --filter-path \
 +						--filter-sandbox --allow-extra-vars \
 +						| ${PORTAGE_BZIP2_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
- 					assert "save_ebuild_env failed"
++					assert "__save_ebuild_env failed"
 +				fi
 +				if is_auto-multilib ; then
 +					case ${1} in
- 						postinst)
++						preinst|postinst)
 +							unset_abi
++							source "${T}"/environment
 +							;;
 +						prerm|postrm)
 +							#if = backward compactibility for previous versions, which did not
 +							#install a per-ABI environment
 +							if [[ -f "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 ]] ; then
 +								preprocess_ebuild_env --filter-metadata
 +								bzcat "${ROOT}"var/db/pkg/${CATEGORY}/${PF}/environment.${LOOP_ABI}.bz2 > "${T}"/environment || die
 +							fi
 +							;;
 +					esac
 +					# >/dev/null = backward compactibility for prerm/postrm
 +					source "${T}"/environment 2>/dev/null || die
 +				fi
 +			done
 +		else
 +			export SANDBOX_ON="0"
 +			if [ "${PORTAGE_DEBUG}" != "1" ] || [ "${-/x/}" != "$-" ]; then
- 				ebuild_phase_with_hooks pkg_${1}
++				__ebuild_phase_with_hooks pkg_${1}
 +			else
 +				set -x
- 				ebuild_phase_with_hooks pkg_${1}
++				__ebuild_phase_with_hooks pkg_${1}
 +				set +x
 +			fi
++			if [[ -n $PORTAGE_UPDATE_ENV ]] ; then
++				# Update environment.bz2 in case installation phases
++				# need to pass some variables to uninstallation phases.
++				__save_ebuild_env --exclude-init-phases | \
++					__filter_readonly_variables --filter-path \
++					--filter-sandbox --allow-extra-vars \
++					| ${PORTAGE_BZIP2_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
++				assert "__save_ebuild_env failed"
++			fi
 +		fi
-                if [[ $EBUILD_PHASE == postinst ]] && [[ -n $PORTAGE_UPDATE_ENV ]]; then
-                        # Update environment.bz2 in case installation phases
-                        # need to pass some variables to uninstallation phases.
-                        save_ebuild_env --exclude-init-phases | \
-                                filter_readonly_variables --filter-path \
-                                --filter-sandbox --allow-extra-vars \
-                                | ${PORTAGE_BZIP2_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
-                        assert "save_ebuild_env failed"
-                fi
 +		;;
  	unpack|prepare|configure|compile|test|clean|install)
  		if [[ ${SANDBOX_DISABLED:-0} = 0 ]] ; then
  			export SANDBOX_ON="1"