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

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

commit:     13777477df280aa108a070e1dd6fd25aa1703ad8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 20:52:25 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 20:52:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=13777477

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

Conflicts:
	bin/bashrc-functions.sh
	bin/ebuild-helpers/dohtml
	bin/ebuild-helpers/portageq
	bin/ebuild-helpers/prepstrip
	bin/ebuild-ipc
	bin/emerge-webrsync
	bin/filter-bash-environment.py
	bin/isolated-functions.sh
	bin/misc-functions.sh
	bin/save-ebuild-env.sh
	cnf/make.globals
	man/emerge.1
	pym/_emerge/actions.py
	pym/_emerge/main.py
	pym/portage/dbapi/bintree.py


 Makefile                                           |  14 +-
 RELEASE-NOTES                                      |   8 +
 bin/bashrc-functions.sh                            |   4 +-
 bin/binhost-snapshot                               |  13 +-
 bin/chpathtool.py                                  |   7 +-
 bin/ebuild                                         |  53 ++-
 bin/ebuild-helpers/dohtml                          |   2 +-
 bin/ebuild-helpers/portageq                        |   2 +-
 bin/ebuild-helpers/prepstrip                       |   5 +-
 bin/ebuild-helpers/xattr/install                   |   2 +-
 bin/ebuild-ipc                                     |   2 +-
 bin/ebuild.sh                                      |  36 +-
 bin/egencache                                      | 106 +++---
 bin/emerge-webrsync                                |  63 ++--
 bin/filter-bash-environment.py                     |  18 +-
 bin/fixpackages                                    |   8 +
 bin/glsa-check                                     |  61 ++--
 bin/install.py                                     |  20 +-
 bin/isolated-functions.sh                          |  55 ++--
 bin/misc-functions.sh                              |   4 +-
 bin/phase-functions.sh                             |   7 +-
 bin/portageq                                       | 236 +++++++++-----
 bin/quickpkg                                       |  18 +-
 bin/repoman                                        | 139 ++++----
 bin/save-ebuild-env.sh                             |   4 +-
 bin/xattr-helper.py                                |  16 +-
 bin/xpak-helper.py                                 |   6 +-
 cnf/{make.conf => make.conf.example}               |   2 +-
 ...onf.alpha.diff => make.conf.example.alpha.diff} |  18 +-
 ...fbsd.diff => make.conf.example.amd64-fbsd.diff} |  18 +-
 ...onf.amd64.diff => make.conf.example.amd64.diff} |  18 +-
 ...ke.conf.arm.diff => make.conf.example.arm.diff} |  12 +-
 ....conf.hppa.diff => make.conf.example.hppa.diff} |  28 +-
 ....conf.ia64.diff => make.conf.example.ia64.diff} |  10 +-
 ....conf.m68k.diff => make.conf.example.m68k.diff} |  14 +-
 ....conf.mips.diff => make.conf.example.mips.diff} |  18 +-
 ...ke.conf.ppc.diff => make.conf.example.ppc.diff} |  26 +-
 ...onf.ppc64.diff => make.conf.example.ppc64.diff} |  24 +-
 ....conf.s390.diff => make.conf.example.s390.diff} |  10 +-
 ...make.conf.sh.diff => make.conf.example.sh.diff} |  17 +-
 ...fbsd.diff => make.conf.example.sparc-fbsd.diff} |  12 +-
 ...onf.sparc.diff => make.conf.example.sparc.diff} |  18 +-
 ...6-fbsd.diff => make.conf.example.x86-fbsd.diff} |  18 +-
 ...ke.conf.x86.diff => make.conf.example.x86.diff} |  18 +-
 cnf/make.globals                                   |  22 +-
 cnf/repos.conf                                     |   7 +
 make.conf.example-repatch.sh                       |  41 +++
 man/color.map.5                                    |  16 +-
 man/dispatch-conf.1                                |   2 +-
 man/ebuild.1                                       |  18 +-
 man/ebuild.5                                       |  86 ++---
 man/egencache.1                                    |  23 +-
 man/emaint.1                                       |  15 +-
 man/emerge.1                                       | 242 +++++++-------
 man/emirrordist.1                                  |  17 +-
 man/env-update.1                                   |   9 +-
 man/etc-update.1                                   |   2 +-
 man/make.conf.5                                    | 121 ++++---
 man/portage.5                                      | 338 +++++++++++++------
 man/quickpkg.1                                     |  14 +-
 man/repoman.1                                      |  46 ++-
 man/ru/color.map.5                                 |   6 +-
 man/xpak.5                                         |   5 +-
 misc/emerge-delta-webrsync                         |  50 ++-
 pym/_emerge/Binpkg.py                              |   6 +-
 pym/_emerge/EbuildBuild.py                         |  18 +-
 pym/_emerge/actions.py                             | 361 ++++++++++-----------
 pym/_emerge/depgraph.py                            |  78 +++--
 pym/_emerge/main.py                                |  61 +---
 pym/portage/__init__.py                            |   9 +-
 pym/portage/_emirrordist/main.py                   |  69 ++--
 pym/portage/cache/sqlite.py                        |  12 +-
 pym/portage/const.py                               |   4 +
 pym/portage/dbapi/bintree.py                       |  15 +-
 pym/portage/dbapi/vartree.py                       |   2 +-
 pym/portage/dep/dep_check.py                       |  35 +-
 pym/portage/eclass_cache.py                        |  14 +-
 pym/portage/emaint/defaults.py                     |  11 +-
 pym/portage/emaint/main.py                         | 134 ++++----
 pym/portage/emaint/modules/logs/__init__.py        |  12 +-
 .../package/ebuild/_config/special_env_vars.py     |  16 +-
 pym/portage/package/ebuild/config.py               |  98 +++---
 pym/portage/package/ebuild/doebuild.py             |   3 +-
 pym/portage/package/ebuild/fetch.py                |   4 +-
 pym/portage/package/ebuild/getmaskingreason.py     |  12 +-
 pym/portage/process.py                             |   4 +
 pym/portage/repository/config.py                   | 234 +++++++++----
 pym/portage/tests/__init__.py                      |   8 +-
 pym/portage/tests/dbapi/test_fakedbapi.py          |  10 +-
 pym/portage/tests/dbapi/test_portdb_cache.py       |  11 +-
 pym/portage/tests/ebuild/test_config.py            |  20 +-
 pym/portage/tests/ebuild/test_doebuild_fd_pipes.py |  16 +
 pym/portage/tests/emerge/test_emerge_slot_abi.py   |   4 +-
 pym/portage/tests/emerge/test_simple.py            |  13 +-
 pym/portage/tests/repoman/test_simple.py           |  26 +-
 pym/portage/tests/resolver/ResolverPlayground.py   |  47 +--
 pym/portage/tests/resolver/test_backtracking.py    |  31 --
 pym/portage/tests/resolver/test_or_choices.py      |  79 +++++
 .../resolver/test_slot_conflict_mask_update.py     |  41 +++
 .../tests/resolver/test_slot_conflict_update.py    |  98 ++++++
 pym/portage/tests/update/test_move_ent.py          |   6 +-
 pym/portage/tests/update/test_move_slot_ent.py     |   6 +-
 pym/portage/tests/update/test_update_dbentry.py    |   6 +-
 pym/portage/util/_argparse.py                      |  42 +++
 pym/portage/util/movefile.py                       |   2 +-
 pym/repoman/checks.py                              |   4 +-
 pym/repoman/errors.py                              |   2 +-
 pym/repoman/utilities.py                           |   3 +-
 108 files changed, 2371 insertions(+), 1586 deletions(-)

