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

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

commit:     18a7cd8392e4516a0a517390d33625ed2a536f80
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 18:54:34 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May  4 18:54:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=18a7cd83

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

Conflicts:
	bin/misc-functions.sh


 bin/ebuild                                         |    8 +-
 bin/misc-functions.sh                              |   33 +-
 bin/phase-functions.sh                             |    2 +-
 bin/repoman                                        |   58 ++-
 cnf/make.globals                                   |    1 +
 man/dispatch-conf.1                                |   75 ++--
 man/ebuild.5                                       |    6 +
 man/emerge.1                                       |   44 ++-
 man/make.conf.5                                    |   27 +-
 man/portage.5                                      |   18 +-
 man/repoman.1                                      |    4 +
 man/ru/dispatch-conf.1                             |  100 ++++
 pym/_emerge/Package.py                             |   12 +-
 pym/_emerge/actions.py                             |   24 +-
 pym/_emerge/depgraph.py                            |   18 +-
 pym/_emerge/main.py                                |    7 +
 pym/_emerge/search.py                              |    4 +-
 pym/portage/_sets/libs.py                          |    9 +-
 pym/portage/dbapi/bintree.py                       |    2 +-
 pym/portage/dbapi/porttree.py                      |    2 +
 pym/portage/dbapi/vartree.py                       |   87 +++-
 .../package/ebuild/_config/special_env_vars.py     |    4 +-
 pym/portage/package/ebuild/config.py               |  133 ++++--
 pym/portage/package/ebuild/getmaskingstatus.py     |   15 +-
 pym/portage/process.py                             |   11 +-
 pym/portage/tests/__init__.py                      |   20 +-
 pym/portage/tests/bin/setup_env.py                 |   44 +-
 pym/portage/tests/dep/testAtom.py                  |  254 +++++-----
 pym/portage/tests/dep/testCheckRequiredUse.py      |  188 ++++----
 pym/portage/tests/dep/testStandalone.py            |   26 +-
 pym/portage/tests/dep/test_best_match_to_list.py   |   46 +-
 pym/portage/tests/dep/test_dep_getcpv.py           |   16 +-
 pym/portage/tests/dep/test_dep_getrepo.py          |    6 +-
 pym/portage/tests/dep/test_dep_getslot.py          |   10 +-
 pym/portage/tests/dep/test_dep_getusedeps.py       |   12 +-
 pym/portage/tests/dep/test_get_operator.py         |   24 +-
 pym/portage/tests/dep/test_isjustname.py           |   14 +-
 pym/portage/tests/dep/test_isvalidatom.py          |    6 +-
 pym/portage/tests/dep/test_match_from_list.py      |  120 +++---
 pym/portage/tests/dep/test_paren_reduce.py         |   50 +-
 pym/portage/tests/dep/test_use_reduce.py           |  519 ++++++++++----------
 pym/portage/tests/ebuild/test_config.py            |    4 +-
 .../tests/env/config/test_PackageKeywordsFile.py   |    8 +-
 .../tests/env/config/test_PackageUseFile.py        |    6 +-
 .../tests/env/config/test_PortageModulesFile.py    |   11 +-
 pym/portage/tests/resolver/ResolverPlayground.py   |   18 +-
 pym/portage/tests/resolver/test_autounmask.py      |  304 ++++++------
 pym/portage/tests/resolver/test_backtracking.py    |    6 +-
 pym/portage/tests/resolver/test_depclean.py        |  100 ++--
 .../resolver/test_depclean_slot_unavailable.py     |   15 +-
 pym/portage/tests/resolver/test_multirepo.py       |    4 +-
 pym/portage/tests/util/test_stackDictList.py       |   12 +-
 pym/portage/tests/util/test_stackDicts.py          |   41 +-
 pym/portage/tests/util/test_stackLists.py          |   18 +-
 pym/portage/tests/util/test_uniqueArray.py         |   14 +-
 pym/portage/tests/util/test_varExpand.py           |   80 ++--
 pym/portage/tests/versions/test_cpv_sort_key.py    |    7 +-
 pym/portage/tests/versions/test_vercmp.py          |   38 +-
 pym/portage/util/_dyn_libs/LinkageMapELF.py        |   18 +-
 .../util/_dyn_libs/display_preserved_libs.py       |    2 +-
 pym/portage/util/movefile.py                       |   10 +
 pym/repoman/checks.py                              |    2 +
 62 files changed, 1584 insertions(+), 1193 deletions(-)

diff --cc bin/misc-functions.sh
index aa9ad04,725ba55..e2960bd
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -898,26 -843,16 +899,16 @@@ install_qa_check_misc() 
  }
  
  install_qa_check_prefix() {
--	if [[ -d ${ED}/${D} ]] ; then
--		find "${ED}/${D}" | \
++	if [[ -d ${ED%/}/${D} ]] ; then
++		find "${ED%/}/${D}" | \
  		while read i ; do
--			eqawarn "QA Notice: /${i##${ED}/${D}} installed in \${ED}/\${D}"
++			eqawarn "QA Notice: /${i##${ED%/}/${D}} installed in \${ED}/\${D}"
  		done
  		die "Aborting due to QA concerns: files installed in ${ED}/${D}"
  	fi
  
--	if [[ -d ${ED}/${EPREFIX} ]] ; then
--		find "${ED}/${EPREFIX}/" | \
++	if [[ -d ${ED%/}/${EPREFIX} ]] ; then
++		find "${ED%/}/${EPREFIX}/" | \
  		while read i ; do
  			eqawarn "QA Notice: ${i#${D}} double prefix"
  		done
diff --cc cnf/make.globals
index 9693348,6dd3509..5967fb1
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@@ -28,9 -28,10 +28,10 @@@ GENTOO_MIRRORS="http://distfiles.gentoo
  
  ACCEPT_LICENSE="* -@EULA"
  ACCEPT_PROPERTIES="*"
+ ACCEPT_RESTRICT="*"
  
  # Repository Paths
 -PORTDIR=/usr/portage
 +PORTDIR="@PORTAGE_EPREFIX@/usr/portage"
  DISTDIR=${PORTDIR}/distfiles
  PKGDIR=${PORTDIR}/packages
  RPMDIR=${PORTDIR}/rpm
diff --cc pym/portage/dbapi/bintree.py
index 1d2850a,cdd10b3..f3d044e
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@@ -316,9 -314,9 +316,9 @@@ class binarytree(object)
  				"PDEPEND", "PROPERTIES", "PROVIDE")
  			self._pkgindex_header_keys = set([
  				"ACCEPT_KEYWORDS", "ACCEPT_LICENSE",
- 				"ACCEPT_PROPERTIES", "CBUILD",
+ 				"ACCEPT_PROPERTIES", "ACCEPT_RESTRICT", "CBUILD",
  				"CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES",
 -				"GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE"])
 +				"GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE", "EPREFIX"])
  			self._pkgindex_default_pkg_data = {
  				"BUILD_TIME"         : "",
  				"DEFINED_PHASES"     : "",