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

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

commit:     c228c4eb91cf5ce304718f73041a35e6d31f0bb1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 09:46:45 2014 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 09:46:45 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c228c4eb

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

Conflicts:
	bin/helper-functions.sh
	pym/portage/const.py


 DEVELOPING                                         |  29 +-
 RELEASE-NOTES                                      |  19 +-
 bin/chpathtool.py                                  |  61 +++-
 bin/ebuild                                         |   6 +-
 bin/ebuild-helpers/prepstrip                       |  13 +-
 bin/ebuild.sh                                      |   2 +-
 bin/egencache                                      | 138 +++++----
 bin/emaint                                         |   4 +-
 bin/emerge                                         |   4 +-
 bin/helper-functions.sh                            |  56 ++--
 bin/isolated-functions.sh                          |   9 +-
 bin/misc-functions.sh                              |  22 +-
 bin/phase-functions.sh                             |   2 +-
 bin/phase-helpers.sh                               |  19 +-
 bin/portageq                                       |  56 ++--
 bin/repoman                                        | 277 +++++++++---------
 bin/save-ebuild-env.sh                             |   3 +-
 bin/xattr-helper.py                                | 112 ++++----
 cnf/sets/portage.conf                              |   2 +-
 man/ebuild.5                                       |   2 -
 man/make.conf.5                                    |   3 +-
 man/portage.5                                      | 104 +++++--
 mkrelease.sh                                       |  76 +++--
 pym/_emerge/Binpkg.py                              |   1 +
 pym/_emerge/BinpkgExtractorAsync.py                |  15 +-
 pym/_emerge/BlockerCache.py                        |   6 +-
 pym/_emerge/EbuildExecuter.py                      |  11 +-
 pym/_emerge/actions.py                             |   6 +-
 pym/_emerge/countdown.py                           |  18 +-
 pym/_emerge/depgraph.py                            | 311 ++++++++++++++++-----
 pym/portage/_sets/__init__.py                      |   2 +-
 pym/portage/const.py                               | 166 ++++++++---
 pym/portage/dbapi/bintree.py                       |   7 +-
 pym/portage/env/loaders.py                         |  26 +-
 pym/portage/exception.py                           |  45 +--
 pym/portage/output.py                              |  14 +-
 pym/portage/package/ebuild/_config/MaskManager.py  |   4 +-
 pym/portage/tests/__init__.py                      |  54 +++-
 pym/portage/tests/ebuild/test_config.py            |   2 +-
 .../tests/resolver/test_slot_conflict_rebuild.py   | 261 ++++++++++++++++-
 pym/portage/util/ExtractKernelVersion.py           |   6 +-
 pym/portage/util/SlotObject.py                     |   1 -
 pym/portage/util/__init__.py                       | 112 ++++----
 pym/portage/util/_info_files.py                    |  20 +-
 pym/portage/util/_urlopen.py                       |   2 +-
 pym/portage/util/digraph.py                        |  24 +-
 pym/portage/util/env_update.py                     |   8 +-
 pym/portage/util/lafilefixer.py                    |  10 +-
 pym/portage/util/movefile.py                       |  34 +--
 runtests.sh                                        |  11 +
 50 files changed, 1506 insertions(+), 690 deletions(-)

diff --cc bin/misc-functions.sh
index 83004df,5ccf7c2..9ce9df6
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
diff --cc pym/_emerge/actions.py
index 663f1fd,9bb4774..30bb07d
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -38,9 -38,8 +38,9 @@@ from portage import o
  from portage import shutil
  from portage import eapi_is_supported, _encodings, _unicode_decode
  from portage.cache.cache_errors import CacheError
 +from portage.const import EPREFIX
  from portage.const import GLOBAL_CONFIG_PATH, VCS_DIRS, _DEPCLEAN_LIB_CHECK_DEFAULT
- from portage.const import SUPPORTED_BINPKG_FORMATS
+ from portage.const import SUPPORTED_BINPKG_FORMATS, TIMESTAMP_FORMAT
  from portage.dbapi.dep_expand import dep_expand
  from portage.dbapi._expand_new_virt import expand_new_virt
  from portage.dep import Atom
diff --cc pym/portage/const.py
index 1b96650,1785bff..89d7ee2
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -65,11 -58,10 +65,12 @@@ DEPCACHE_PATH            = "/var/cache/
  GLOBAL_CONFIG_PATH       = "/usr/share/portage/config"
  
  # these variables are not used with target_root or config_root
 +PORTAGE_BASE_PATH        = PORTAGE_BASE
  # NOTE: Use realpath(__file__) so that python module symlinks in site-packages
  # are followed back to the real location of the whole portage installation.
 -PORTAGE_BASE_PATH        = os.path.join(os.sep, os.sep.join(os.path.realpath(
 -                               __file__.rstrip("co")).split(os.sep)[:-3]))
 +#PREFIX: below should work, but I'm not sure how it it affects other places
- #PORTAGE_BASE_PATH        = os.path.join(os.sep, os.sep.join(os.path.realpath(__file__.rstrip("co")).split(os.sep)[:-3]))
++#PORTAGE_BASE_PATH        = os.path.join(os.sep, os.sep.join(os.path.realpath(
++#                               __file__.rstrip("co")).split(os.sep)[:-3]))
  PORTAGE_BIN_PATH         = PORTAGE_BASE_PATH + "/bin"
  PORTAGE_PYM_PATH         = PORTAGE_BASE_PATH + "/pym"
  LOCALE_DATA_PATH         = PORTAGE_BASE_PATH + "/locale"  # FIXME: not used
@@@ -182,9 -239,7 +259,9 @@@ MANIFEST2_IDENTIFIERS    = ("AUX", "MIS
  # a config instance (since it's possible to contruct a config instance with
  # a different EPREFIX). Therefore, the EPREFIX constant should *NOT* be used
  # in the definition of any other constants within this file.
 -EPREFIX = ""
 +# PREFIX LOCAL: rely on EPREFIX from autotools
- #EPREFIX=""
++#EPREFIX = ""
 +# END PREFIX LOCAL
  
  # pick up EPREFIX from the environment if set
  if "PORTAGE_OVERRIDE_EPREFIX" in os.environ:
diff --cc pym/portage/util/_info_files.py
index a920636,fabf74b..de44b0f
--- a/pym/portage/util/_info_files.py
+++ b/pym/portage/util/_info_files.py
@@@ -13,13 -12,13 +13,13 @@@ from portage.const import EPREFI
  
  def chk_updated_info_files(root, infodirs, prev_mtimes):
  
 -	if os.path.exists("/usr/bin/install-info"):
 +	if os.path.exists(EPREFIX + "/usr/bin/install-info"):
  		out = portage.output.EOutput()
- 		regen_infodirs=[]
+ 		regen_infodirs = []
  		for z in infodirs:
- 			if z=='':
+ 			if z == '':
  				continue
 -			inforoot = portage.util.normalize_path(root + z)
 +			inforoot = portage.util.normalize_path(root + EPREFIX + z)
  			if os.path.isdir(inforoot) and \
  				not [x for x in os.listdir(inforoot) \
  				if x.startswith('.keepinfodir')]: