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

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

commit:     aa61149212569507c6c98aaf8be71ac86747bb08
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 06:50:59 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 06:50:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aa611492

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

Conflicts:
	bin/ebuild-helpers/prepstrip


 bin/archive-conf                                   |    2 +-
 bin/dispatch-conf                                  |   35 +-
 bin/ebuild                                         |   12 +-
 bin/ebuild-helpers/prepstrip                       |  157 +++--
 bin/etc-update                                     |   11 +-
 bin/portageq                                       |    6 +-
 bin/repoman                                        |  120 ++--
 cnf/dispatch-conf.conf                             |   10 +-
 cnf/etc-update.conf                                |   12 +-
 cnf/make.globals                                   |    2 +-
 man/emerge.1                                       |   14 +
 man/make.conf.5                                    |    9 -
 man/portage.5                                      |   10 +
 man/xpak.5                                         |  253 +++----
 pym/_emerge/EbuildBuild.py                         |   13 +-
 pym/_emerge/EbuildFetcher.py                       |   21 +-
 pym/_emerge/FakeVartree.py                         |   12 +-
 pym/_emerge/Scheduler.py                           |    3 +-
 pym/_emerge/create_depgraph_params.py              |    4 +
 pym/_emerge/depgraph.py                            |   65 ++-
 pym/_emerge/main.py                                |    6 +
 pym/_emerge/resolver/output.py                     |    2 +
 pym/portage/_global_updates.py                     |    3 +-
 pym/portage/cache/template.py                      |    1 +
 pym/portage/checksum.py                            |   75 ++-
 pym/portage/const.py                               |   34 +-
 pym/portage/dbapi/__init__.py                      |  106 ++--
 pym/portage/dbapi/porttree.py                      |  338 ++++-----
 pym/portage/dbapi/vartree.py                       |   14 +-
 pym/portage/dep/__init__.py                        |   45 ++-
 pym/portage/elog/__init__.py                       |   20 +-
 pym/portage/elog/messages.py                       |    1 +
 pym/portage/elog/mod_syslog.py                     |    9 +-
 pym/portage/mail.py                                |    3 +-
 pym/portage/manifest.py                            |   61 +-
 pym/portage/output.py                              |   12 +-
 .../package/ebuild/_config/KeywordsManager.py      |   16 +-
 pym/portage/package/ebuild/_config/MaskManager.py  |   45 +-
 pym/portage/package/ebuild/digestcheck.py          |    3 +-
 pym/portage/package/ebuild/digestgen.py            |    6 +
 pym/portage/package/ebuild/doebuild.py             |   31 +-
 pym/portage/package/ebuild/fetch.py                |   26 +-
 pym/portage/package/ebuild/getmaskingstatus.py     |    4 +-
 pym/portage/repository/config.py                   |  106 +++-
 pym/portage/tests/__init__.py                      |  118 ++--
 pym/portage/tests/bin/setup_env.py                 |    3 +
 pym/portage/tests/bin/test_dodir.py                |    2 +
 pym/portage/tests/dep/test_best_match_to_list.py   |   28 +-
 pym/portage/tests/ebuild/test_config.py            |    1 +
 pym/portage/tests/emerge/test_simple.py            |    9 +
 pym/portage/tests/resolver/ResolverPlayground.py   |    8 +-
 pym/portage/tests/resolver/test_keywords.py        |  356 +++++++++
 .../tests/resolver/test_virtual_transition.py      |   51 ++
 pym/portage/tests/runTests                         |    4 +-
 pym/portage/tests/util/test_whirlpool.py           |   16 +
 pym/portage/util/whirlpool.py                      |  794 ++++++++++++++++++++
 pym/repoman/herdbase.py                            |    4 -
 runtests.sh                                        |    3 +
 58 files changed, 2398 insertions(+), 737 deletions(-)

diff --cc bin/archive-conf
index ff46444,7978668..149fdc5
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@@ -12,9 -12,15 +12,9 @@@
  from __future__ import print_function
  
  import sys
 -try:
 -    import portage
 -except ImportError:
 -    from os import path as osp
 -    sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
 -    import portage
  
  from portage import os
