Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 3 Jan 2011 19:29:33 +0000 (20:29 +0100)
committerFabian Groffen <grobian@gentoo.org>
Mon, 3 Jan 2011 19:29:33 +0000 (20:29 +0100)
commit62299281838042fafa163eddc138805f08b3ddb3
treec5ca7ce88af82b388ab34829579c1efb729f1523
parent16e590bdb7e960ca84f3eb7ed5a2ca275ddd1b65
parentb318b23498ed969e3121b7156b560f2cb345e8fe
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/newins
bin/ebuild-helpers/prepallman
bin/ebuild-helpers/prepinfo
bin/ebuild.sh
21 files changed:
bin/ebuild-helpers/doins
bin/ebuild-helpers/ecompressdir
bin/ebuild-helpers/newins
bin/ebuild-helpers/prepallman
bin/ebuild-helpers/prepinfo
bin/ebuild.sh
bin/egencache
bin/emerge-webrsync
bin/etc-update
bin/misc-functions.sh
pym/_emerge/Binpkg.py
pym/_emerge/EbuildBuild.py
pym/_emerge/Package.py
pym/_emerge/depgraph.py
pym/portage/__init__.py
pym/portage/const.py
pym/portage/dbapi/bintree.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/doebuild.py
pym/portage/package/ebuild/fetch.py
pym/portage/process.py