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

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

commit:     6f702fe9d6af3e8f58cb7850472df69fc870d6df
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  2 12:59:01 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  2 12:59:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6f702fe9

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


 bin/archive-conf                                   |    2 +-
 bin/eapi.sh                                        |    8 +
 bin/ebuild-helpers/dodoc                           |    2 +-
 bin/ebuild-helpers/doinfo                          |    2 +-
 bin/ebuild-helpers/prepman                         |    2 +-
 bin/ebuild-helpers/prepstrip                       |   78 +++++---
 bin/ebuild.sh                                      |    3 +-
 bin/egencache                                      |    2 +-
 bin/emerge-webrsync                                |    9 +-
 bin/glsa-check                                     |   14 +-
 bin/misc-functions.sh                              |   21 +-
 bin/phase-functions.sh                             |    3 +-
 bin/phase-helpers.sh                               |   28 ++-
 bin/repoman                                        |   61 ++++--
 bin/save-ebuild-env.sh                             |    2 +
 cnf/make.globals                                   |    2 +-
 doc/package/ebuild/eapi/4-python.docbook           |   36 ++++
 doc/package/ebuild/eapi/5-progress.docbook         |   78 +++++++
 man/egencache.1                                    |   28 ++-
 man/emerge.1                                       |   11 +-
 man/portage.5                                      |    8 +-
 misc/emerge-delta-webrsync                         |    9 +-
 pym/_emerge/AbstractEbuildProcess.py               |    4 +-
 pym/_emerge/AsynchronousLock.py                    |    1 +
 pym/_emerge/BlockerDB.py                           |    7 +-
 pym/_emerge/EbuildBuild.py                         |    4 +-
 pym/_emerge/EbuildBuildDir.py                      |    4 +-
 pym/_emerge/EbuildExecuter.py                      |    2 +-
 pym/_emerge/EbuildMetadataPhase.py                 |    9 +
 pym/_emerge/FakeVartree.py                         |   32 ++--
 pym/_emerge/Package.py                             |  150 ++++++++++----
 pym/_emerge/PackageVirtualDbapi.py                 |    4 +-
 pym/_emerge/Scheduler.py                           |   32 ++--
 pym/_emerge/actions.py                             |  122 ++++++++----
 pym/_emerge/depgraph.py                            |  213 ++++++++------------
 pym/_emerge/main.py                                |   10 +
 pym/_emerge/resolver/circular_dependency.py        |   14 +-
 pym/_emerge/resolver/output.py                     |   14 +-
 pym/_emerge/resolver/slot_collision.py             |    7 +-
 pym/portage/__init__.py                            |    1 +
 pym/portage/_sets/base.py                          |    4 +-
 pym/portage/cache/flat_hash.py                     |   10 +-
 pym/portage/dbapi/__init__.py                      |   19 ++-
 pym/portage/dbapi/_similar_name_search.py          |   57 ++++++
 pym/portage/dbapi/bintree.py                       |    2 +-
 pym/portage/dbapi/porttree.py                      |    7 +
 pym/portage/dbapi/vartree.py                       |    7 +-
 pym/portage/dep/__init__.py                        |   67 ++++++-
 pym/portage/dep/_slot_operator.py                  |    4 +-
 pym/portage/dep/dep_check.py                       |    4 +-
 pym/portage/eapi.py                                |    6 +
 pym/portage/elog/mod_save.py                       |   24 ++-
 pym/portage/elog/mod_save_summary.py               |   21 ++-
 pym/portage/emaint/modules/move/move.py            |   22 ++-
 pym/portage/package/ebuild/_config/UseManager.py   |  119 +++++++++++-
 .../package/ebuild/_config/special_env_vars.py     |    7 +-
 .../package/ebuild/_config/unpack_dependencies.py  |   38 ++++
 pym/portage/package/ebuild/_spawn_nofetch.py       |    2 +-
 pym/portage/package/ebuild/config.py               |    5 +-
 pym/portage/package/ebuild/doebuild.py             |   38 +++-
 pym/portage/package/ebuild/getmaskingstatus.py     |    2 +-
 pym/portage/repository/config.py                   |   13 +-
 pym/portage/tests/dbapi/test_portdb_cache.py       |   16 +-
 pym/portage/tests/emerge/test_simple.py            |    2 +-
 pym/portage/tests/repoman/test_simple.py           |    2 +-
 pym/portage/tests/resolver/ResolverPlayground.py   |   17 +-
 .../resolver/test_depclean_slot_unavailable.py     |   79 +++++++
 .../tests/resolver/test_unpack_dependencies.py     |   65 ++++++
 pym/portage/tests/resolver/test_use_aliases.py     |  131 ++++++++++++
 pym/portage/tests/update/test_update_dbentry.py    |   45 ++++
 pym/portage/update.py                              |   32 +++-
 pym/portage/util/_desktop_entry.py                 |    1 +
 pym/portage/util/_eventloop/EventLoop.py           |   27 ++-
 pym/portage/util/movefile.py                       |   15 +-
 pym/repoman/checks.py                              |   39 ++---
 75 files changed, 1482 insertions(+), 506 deletions(-)