- import dispatch_conf
+ from portage import dispatch_conf
  
  FIND_EXTANT_CONTENTS  = "find %s -name CONTENTS"
  
diff --cc bin/ebuild
index 77d576a,d4b8b71..4eb8486
--- a/bin/ebuild
+++ b/bin/ebuild
@@@ -54,18 -56,13 +56,15 @@@ parser.add_option("--skip-manifest", he
  
  opts, pargs = parser.parse_args(args=sys.argv[1:])
  
- if len(pargs) < 2:
- 	parser.error("missing required args")
- 
  os.environ["PORTAGE_CALLER"]="ebuild"
 -try:
 -	import portage
 -except ImportError:
 -	from os import path as osp
 -	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
 -	import portage
 +# for an explanation on this logic, see pym/_emerge/__init__.py
 +from os import environ as ose
 +from os import path as osp
 +if ose.__contains__("PORTAGE_PYTHONPATH"):
 +    sys.path.insert(0, ose["PORTAGE_PYTHONPATH"])
 +else:
 +    sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.                    realpath(__file__))), "pym"))
 +import portage
  
  portage.dep._internal_warnings = True
  from portage import os
diff --cc bin/ebuild-helpers/prepstrip
index 9c5d9da,8c2ca48..077656f
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@@ -2,33 -2,62 +2,62 @@@
  # Copyright 1999-2011 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
  
+ # avoid multiple calls to `has`.  this creates things like:
+ #   FEATURES_foo=false
+ # if "foo" is not in $FEATURES
+ tf() { "$@" && echo true || echo false ; }
+ exp_tf() {
+ 	local flag var=$1
+ 	shift
+ 	for flag in "$@" ; do
+ 		eval ${var}_${flag}=$(tf has ${flag} ${!var})
+ 	done
+ }
+ exp_tf FEATURES installsources nostrip splitdebug
+ exp_tf RESTRICT binchecks installsources strip
+ 
  banner=false
  SKIP_STRIP=false
- if has nostrip ${FEATURES} || \
-    has strip ${RESTRICT}
- then
+ if ${RESTRICT_strip} || ${FEATURES_nostrip} ; then
  	SKIP_STRIP=true
  	banner=true
- 	has installsources ${FEATURES} || exit 0
+ 	${FEATURES_installsources} || exit 0
  fi
  
- STRIP=${STRIP:-${CHOST}-strip}
- type -P -- ${STRIP} > /dev/null || STRIP=strip
- OBJCOPY=${OBJCOPY:-${CHOST}-objcopy}
- type -P -- ${OBJCOPY} > /dev/null || OBJCOPY=objcopy
+ # look up the tools we might be using
+ for t in STRIP:strip OBJCOPY:objcopy READELF:readelf ; do
+ 	v=${t%:*} # STRIP
+ 	t=${t#*:} # strip
+ 	eval ${v}=\"${!v:-${CHOST}-${t}}\"
+ 	type -P -- ${!v} >/dev/null || eval ${v}=${t}
+ done
+ 
+ # Figure out what tool set we're using to strip stuff
+ unset SAFE_STRIP_FLAGS DEF_STRIP_FLAGS SPLIT_STRIP_FLAGS
+ case $(${STRIP} --version 2>/dev/null) in
+ *elfutils*) # dev-libs/elfutils
+ 	# elfutils default behavior is always safe, so don't need to specify
+ 	# any flags at all
+ 	SAFE_STRIP_FLAGS=""
+ 	DEF_STRIP_FLAGS="--remove-comment"
+ 	SPLIT_STRIP_FLAGS="-f"
+ 	;;
+ *GNU*) # sys-devel/binutils
+ 	# We'll leave out -R .note for now until we can check out the relevance
+ 	# of the section when it has the ALLOC flag set on it ...
+ 	SAFE_STRIP_FLAGS="--strip-unneeded"
+ 	DEF_STRIP_FLAGS="-R .comment"
+ 	SPLIT_STRIP_FLAGS=
+ 	;;
+ esac
+ : ${PORTAGE_STRIP_FLAGS=${SAFE_STRIP_FLAGS} ${DEF_STRIP_FLAGS}}
  