diff --cc bin/bashrc-functions.sh
index 32dab95,503b172..69a5eb9
--- a/bin/bashrc-functions.sh
+++ b/bin/bashrc-functions.sh
@@@ -1,10 -1,10 +1,10 @@@
 -#!/bin/bash
 +#!@PREFIX_PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  portageq() {
- 	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+ 	PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}}\
 -	"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" "$@"
 +	"${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}/portageq" "$@"
  }
  
  register_die_hook() {
diff --cc bin/ebuild-helpers/dohtml
index b31d45f,75d3d00..70cb1f4
--- a/bin/ebuild-helpers/dohtml
+++ b/bin/ebuild-helpers/dohtml
@@@ -9,8 -9,8 +9,8 @@@ PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-@P
  # Use safe cwd, avoiding unsafe import for bug #469338.
  export __PORTAGE_HELPER_CWD=${PWD}
  cd "${PORTAGE_PYM_PATH}"
- PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
+ PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
 -	"${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/dohtml.py" "$@"
 +	"${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/dohtml.py" "$@"
  
  ret=$?
  # Restore cwd for display by __helpers_die
diff --cc bin/ebuild-helpers/portageq
index 6ba2d88,b67b03f..2c7c428
--- a/bin/ebuild-helpers/portageq
+++ b/bin/ebuild-helpers/portageq
@@@ -2,9 -2,9 +2,9 @@@
  # Copyright 2009-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
 -PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
 +PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}
 +PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}
  # Use safe cwd, avoiding unsafe import for bug #469338.
  cd "${PORTAGE_PYM_PATH}"
- PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
+ PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
 -	exec "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/portageq" "$@"
 +	exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/portageq" "$@"
diff --cc bin/ebuild-helpers/prepstrip
index 834b0fe,9b2d47c..35c84d5
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@@ -1,8 -1,9 +1,9 @@@
 -#!/bin/bash
++<<<<<<< HEAD
 +#!@PORTAGE_BASH@
- # Copyright 1999-2012 Gentoo Foundation
+ # Copyright 1999-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/helper-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/helper-functions.sh
  
  # avoid multiple calls to `has`.  this creates things like:
  #   FEATURES_foo=false
diff --cc bin/ebuild-ipc
index 7839195,820005f..176e6ed
--- a/bin/ebuild-ipc
+++ b/bin/ebuild-ipc
@@@ -6,5 -6,5 +6,5 @@@ PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/u
  PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
  # Use safe cwd, avoiding unsafe import for bug #469338.
  cd "${PORTAGE_PYM_PATH}"
- PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
+ PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
 -	exec "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/ebuild-ipc.py" "$@"
 +	exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/ebuild-ipc.py" "$@"
diff --cc bin/emerge-webrsync
index 55aba47,85730a2..df855de
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@@ -1,6 -1,5 +1,6 @@@
 +#!@PORTAGE_BASH@
  #!/bin/bash
- # Copyright 1999-2012 Gentoo Foundation
+ # Copyright 1999-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
  # Rewritten from the old, Perl-based emerge-webrsync script
@@@ -40,20 -39,24 +40,30 @@@ els
  	eecho "could not find 'portageq'; aborting"
  	exit 1
  fi
- eval $("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
+ eval "$("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
  	FETCHCOMMAND GENTOO_MIRRORS \
  	PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \
- 	PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS \
- 	PORTAGE_RSYNC_OPTS PORTAGE_TMPDIR PORTDIR \
- 	SYNC USERLAND http_proxy ftp_proxy \
+ 	PORTAGE_NICENESS PORTAGE_REPOSITORIES PORTAGE_RSYNC_EXTRA_OPTS \
+ 	PORTAGE_RSYNC_OPTS PORTAGE_TMPDIR \
 -	USERLAND http_proxy ftp_proxy)"
++	USERLAND http_proxy ftp_proxy \
 +	PORTAGE_USER PORTAGE_GROUP)
  export http_proxy ftp_proxy
  
 +# PREFIX LOCAL: use Prefix servers, just because we want this and infra
 +# can't support us yet
 +GENTOO_MIRRORS="http://gentoo-mirror1.prefix.freens.org"
 +# END PREFIX LOCAL
 +
+ source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
+ 
+ repo_name=gentoo
+ repo_location=$(__repo_key "${repo_name}" location)
+ if [[ -z ${repo_location} ]]; then
+ 	eecho "Repository '${repo_name}' not found"
+ 	exit 1
+ fi
+ repo_sync_type=$(__repo_key "${repo_name}" sync-type)
+ 
  # If PORTAGE_NICENESS is overriden via the env then it will
  # still pass through the portageq call and override properly.
  if [ -n "${PORTAGE_NICENESS}" ]; then
