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

[Fabian Groffen]

commit:     80319ff9c03b94303c4df153dc1f1de7462e5542
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 09:47:11 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 09:47:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=80319ff9

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

Conflicts:
	bin/ebuild-helpers/prepstrip
	pym/portage/data.py


 bin/ebuild-helpers/prepstrip             |   24 +++----
 bin/misc-functions.sh                    |   49 +++++++++++-
 bin/phase-functions.sh                   |    8 ++-
 cnf/make.conf                            |    6 ++
 cnf/make.conf.ia64.diff                  |   23 +-----
 cnf/make.conf.s390.diff                  |   23 +-----
 cnf/make.globals                         |    4 +-
 doc/package/ebuild.docbook               |    1 +
 doc/package/ebuild/eapi/4-python.docbook |   49 ++++++++++++
 doc/portage.docbook                      |    1 +
 man/ebuild.5                             |    9 ++
 man/emerge.1                             |    4 +-
 man/make.conf.5                          |    4 +
 pym/_emerge/MergeListItem.py             |    2 +-
 pym/_emerge/PackageMerge.py              |    2 +-
 pym/_emerge/Scheduler.py                 |    8 +-
 pym/_emerge/depgraph.py                  |   10 +-
 pym/_emerge/main.py                      |    5 +-
 pym/_emerge/resolver/output.py           |    2 +-
 pym/_emerge/resolver/slot_collision.py   |    2 +-
 pym/_emerge/search.py                    |    2 +-
 pym/portage/data.py                      |   55 ++++++++++----
 pym/portage/dbapi/vartree.py             |  125 ++++++++++++++++++++++++-----
 pym/portage/eclass_cache.py              |    2 +
 pym/portage/package/ebuild/doebuild.py   |    4 +
 25 files changed, 313 insertions(+), 111 deletions(-)

diff --cc bin/misc-functions.sh
index 1e3785c,c74b4a4..8b58bda
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
diff --cc bin/phase-functions.sh
index e62a9ad,7407aba..493bb54
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -128,9 -132,11 +132,11 @@@ filter_readonly_variables() 
  			${PORTAGE_SAVED_READONLY_VARS}
  			${PORTAGE_MUTABLE_FILTERED_VARS}
  		"
+ 	elif ! has --allow-extra-vars $* ; then
+ 		filtered_vars+=" ${binpkg_untrusted_vars}"
  	fi
  
 -	"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
 +	"${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
  }
  
  # @FUNCTION: preprocess_ebuild_env
diff --cc pym/portage/data.py
index 1351c7f,c4d967a..a136093
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@@ -156,26 -141,46 +156,51 @@@ def _get_global(k)
  
  	# Avoid instantiating portage.settings when the desired
  	# variable is set in os.environ.
- 	elif k == '_portage_grpname':
+ 	elif k in ('_portage_grpname', '_portage_username'):
  		v = None
- 		if 'PORTAGE_GRPNAME' in os.environ:
- 			v = os.environ['PORTAGE_GRPNAME']
- 		elif hasattr(portage, 'settings'):
- 			v = portage.settings.get('PORTAGE_GRPNAME')
- 		if v is None:
- 			# PREFIX LOCAL: use var iso hardwired 'portage'
- 			v = PORTAGE_GROUPNAME
- 			# END PREFIX LOCAL
- 	elif k == '_portage_username':
- 		v = None
- 		if 'PORTAGE_USERNAME' in os.environ:
- 			v = os.environ['PORTAGE_USERNAME']
+ 		if k == '_portage_grpname':
+ 			env_key = 'PORTAGE_GRPNAME'
+ 		else:
+ 			env_key = 'PORTAGE_USERNAME'
+ 
+ 		if env_key in os.environ:
+ 			v = os.environ[env_key]
  		elif hasattr(portage, 'settings'):
- 			v = portage.settings.get('PORTAGE_USERNAME')
+ 			v = portage.settings.get(env_key)
+ 		elif portage.const.EPREFIX:
+ 			# For prefix environments, default to the UID and GID of
+ 			# the top-level EROOT directory. The config class has
+ 			# equivalent code, but we also need to do it here if
+ 			# _disable_legacy_globals() has been called.
+ 			eroot = os.path.join(os.environ.get('ROOT', os.sep),
+ 				portage.const.EPREFIX.lstrip(os.sep))
+ 			try:
+ 				eroot_st = os.stat(eroot)
+ 			except OSError:
+ 				pass
+ 			else:
+ 				if k == '_portage_grpname':
+ 					try:
+ 						grp_struct = grp.getgrgid(eroot_st.st_gid)
+ 					except KeyError:
+ 						pass
+ 					else:
+ 						v = grp_struct.gr_name
+ 				else:
+ 					try:
+ 						pwd_struct = pwd.getpwuid(eroot_st.st_uid)
+ 					except KeyError:
+ 						pass
+ 					else:
+ 						v = pwd_struct.pw_name
+ 
  		if v is None:
 -			v = 'portage'
 +			# PREFIX LOCAL: use var iso hardwired 'portage'
- 			v = PORTAGE_USERNAME
++			if k == '_portage_grpname':
++				v = PORTAGE_GRPNAME
++			else:
++				v = PORTAGE_USERNAME
 +			# END PREFIX LOCAL
  	else:
  		raise AssertionError('unknown name: %s' % k)
  
diff --cc pym/portage/dbapi/vartree.py
index edc3983,d93d3c2..4745743
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@@ -30,11 -30,9 +30,12 @@@ portage.proxy.lazyimport.lazyimport(glo
  	'portage.util.movefile:movefile',
  	'portage.util._dyn_libs.PreservedLibsRegistry:PreservedLibsRegistry',
  	'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap',
 +	'portage.util._dyn_libs.LinkageMapMachO:LinkageMapMachO',
 +	'portage.util._dyn_libs.LinkageMapPeCoff:LinkageMapPeCoff',
 +	'portage.util._dyn_libs.LinkageMapXCoff:LinkageMapXCoff',
  	'portage.versions:best,catpkgsplit,catsplit,cpv_getkey,pkgcmp,' + \
  		'_pkgsplit@pkgsplit',
+ 	'subprocess',
  	'tarfile',
  )