- # We'll leave out -R .note for now until we can check out the relevance
- # of the section when it has the ALLOC flag set on it ...
- export SAFE_STRIP_FLAGS="--strip-unneeded"
- export PORTAGE_STRIP_FLAGS=${PORTAGE_STRIP_FLAGS-${SAFE_STRIP_FLAGS} -R .comment}
 -prepstrip_sources_dir=/usr/src/debug/${CATEGORY}/${PF}
 +prepstrip_sources_dir="${EPREFIX}"/usr/src/debug/${CATEGORY}/${PF}
  
- if has installsources ${FEATURES} && ! type -P debugedit >/dev/null ; then
- 	ewarn "FEATURES=installsources is enabled but the debugedit binary could not"
- 	ewarn "be found. This feature will not work unless debugedit is installed!"
- fi
+ type -P debugedit >/dev/null && debugedit_found=true || debugedit_found=false
+ debugedit_warned=false
  
  unset ${!INODE_*}
  
@@@ -53,10 -96,10 +96,10 @@@ save_elf_sources() 
  }
  
  save_elf_debug() {
- 	has splitdebug ${FEATURES} || return 0
+ 	${FEATURES_splitdebug} || return 0
  
  	local x=$1
 -	local y="${D}usr/lib/debug/${x:${#D}}.debug"
 +	local y="${ED}usr/lib/debug/${x:${#D}}.debug"
  
  	# dont save debug info twice
  	[[ ${x} == *".debug" ]] && return 0
@@@ -158,31 -219,18 +228,22 @@@ d
  	# actually causes problems.  install sources for all
  	# elf types though cause that stuff is good.
  
+ 	buildid=
  	if [[ ${f} == *"current ar archive"* ]] ; then
 -		vecho "   ${x:${#D}}"
 +		vecho "   ${x:${#ED}}"
  		if ${strip_this} ; then
  			# hmm, can we split debug/sources for .a ?
  			${STRIP} -g "${x}"
  		fi
  	elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then
- 		vecho "   ${x:${#ED}}"
- 		save_elf_sources "${x}"
- 		if ${strip_this} ; then
- 			save_elf_debug "${x}"
- 			${STRIP} ${PORTAGE_STRIP_FLAGS} "${x}"
- 		fi
+ 		process_elf "${x}" ${PORTAGE_STRIP_FLAGS}
  	elif [[ ${f} == *"SB relocatable"* ]] ; then
- 		vecho "   ${x:${#ED}}"
- 		save_elf_sources "${x}"
- 		if ${strip_this} ; then
- 			[[ ${x} == *.ko ]] && save_elf_debug "${x}"
- 			${STRIP} ${SAFE_STRIP_FLAGS} "${x}"
- 		fi
+ 		process_elf "${x}" ${SAFE_STRIP_FLAGS}
  	fi
 +
 +	if [[ ${was_not_writable} == "true" ]] ; then
 +		chmod u-w "${x}"
 +	fi
  done
  
  if [[ -s ${T}/debug.sources ]] && \
diff --cc pym/portage/const.py
index 7fc034a,29c3878..63e7c67
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -135,9 -90,8 +134,9 @@@ SUPPORTED_FEATURES       = frozenset(
                             "ccache", "chflags", "clean-logs",
                             "collision-protect", "compress-build-logs",
                             "digest", "distcc", "distcc-pump", "distlocks", "ebuild-locks", "fakeroot",
-                            "fail-clean", "fixpackages", "force-mirror", "getbinpkg",
+                            "fail-clean", "force-mirror", "getbinpkg",
                             "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",
 +                            "macossandbox", "macosprefixsandbox", "macosusersandbox",
                             "metadata-transfer", "mirror", "multilib-strict", "news",
                             "noauto", "noclean", "nodoc", "noinfo", "noman",
                             "nostrip", "notitles", "parallel-fetch", "parallel-install",