Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 27 May 2011 17:39:37 +0000 (19:39 +0200)
committerFabian Groffen <grobian@gentoo.org>
Fri, 27 May 2011 17:39:37 +0000 (19:39 +0200)
commitabd5adceac4b5f95de66be7516d4f29f24f00d02
treecb781e704ed3935d0697fec252c52572d9f68400
parent6554499b2e3e51288ed69349c648c8455cc05dc1
parent49a246a11edff3fdcaebe756ac3432b35b613ec6
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Ported changes to LinkageMapELF to the other LinkageMaps

Conflicts:
bin/etc-update
bin/glsa-check
bin/regenworld
pym/portage/dbapi/vartree.py
22 files changed:
bin/ebuild.sh
bin/etc-update
bin/glsa-check
bin/regenworld
bin/repoman
man/emerge.1
pym/_emerge/Binpkg.py
pym/_emerge/EbuildBuild.py
pym/_emerge/EbuildBuildDir.py
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/const.py
pym/portage/dbapi/vartree.py
pym/portage/output.py
pym/portage/package/ebuild/doebuild.py
pym/portage/util/__init__.py
pym/portage/util/_dyn_libs/LinkageMapELF.py
pym/portage/util/_dyn_libs/LinkageMapMachO.py
pym/portage/util/_dyn_libs/LinkageMapPeCoff.py
pym/portage/util/_dyn_libs/LinkageMapXCoff.py