Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Wed, 14 Dec 2011 15:23:13 +0000 (16:23 +0100)
committerFabian Groffen <grobian@gentoo.org>
Wed, 14 Dec 2011 15:23:13 +0000 (16:23 +0100)
commit87863efd98a474f01af099609903cbf7e7a3754d
tree00fcaa760f8f3da497163700cfff2cc6ac41800f
parent80468771dc34cc60ebc9441a3b9767db132d18f8
parent32a5e5531d6fa0520478ff831953702365ca6cd9
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/egencache
bin/phase-functions.sh
pym/portage/const.py
pym/portage/data.py
pym/portage/package/ebuild/_config/special_env_vars.py
21 files changed:
bin/ebuild-ipc.py
bin/ebuild.sh
bin/egencache
bin/lock-helper.py
bin/phase-functions.sh
bin/repoman
man/emerge.1
pym/_emerge/Binpkg.py
pym/_emerge/actions.py
pym/_emerge/emergelog.py
pym/_emerge/main.py
pym/portage/__init__.py
pym/portage/const.py
pym/portage/data.py
pym/portage/dbapi/vartree.py
pym/portage/output.py
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/package/ebuild/fetch.py
pym/portage/package/ebuild/prepare_build_dirs.py