Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 6 Sep 2012 17:59:38 +0000 (19:59 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 6 Sep 2012 17:59:38 +0000 (19:59 +0200)
commit0dfc79ae85eeb0ac4101d80eaf659aeca1fcf8cd
treef970c2479aba42ca63c447dd99c9e0679dd6ef4f
parenta7eefaa55f54e73995e5e0b893b285f905177a40
parent1ceea27a7cb658f0f592363a98bdef1fe2d1c552
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/archive-conf
bin/banned-helper
bin/binhost-snapshot
bin/clean_locks
bin/dispatch-conf
bin/ebuild
bin/ebuild-helpers/bsd/sed
bin/ebuild-helpers/dodoc
bin/ebuild-helpers/dohard
bin/ebuild-helpers/dosed
bin/ebuild-helpers/prepalldocs
bin/emaint
bin/emerge
bin/env-update
bin/fixpackages
bin/glsa-check
bin/phase-functions.sh
bin/phase-helpers.sh
bin/quickpkg
bin/regenworld
bin/repoman
bin/save-ebuild-env.sh
40 files changed:
bin/archive-conf
bin/binhost-snapshot
bin/clean_locks
bin/dispatch-conf
bin/ebuild
bin/ebuild-helpers/bsd/sed
bin/ebuild-helpers/dodoc
bin/ebuild-helpers/dohard
bin/ebuild-helpers/doins
bin/ebuild-helpers/dosed
bin/ebuild-helpers/newins
bin/ebuild-helpers/prepalldocs
bin/ebuild.sh
bin/egencache
bin/emaint
bin/emerge
bin/env-update
bin/etc-update
bin/fixpackages
bin/glsa-check
bin/phase-functions.sh
bin/phase-helpers.sh
bin/portageq
bin/quickpkg
bin/regenworld
bin/repoman
bin/save-ebuild-env.sh
cnf/make.globals
man/emerge.1
man/make.conf.5
pym/_emerge/EbuildBuildDir.py
pym/_emerge/Package.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/__init__.py
pym/portage/const.py
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/versions.py