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

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

commit:     dff820f4c52ba830543c00e2d335e531bf7de8c0
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 10:40:10 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon May 20 10:40:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dff820f4

Merge v2.2.0_alpha176


 NEWS                                               |    2 +-
 RELEASE-NOTES                                      |    7 +-
 bin/archive-conf                                   |   16 ++--
 bin/clean_locks                                    |    2 -
 bin/dispatch-conf                                  |    9 +-
 bin/dohtml.py                                      |    5 +-
 bin/ebuild-helpers/dohtml                          |    7 +-
 bin/ebuild-helpers/portageq                        |    4 +-
 bin/ebuild-ipc                                     |    4 +-
 bin/ebuild.sh                                      |    8 +-
 bin/egencache                                      |   10 +-
 bin/emerge                                         |    1 -
 bin/misc-functions.sh                              |    6 +-
 bin/phase-functions.sh                             |   34 +++++--
 bin/phase-helpers.sh                               |   23 ++---
 bin/repoman                                        |  104 +++++++-------------
 cnf/make.globals                                   |    8 +-
 cnf/metadata.dtd                                   |    2 +-
 man/ebuild.5                                       |    6 +-
 man/egencache.1                                    |    8 +-
 man/emerge.1                                       |    4 +-
 man/make.conf.5                                    |   36 +++++--
 pym/_emerge/BinpkgFetcher.py                       |    8 ++-
 pym/_emerge/EbuildBuild.py                         |   10 ++-
 pym/_emerge/EbuildFetcher.py                       |    3 +-
 pym/_emerge/JobStatusDisplay.py                    |    3 +-
 pym/_emerge/actions.py                             |    6 +
 pym/portage/dbapi/bintree.py                       |   89 +++++++++++------
 pym/portage/getbinpkg.py                           |   33 +++++--
 .../package/ebuild/_config/special_env_vars.py     |    2 +-
 pym/portage/package/ebuild/doebuild.py             |   21 ++---
 pym/portage/package/ebuild/fetch.py                |    9 ++-
 pym/portage/tests/util/test_getconfig.py           |    4 +-
 pym/portage/util/env_update.py                     |   63 ++++++++-----
 34 files changed, 324 insertions(+), 233 deletions(-)

diff --cc bin/phase-functions.sh
index 3031a5a,6d75ef1..828f929
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -558,36 -461,29 +558,40 @@@ __dyn_test() 
  		return
  	fi
  
- 	if [[ ${EBUILD_FORCE_TEST} == 1 && test =~ $PORTAGE_IUSE ]]; then
- 		# If USE came from ${T}/environment then it might not have USE=test
- 		# like it's supposed to here.
- 		! has test ${USE} && export USE="${USE} test"
- 	fi
- 
  	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
  		cd "${WORKDIR}"
  	fi
  
- 	if ! has test $FEATURES && [ "${EBUILD_FORCE_TEST}" != "1" ]; then
- 		__vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
- 	elif has test $RESTRICT; then
+ 	if has test ${RESTRICT} ; then
  		einfo "Skipping make test/check due to ebuild restriction."
- 		__vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}"
+ 		__vecho ">>> Test phase [disabled because of RESTRICT=test]: ${CATEGORY}/${PF}"
+ 
+ 	# If ${EBUILD_FORCE_TEST} == 1 and FEATURES came from ${T}/environment
+ 	# then it might not have FEATURES=test like it's supposed to here.
+ 	elif [[ ${EBUILD_FORCE_TEST} != 1 ]] && ! has test ${FEATURES} ; then
+ 		__vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
  	else
+ 		# If ${EBUILD_FORCE_TEST} == 1 and USE came from ${T}/environment
+ 		# then it might not have USE=test like it's supposed to here.
+ 		if [[ ${EBUILD_FORCE_TEST} == 1 && test =~ ${PORTAGE_IUSE} ]] && \
+ 			! has test ${USE} ; then
+ 			export USE="${USE} test"
+ 		fi
+ 
 +		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