Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 9 Dec 2011 20:32:39 +0000 (21:32 +0100)
committerFabian Groffen <grobian@gentoo.org>
Fri, 9 Dec 2011 20:32:39 +0000 (21:32 +0100)
commit868bcc349966d957d51b302b530f3299dd8fb5c8
treec7de4302f1e9965595a3193380120b748ca3a980
parent2734f30b1e97f30cce79e825990c5825348e0189
parent174ffd8336ec9914f85f871b7ce78506574d3d9b
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/dispatch-conf
bin/ebuild-helpers/dobin
bin/ebuild-helpers/dodir
bin/ebuild-helpers/dodoc
bin/ebuild-helpers/doexe
bin/ebuild-helpers/dohard
bin/ebuild-helpers/doinfo
bin/ebuild-helpers/doins
bin/ebuild-helpers/dolib
bin/ebuild-helpers/domo
bin/ebuild-helpers/dosbin
bin/ebuild-helpers/dosed
bin/ebuild-helpers/dosym
bin/ebuild-helpers/ecompressdir
bin/ebuild-helpers/fowners
bin/ebuild-helpers/fperms
bin/ebuild-helpers/prepalldocs
bin/ebuild-helpers/prepallinfo
bin/ebuild-helpers/prepallman
bin/ebuild-helpers/prepallstrip
bin/ebuild-helpers/prepinfo
bin/ebuild-helpers/preplib
bin/ebuild-helpers/prepstrip
bin/emerge-webrsync
bin/etc-update
bin/misc-functions.sh
bin/phase-functions.sh
bin/phase-helpers.sh
cnf/dispatch-conf.conf
cnf/make.conf
cnf/make.globals
pym/portage/data.py
pym/portage/dispatch_conf.py
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/config.py
47 files changed:
bin/dispatch-conf
bin/ebuild-helpers/dobin
bin/ebuild-helpers/dodir
bin/ebuild-helpers/dodoc
bin/ebuild-helpers/doexe
bin/ebuild-helpers/dohard
bin/ebuild-helpers/doinfo
bin/ebuild-helpers/doins
bin/ebuild-helpers/dolib
bin/ebuild-helpers/doman
bin/ebuild-helpers/domo
bin/ebuild-helpers/dosbin
bin/ebuild-helpers/dosed
bin/ebuild-helpers/dosym
bin/ebuild-helpers/ecompressdir
bin/ebuild-helpers/fowners
bin/ebuild-helpers/fperms
bin/ebuild-helpers/prepall
bin/ebuild-helpers/prepalldocs
bin/ebuild-helpers/prepallinfo
bin/ebuild-helpers/prepallman
bin/ebuild-helpers/prepallstrip
bin/ebuild-helpers/prepinfo
bin/ebuild-helpers/preplib
bin/ebuild-helpers/prepman
bin/ebuild-helpers/prepstrip
bin/ebuild.sh
bin/egencache
bin/emerge-webrsync
bin/etc-update
bin/misc-functions.sh
bin/phase-functions.sh
bin/phase-helpers.sh
bin/portageq
bin/repoman
cnf/make.conf
cnf/make.globals
man/emerge.1
man/make.conf.5
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/portage/const.py
pym/portage/data.py
pym/portage/dispatch_conf.py
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py