diff --cc bin/filter-bash-environment.py
index 9cb42c1,3d4b3ec..2537855
--- a/bin/filter-bash-environment.py
+++ b/bin/filter-bash-environment.py
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python
 +#!@PREFIX_PORTAGE_PYTHON@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  import codecs
diff --cc bin/isolated-functions.sh
index 1d399b6,42d9e70..c91bc1d
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2012 Gentoo Foundation
+ # Copyright 1999-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}/eapi.sh"
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}/eapi.sh"
  
  # We need this next line for "die" and "assert". It expands
  # It _must_ preceed all the calls to die and assert.
diff --cc bin/misc-functions.sh
index 105129a,ee21444..011e8ba
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -1768,8 -1157,8 +1768,8 @@@ __dyn_package() 
  	tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${PROOT}" . | \
  		$PORTAGE_BZIP2_COMMAND -c > "$PORTAGE_BINPKG_TMPFILE"
  	assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'"
- 	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+ 	PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
 -		"${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \
 +		"${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \
  		"$PORTAGE_BINPKG_TMPFILE" "$PORTAGE_BUILDDIR/build-info"
  	if [ $? -ne 0 ]; then
  		rm -f "${PORTAGE_BINPKG_TMPFILE}"
diff --cc bin/phase-functions.sh
index 881d50b,37503bf..4321375
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -29,9 -30,9 +30,9 @@@ PORTAGE_READONLY_VARS="D EBUILD EBUILD_
  	PORTAGE_SAVED_READONLY_VARS PORTAGE_SIGPIPE_STATUS \
  	PORTAGE_TMPDIR PORTAGE_UPDATE_ENV PORTAGE_USERNAME \
  	PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTAGE_XATTR_EXCLUDE \
- 	PORTDIR PORTDIR_OVERLAY \
+ 	PORTDIR \
  	PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR \
 -	__PORTAGE_HELPER __PORTAGE_TEST_HARDLINK_LOCKS"
 +	__PORTAGE_HELPER __PORTAGE_TEST_HARDLINK_LOCKS ED EROOT"
  
  PORTAGE_SAVED_READONLY_VARS="A CATEGORY P PF PN PR PV PVR"
  
diff --cc bin/save-ebuild-env.sh
index c6c1ff3,f695245..552f882
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_PREFIX_BASH@
- # Copyright 1999-2012 Gentoo Foundation
+ # Copyright 1999-2013 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  # @FUNCTION: __save_ebuild_env
diff --cc cnf/make.globals
index ca82e22,013c556..8c58fc6
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@@ -19,9 -19,6 +19,10 @@@ LDFLAGS="
  FFLAGS=""
  FCFLAGS=""
  
- # Default rsync mirror
++# PREFIX LOCAL: default rsync mirror
 +SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"
++# END PREFIX LOCAL
 +
  # Default distfiles mirrors. This rotation has multiple hosts and is reliable.
  # Approved by the mirror-admin team.
  GENTOO_MIRRORS="http://distfiles.gentoo.org"
@@@ -30,14 -27,13 +31,10 @@@ ACCEPT_LICENSE="* -@EULA
  ACCEPT_PROPERTIES="*"
  ACCEPT_RESTRICT="*"
  
- # Repository Paths
- PORTDIR="@PORTAGE_EPREFIX@/usr/portage"
- DISTDIR=${PORTDIR}/distfiles
- PKGDIR=${PORTDIR}/packages
- RPMDIR=${PORTDIR}/rpm
- 
- # Temporary build directory
- PORTAGE_TMPDIR="@PORTAGE_EPREFIX@/var/tmp"
+ # Miscellaneous paths
 -DISTDIR="/usr/portage/distfiles"
 -PKGDIR="/usr/portage/packages"
 -RPMDIR="/usr/portage/rpm"
 -
 -# Temporary build directory
 -PORTAGE_TMPDIR="/var/tmp"
++DISTDIR="@PORTAGE_EPREFIX@/usr/portage/distfiles"
++PKGDIR="@PORTAGE_EPREFIX@/usr/portage/packages"
++RPMDIR="@PORTAGE_EPREFIX@/usr/portage/rpm"
  
  # Fetching command (3 tries, passive ftp for firewall compatibility)
  FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
@@@ -153,22 -123,9 +150,23 @@@ PORTAGE_ELOG_MAILFROM="@portageuser@@lo
  PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA256 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
  
  # Security labels are special, see bug #461868.
- PORTAGE_XATTR_EXCLUDE="security.*"
+ # system.nfs4_acl attributes are irrelevant, see bug #475496.
+ PORTAGE_XATTR_EXCLUDE="security.* system.nfs4_acl"
  
 +# Writeable paths for Mac OS X seatbelt sandbox
 +#
 +# If path ends in a slash (/), access will recursively be allowed to directory
 +# contents (using a regex), not the directory itself. Without a slash, access
 +# to the directory or file itself will be allowed (using a literal), so it can
 +# be created, removed and changed. If both is needed, the directory needs to be
 +# given twice, once with and once without the slash. Obviously this only makes
 +# sense for directories, not files.
 +#
 +# An empty value for either variable will disable all restrictions on the
 +# corresponding operation.
 +MACOSSANDBOX_PATHS="/dev/fd/ /private/tmp/ /private/var/tmp/ @@PORTAGE_BUILDDIR@@/ @@PORTAGE_ACTUAL_DISTDIR@@/"
 +MACOSSANDBOX_PATHS_CONTENT_ONLY="/dev/null /dev/dtracehelper /dev/tty /private/var/run/syslog"
 +
  #            *****************************
  #            **  DO NOT EDIT THIS FILE  **
  # ***************************************************
diff --cc man/emerge.1
index dfda78d,bbcd84b..4b402fb
--- a/man/emerge.1
+++ b/man/emerge.1
@@@ -1112,15 -1124,9 +1124,15 @@@ add this to \fBmake.conf\fR(5)
  .LP
  .I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
  .LP
- Tools such as dispatch\-conf, cfg\-update, and etc\-update are also available to
- aid in the merging of these files. They provide interactive merging and can
+ Tools such as dispatch\-conf, cfg\-update, and etc\-update are also available
+ to aid in the merging of these files. They provide interactive merging and can
  auto\-merge trivial changes.
 +.LP
 +When an offset prefix (\fBEPREFIX\fR) is active, all paths in
 +\fBCONFIG_PROTECT\fR and \fBCONFIG_PROTECT_MASK\fR are prefixed with the
 +offset by Portage before they are considered.  Hence, these paths never
 +contain the offset prefix, and the variables can be defined in
 +offset-unaware locations, such as the profiles. 
  .SH "REPORTING BUGS"
  Please report any bugs you encounter through our website:
  .LP
@@@ -1140,10 -1146,10 +1152,11 @@@ Marius Mauch <genone@gentoo.org
  Jason Stubbs <jstubbs@gentoo.org>
  Brian Harring <ferringb@gmail.com>
  Zac Medico <zmedico@gentoo.org>
 +Fabian Groffen <grobian@gentoo.org>
+ Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
  .fi
  .SH "FILES"
- Here is a common list of files you will probably be interested in.  For a 
+ Here is a common list of files you will probably be interested in.  For a
  complete listing, please refer to the \fBportage\fR(5) man page.
  .TP
  .B /usr/share/portage/config/sets/
diff --cc man/make.conf.5
index eb4497f,236fdf0..00d822d
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@@ -154,16 -154,14 +154,17 @@@ automatically have /* appended to them
  Defaults to "/lib/modules/* *.py[co]".
  .TP
  \fBCONFIG_PROTECT\fR = \fI[space delimited list of files and/or directories]\fR
- All files and/or directories that are defined here will have "config file protection"
- enabled for them. See the \fBCONFIGURATION FILES\fR section
+ All files and/or directories that are defined here will have "config file
+ protection" enabled for them. See the \fBCONFIGURATION FILES\fR section
  of \fBemerge\fR(1) for more information.
 +Note that if an offset prefix (\fBEPREFIX\fR) is activated, all paths defined
 +in \fBCONFIG_PROTECT\fR are prefixed by Portage with the offset before
 +they are used.
  .TP
- \fBCONFIG_PROTECT_MASK\fR = \fI[space delimited list of files and/or directories]\fR
- All files and/or directories that are defined here will have "config file protection"
- disabled for them. See the \fBCONFIGURATION FILES\fR section
+ \fBCONFIG_PROTECT_MASK\fR = \fI[space delimited list of files and/or \
+ directories]\fR
+ All files and/or directories that are defined here will have "config file
+ protection" disabled for them. See the \fBCONFIGURATION FILES\fR section
  of \fBemerge\fR(1) for more information.
  .TP
  .B CTARGET
diff --cc pym/_emerge/actions.py
index 26ced76,4c53c25..4add397
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -37,8 -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.dbapi.dep_expand import dep_expand
  from portage.dbapi._expand_new_virt import expand_new_virt
  from portage.dep import Atom
@@@ -2522,22 -2587,20 +2588,20 @@@ def _sync_repo(emerge_config, repo)
  				msg.append("(and possibly your system's filesystem) configuration.")
  			for line in msg:
  				out.eerror(line)
- 			sys.exit(exitcode)
- 	elif syncuri[:6]=="cvs://":
+ 			return exitcode
+ 	elif repo.sync_type == "cvs":
 -		if not os.path.exists("/usr/bin/cvs"):
 -			print("!!! /usr/bin/cvs does not exist, so CVS support is disabled.")
 +		if not os.path.exists(EPREFIX + "/usr/bin/cvs"):
- 			print("!!! " + EPREFIX + "/usr/bin/cvs does not exist, so CVS support is disabled.")
- 			print("!!! Type \"emerge dev-vcs/cvs\" to enable CVS support.")
- 			sys.exit(1)
- 		cvsroot=syncuri[6:]
- 		cvsdir=os.path.dirname(myportdir)
- 		if not os.path.exists(myportdir+"/CVS"):
++			print("!!! %s/usr/bin/cvs does not exist, so CVS support is disabled." % (EPREFIX))
+ 			print("!!! Type \"emerge %s\" to enable CVS support." % portage.const.CVS_PACKAGE_ATOM)
+ 			return os.EX_UNAVAILABLE
+ 		cvs_root = syncuri
+ 		if cvs_root.startswith("cvs://"):
+ 			cvs_root = cvs_root[6:]
+ 		if not os.path.exists(os.path.join(repo.location, "CVS")):
  			#initial checkout
  			print(">>> Starting initial cvs checkout with "+syncuri+"...")
- 			if os.path.exists(cvsdir+"/gentoo-x86"):
- 				print("!!! existing",cvsdir+"/gentoo-x86 directory; exiting.")
- 				sys.exit(1)
  			try:
- 				os.rmdir(myportdir)
+ 				os.rmdir(repo.location)
  			except OSError as e:
  				if e.errno != errno.ENOENT:
  					sys.stderr.write(
diff --cc pym/_emerge/main.py
index 8977f33,2e68a05..b8f2ffd
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@@ -18,7 -18,7 +18,8 @@@ portage.proxy.lazyimport.lazyimport(glo
  	'_emerge.is_valid_package_atom:insert_category_into_atom'
  )
  from portage import os
 +from portage.const import EPREFIX
+ from portage.util._argparse import ArgumentParser
  
  if sys.hexversion >= 0x3000000:
  	long = int
diff --cc pym/portage/dbapi/bintree.py
index 2bad28e,61ac6b5..0a667da
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@@ -319,7 -317,9 +319,10 @@@ class binarytree(object)
  				"ACCEPT_KEYWORDS", "ACCEPT_LICENSE",
  				"ACCEPT_PROPERTIES", "ACCEPT_RESTRICT", "CBUILD",
  				"CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES",
- 				"GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE", "EPREFIX"])
+ 				"GENTOO_MIRRORS", "INSTALL_MASK", "IUSE_IMPLICIT", "USE",
+ 				"USE_EXPAND", "USE_EXPAND_HIDDEN", "USE_EXPAND_IMPLICIT",
 -				"USE_EXPAND_UNPREFIXED"])
++				"USE_EXPAND_UNPREFIXED",
++				"EPREFIX"])
  			self._pkgindex_default_pkg_data = {
  				"BUILD_TIME"         : "",
  				"DEFINED_PHASES"     : "",