diff --cc bin/misc-functions.sh
index c30c7e0,6f84526..3684d7c
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
diff --cc cnf/make.globals
index 9739fc1,80a68f7..6db019b
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@@ -63,15 -63,9 +63,15 @@@ FEATURES="assume-digests binpkg-log
  # Ignore file collisions for unowned *.pyo and *.pyc files, this helps during
  # transition from compiling python modules in live file system to compiling
  # them in src_install() function.
- COLLISION_IGNORE="/lib/modules/* *.py[co]"
+ COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class"
  UNINSTALL_IGNORE="/lib/modules/*"
  
 +# Prefix: we want preserve-libs, not sure how mainline goes about this
 +FEATURES="${FEATURES} preserve-libs"
 +
 +# Force EPREFIX, ED and EROOT to exist in all EAPIs, not just 3 and up
 +FEATURES="${FEATURES} force-prefix"
 +
  # By default wait 5 secs before cleaning a package
  CLEAN_DELAY="5"
  
diff --cc pym/_emerge/Package.py
index 315811c,86ed5f7..3ac1c33
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@@ -296,16 -326,9 +327,16 @@@ class Package(Task)
  		if missing_keywords:
  			masks['KEYWORDS'] = missing_keywords
  
 +		if self.built and not self.installed:
 +			# we can have an old binary which has no EPREFIX information
 +			if "EPREFIX" not in self.metadata:
 +				masks['EPREFIX.missing'] = ''
 +			if len(self.metadata["EPREFIX"].strip()) < len(EPREFIX):
 +				masks['EPREFIX.tooshort'] = self.metadata["EPREFIX"].strip()
 +
  		try:
  			missing_properties = settings._getMissingProperties(
- 				self.cpv, self.metadata)
+ 				self.cpv, self._metadata)
  			if missing_properties:
  				masks['PROPERTIES'] = missing_properties
  		except InvalidDependString:
diff --cc pym/_emerge/depgraph.py
index 58a4893,65a94ab..88d95ae
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@@ -7647,16 -7604,10 +7604,16 @@@ def _get_masking_status(pkg, pkgsetting
  		portdb=root_config.trees["porttree"].dbapi, myrepo=myrepo)
  
  	if not pkg.installed:
- 		if not pkgsettings._accept_chost(pkg.cpv, pkg.metadata):
+ 		if not pkgsettings._accept_chost(pkg.cpv, pkg._metadata):
  			mreasons.append(_MaskReason("CHOST", "CHOST: %s" % \
- 				pkg.metadata["CHOST"]))
+ 				pkg._metadata["CHOST"]))
  
 +	if pkg.built and not pkg.installed:
 +		if not "EPREFIX" in pkg.metadata:
 +			mreasons.append(_MaskReason("EPREFIX", "missing EPREFIX"))
 +		elif len(pkg.metadata["EPREFIX"].strip()) < len(pkgsettings["EPREFIX"]):
 +			mreasons.append(_MaskReason("EPREFIX", "EPREFIX: '%s' too small" % pkg.metadata["EPREFIX"]))
 +
  	if pkg.invalid:
  		for msgs in pkg.invalid.values():
  			for msg in msgs: