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

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

commit:     1eda827ec2504da6e19a8455046761f060aab953
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 19:52:38 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 19:52:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1eda827e

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

Conflicts:
	bin/ebuild-helpers/prepallman
	bin/ebuild-helpers/prepman
	pym/_emerge/actions.py
	pym/portage/const.py


 bin/ebuild-helpers/ecompressdir                    |   33 ++-
 bin/ebuild-helpers/prepallman                      |    5 +-
 bin/ebuild-helpers/prepman                         |    5 +-
 bin/ebuild-helpers/prepstrip                       |    9 +-
 bin/emaint                                         |    3 +-
 bin/etc-update                                     |    4 +-
 bin/misc-functions.sh                              |    2 +-
 bin/portageq                                       |  304 ++++++++++++++++++--
 bin/repoman                                        |  107 ++++++--
 man/portage.5                                      |   11 +-
 pym/_emerge/Task.py                                |    9 +-
 pym/_emerge/actions.py                             |   35 ++-
 pym/_emerge/depgraph.py                            |  193 ++++++++++---
 pym/_emerge/is_valid_package_atom.py               |    5 +-
 pym/_emerge/resolver/output.py                     |   45 ++--
 pym/_emerge/stdout_spinner.py                      |   13 +-
 pym/portage/const.py                               |    6 +
 pym/portage/dbapi/vartree.py                       |   40 ++-
 pym/portage/dep/__init__.py                        |   21 +--
 pym/portage/emaint/__init__.py                     |    4 +-
 pym/portage/emaint/modules/__init__.py             |    4 +-
 pym/portage/emaint/modules/binhost/__init__.py     |    8 +-
 pym/portage/emaint/modules/config/__init__.py      |    8 +-
 pym/portage/emaint/modules/logs/__init__.py        |    8 +-
 pym/portage/emaint/modules/move/__init__.py        |    9 +-
 pym/portage/emaint/modules/resume/__init__.py      |    6 +-
 pym/portage/emaint/modules/world/__init__.py       |    8 +-
 pym/portage/locks.py                               |   42 +++-
 pym/portage/manifest.py                            |    3 +-
 .../package/ebuild/_config/LocationsManager.py     |   17 +-
 pym/portage/package/ebuild/config.py               |    2 +-
 pym/portage/repository/config.py                   |   38 ++-
 pym/portage/tests/__init__.py                      |   11 +-
 pym/portage/tests/bin/setup_env.py                 |   12 +-
 pym/portage/tests/emerge/test_simple.py            |   15 +-
 pym/portage/tests/resolver/test_slot_abi.py        |   85 ++++++-
 .../resolver/test_slot_operator_autounmask.py      |  120 ++++++++
 pym/portage/tests/runTests                         |    2 +-
 pym/portage/update.py                              |   26 ++-
 pym/portage/util/__init__.py                       |   19 +-
 .../util/_dyn_libs/display_preserved_libs.py       |   35 ++-
 pym/portage/util/listdir.py                        |    8 +-
 pym/portage/versions.py                            |   23 ++-
 pym/repoman/checks.py                              |    6 +-
 44 files changed, 1093 insertions(+), 276 deletions(-)

diff --cc bin/ebuild-helpers/prepallman
index 4ad3a5e,5331eaf..5362304
--- a/bin/ebuild-helpers/prepallman
+++ b/bin/ebuild-helpers/prepallman
@@@ -13,12 -13,7 +13,11 @@@ f
  
  ret=0
  
 +# PREFIX LOCAL: ED needs not to exist, wheras D does
 +[[ -d ${ED} ]] || exit ${ret}
 +# END PREFIX LOCAL
 +
- find "${ED}" -type d -name man > "${T}"/prepallman.filelist
- while read -r mandir ; do
+ while IFS= read -r -d '' mandir ; do
  	mandir=${mandir#${ED}}
  	prepman "${mandir%/man}"
  	((ret|=$?))
diff --cc bin/ebuild-helpers/prepman
index 6520235,fb5dcb4..9166015
--- a/bin/ebuild-helpers/prepman
+++ b/bin/ebuild-helpers/prepman
@@@ -2,7 -2,10 +2,10 @@@
  # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
+ # Do not compress man pages which are smaller than this (in bytes). #169260
+ SIZE_LIMIT='128'
+ 
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  if ! ___eapi_has_prefix_variables; then
  	ED=${D}
diff --cc bin/misc-functions.sh
index 2d75c92,ce3d681..aa9ad04
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
diff --cc pym/_emerge/actions.py
index 71913e8,2c5a1b3..d6f75e1
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -37,9 -37,7 +37,8 @@@ 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
- from portage.const import _DEPCLEAN_LIB_CHECK_DEFAULT
+ from portage.const import GLOBAL_CONFIG_PATH, VCS_DIRS, _DEPCLEAN_LIB_CHECK_DEFAULT
  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 360625b,5e960d9..a503c9a
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -65,7 -58,9 +65,11 @@@ 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_BIN_PATH         = PORTAGE_BASE_PATH + "/bin"
  PORTAGE_PYM_PATH         = PORTAGE_BASE_PATH + "/pym"
  LOCALE_DATA_PATH         = PORTAGE_BASE_PATH + "/locale"  # FIXME: not used
diff --cc pym/portage/util/__init__.py
index 57cf7f6,dafc3e3..a476e98
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@@ -45,8 -45,12 +45,13 @@@ from portage.exception import InvalidAt
  from portage.localization import _
  from portage.proxy.objectproxy import ObjectProxy
  from portage.cache.mappings import UserDict
 +from portage.const import EPREFIX
  
+ if sys.hexversion >= 0x3000000:
+ 	_unicode = str
+ else:
+ 	_unicode = unicode
+ 
  noiselimit = 0
  
  def initialize_logger(level=logging.WARN):