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

["Fabian Groffen" <grobian@gentoo.org>]

commit:     ace2a1c9328b8782497c59a5c890e32eb7456de3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 15:52:49 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 15:52:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ace2a1c9

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	bin/dispatch-conf
	bin/dohtml.py
	bin/ebuild-helpers/dohtml
	bin/ebuild-helpers/portageq
	bin/ebuild-ipc
	bin/misc-functions.sh
	bin/phase-helpers.sh
	pym/portage/dbapi/bintree.py


 NEWS                                               |   2 +-
 RELEASE-NOTES                                      |   7 +-
 bin/archive-conf                                   |  16 +--
 bin/clean_locks                                    |   2 -
 bin/dispatch-conf                                  |   9 +-
 bin/dohtml.py                                      |   5 +-
 bin/ebuild                                         |   3 +-
 bin/ebuild-helpers/dohtml                          |  12 ++-
 bin/ebuild-helpers/ecompressdir                    |  15 +++
 bin/ebuild-helpers/portageq                        |   4 +-
 bin/ebuild-ipc                                     |   4 +-
 bin/ebuild.sh                                      |   8 +-
 bin/egencache                                      |  13 +--
 bin/emerge                                         |   1 -
 bin/misc-functions.sh                              |   6 +-
 bin/phase-functions.sh                             |  34 ++++--
 bin/phase-helpers.sh                               |  23 ++--
 bin/quickpkg                                       |   3 +-
 bin/repoman                                        | 120 +++++++++------------
 cnf/make.globals                                   |   8 +-
 cnf/metadata.dtd                                   |   2 +-
 man/ebuild.5                                       |   6 +-
 man/egencache.1                                    |   8 +-
 man/emerge.1                                       |   7 +-
 man/make.conf.5                                    |  36 +++++--
 man/portage.5                                      |   8 +-
 man/repoman.1                                      |  10 +-
 pym/_emerge/BinpkgFetcher.py                       |   8 +-
 pym/_emerge/EbuildBuild.py                         |  10 +-
 pym/_emerge/EbuildFetcher.py                       |   3 +-
 pym/_emerge/JobStatusDisplay.py                    |   3 +-
 pym/_emerge/MetadataRegen.py                       |   2 +
 pym/_emerge/Scheduler.py                           |   6 +-
 pym/_emerge/actions.py                             | 103 ++++++++++--------
 pym/_emerge/depgraph.py                            |  58 +++++++---
 pym/_emerge/main.py                                |  38 ++++---
 pym/_emerge/resolver/circular_dependency.py        |   3 +-
 pym/portage/__init__.py                            |  36 +------
 pym/portage/cache/template.py                      |  13 ++-
 pym/portage/dbapi/__init__.py                      |  57 +++++-----
 pym/portage/dbapi/bintree.py                       |  89 ++++++++++-----
 pym/portage/dbapi/porttree.py                      |  67 ++++++++++--
 pym/portage/dbapi/vartree.py                       |   5 +-
 pym/portage/dep/__init__.py                        |  38 +++++--
 pym/portage/getbinpkg.py                           |  33 ++++--
 pym/portage/package/ebuild/_config/UseManager.py   |   2 +-
 .../package/ebuild/_config/special_env_vars.py     |   2 +-
 pym/portage/package/ebuild/doebuild.py             |  21 ++--
 pym/portage/package/ebuild/fetch.py                |  22 +++-
 pym/portage/repository/config.py                   |  15 ++-
 pym/portage/tests/dep/test_isvalidatom.py          |   5 +-
 pym/portage/tests/dep/test_match_from_list.py      |   7 +-
 pym/portage/tests/resolver/ResolverPlayground.py   |   3 +-
 pym/portage/tests/util/test_getconfig.py           |   4 +-
 pym/portage/util/env_update.py                     |  63 ++++++-----
 pym/repoman/checks.py                              |   1 +
 56 files changed, 680 insertions(+), 409 deletions(-)

diff --cc bin/dispatch-conf
index 8e070ee,a41464f..d560e2b
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@@ -22,11 -22,9 +22,10 @@@ sys.path.insert(0, pym_path
  import portage
  portage._internal_caller = True
  from portage import os
- from portage import dispatch_conf
  from portage import _unicode_decode
  from portage.dispatch_conf import diffstatusoutput
- from portage.process import find_binary
+ from portage.process import find_binary, spawn
 +from portage.const import EPREFIX
  
  FIND_EXTANT_CONFIGS  = "find '%s' %s -name '._cfg????_%s' ! -name '.*~' ! -iname '.*.bak' -print"
  DIFF_CONTENTS        = "diff -Nu '%s' '%s'"
diff --cc bin/dohtml.py
index 0ce8339,1b6ba89..e3fa100
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python
 +#!@PREFIX_PORTAGE_PYTHON@
- # Copyright 1999-2012 Gentoo Foundation
+ # Copyright 1999-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  #
diff --cc bin/ebuild-helpers/dohtml
index 4f102b0,fd9efd2..e22062d
--- a/bin/ebuild-helpers/dohtml
+++ b/bin/ebuild-helpers/dohtml
@@@ -1,14 -1,19 +1,24 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 2009-2010 Gentoo Foundation
+ # Copyright 2009-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
++<<<<<<< HEAD
 +PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}
 +PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}
++=======
+ PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
+ PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
+ # Use safe cwd, avoiding unsafe import for bug #469338.
+ export __PORTAGE_HELPER_CWD=${PWD}
+ cd "${PORTAGE_PYM_PATH}"
++>>>>>>> overlays-gentoo-org/master
  PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
 -	"${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/dohtml.py" "$@"
 +	"${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/dohtml.py" "$@"
  
  ret=$?
+ # Restore cwd for display by __helpers_die
+ cd "${__PORTAGE_HELPER_CWD}"
  [[ $ret -ne 0 ]] && __helpers_die "${0##*/} failed"
  exit $ret
diff --cc bin/ebuild-helpers/portageq
index 1afd79a,7bd330b..6ba2d88
--- a/bin/ebuild-helpers/portageq
+++ b/bin/ebuild-helpers/portageq
@@@ -1,8 -1,10 +1,10 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 2009-2010 Gentoo Foundation
+ # Copyright 2009-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
 -PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
 +PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}
 +PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}
+ # Use safe cwd, avoiding unsafe import for bug #469338.
+ cd "${PORTAGE_PYM_PATH}"
  PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
 -	exec "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/portageq" "$@"
 +	exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/portageq" "$@"
diff --cc bin/ebuild-ipc
index 5b9ad53,9ff6f1c..7839195
--- a/bin/ebuild-ipc
+++ b/bin/ebuild-ipc
@@@ -1,8 -1,10 +1,10 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 2010 Gentoo Foundation
+ # Copyright 2010-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
  PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
+ # Use safe cwd, avoiding unsafe import for bug #469338.
+ cd "${PORTAGE_PYM_PATH}"
  PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
 -	exec "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/ebuild-ipc.py" "$@"
 +	exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/ebuild-ipc.py" "$@"
diff --cc bin/misc-functions.sh
index e2960bd,ad99d8a..105129a
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2012 Gentoo Foundation
+ # Copyright 1999-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  #
  # Miscellaneous shell functions that make use of the ebuild env but don't need
@@@ -803,8 -748,9 +804,9 @@@ install_qa_check_misc() 
  		local cat_cmd=cat
  		[[ $PORTAGE_LOG_FILE = *.gz ]] && cat_cmd=zcat
  		[[ $reset_debug = 1 ]] && set -x
- 		f=$($cat_cmd "${PORTAGE_LOG_FILE}" | \
+ 		# Use safe cwd, avoiding unsafe import for bug #469338.
+ 		f=$(cd "${PORTAGE_PYM_PATH}" ; $cat_cmd "${PORTAGE_LOG_FILE}" | \
 -			"${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py || die "check-implicit-pointer-usage.py failed")
 +			"${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py || die "check-implicit-pointer-usage.py failed")
  		if [[ -n ${f} ]] ; then
  
  			# In the future this will be a forced "die". In preparation,
diff --cc bin/phase-helpers.sh
index 70c95b0,a97323a..95052eb
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PREFIX_PORTAGE_BASH@
- # Copyright 1999-2012 Gentoo Foundation
+ # Copyright 1999-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  export DESTTREE=/usr
diff --cc pym/_emerge/EbuildBuild.py
index 71567ea,75d906f..9a18e72
--- a/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@@ -15,8 -15,8 +15,9 @@@ import portag
  from portage import os
  from portage.output import colorize
  from portage.package.ebuild.digestcheck import digestcheck
+ from portage.package.ebuild.digestgen import digestgen
  from portage.package.ebuild.doebuild import _check_temp_dir
 +from portage.const import EPREFIX
  from portage.package.ebuild._spawn_nofetch import spawn_nofetch
  
  class EbuildBuild(CompositeTask):
diff --cc pym/_emerge/main.py
index 2f02fb7,689d136..76404fc
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@@ -14,9 -15,9 +15,10 @@@ portage.proxy.lazyimport.lazyimport(glo
  	'_emerge.actions:load_emerge_config,run_action,' + \
  		'validate_ebuild_environment',
  	'_emerge.help:help@emerge_help',
+ 	'_emerge.is_valid_package_atom:insert_category_into_atom'
  )
  from portage import os
 +from portage.const import EPREFIX
  
  if sys.hexversion >= 0x3000000:
  	long = int
diff --cc pym/portage/dbapi/bintree.py
index f3d044e,77b2886..2bad28e
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@@ -308,8 -307,8 +309,8 @@@ class binarytree(object)
  			self._pkgindex_aux_keys = \
  				["BUILD_TIME", "CHOST", "DEPEND", "DESCRIPTION", "EAPI",
  				"HDEPEND", "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",
- 				"PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES",
+ 				"PROVIDE", "RESTRICT", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES",
 -				"BASE_URI"]
 +				"BASE_URI", "EPREFIX"]
  			self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
  			self._pkgindex_use_evaluated_keys = \
  				("DEPEND", "HDEPEND", "LICENSE", "RDEPEND",