Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 27 Aug 2012 06:43:45 +0000 (08:43 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 27 Aug 2012 06:43:45 +0000 (08:43 +0200)
commita7eefaa55f54e73995e5e0b893b285f905177a40
tree44a78887c311298906aed991f54eae4430ed4f4e
parent20e5636d6a423452434ede1819e120133a9229ed
parentfbf6518406ddb79a999b7d1230046ad93adc445d
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/dispatch-conf
bin/ebuild-helpers/doins
bin/ebuild-helpers/newbin
bin/ebuild-helpers/newconfd
bin/ebuild-helpers/newdoc
bin/ebuild-helpers/newenvd
bin/ebuild-helpers/newexe
bin/ebuild-helpers/newinitd
bin/ebuild-helpers/newins
bin/ebuild-helpers/newlib.a
bin/ebuild-helpers/newlib.so
bin/ebuild-helpers/newman
bin/ebuild-helpers/newsbin
bin/emerge-webrsync
bin/isolated-functions.sh
bin/phase-helpers.sh
21 files changed:
bin/dispatch-conf
bin/ebuild-helpers/doins
bin/ebuild-helpers/newins
bin/ebuild-helpers/prepstrip
bin/ebuild.sh
bin/egencache
bin/emerge-webrsync
bin/isolated-functions.sh
bin/phase-functions.sh
bin/phase-helpers.sh
man/make.conf.5
pym/_emerge/Package.py
pym/portage/dbapi/bintree.py
pym/portage/getbinpkg.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/process.py
pym/portage/util/__init__.py
pym/portage/versions.py