Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 15 Aug 2010 09:43:15 +0000 (11:43 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sun, 15 Aug 2010 09:43:15 +0000 (11:43 +0200)
commitf17de73d0cbedad35501669d12bd6cf50bcc9d06
treef0adad22b1327f71df2954947148bad20a26008a
parentd0e9a33e3a56644f41adc2ed67e9462d78fb0ae3
parent529f813023df5cb709aa7e9d344393f767d2d821
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/die
bin/ebuild-helpers/dobin
bin/ebuild-helpers/dodir
bin/ebuild-helpers/dodoc
bin/ebuild-helpers/dohtml
bin/ebuild-helpers/doinfo
bin/ebuild-helpers/dosbin
bin/ebuild-helpers/dosym
bin/ebuild-helpers/ecompressdir
bin/ebuild-helpers/emake
bin/ebuild-helpers/fowners
bin/ebuild-helpers/fperms
bin/ebuild-helpers/portageq
bin/ebuild.sh
bin/misc-functions.sh
bin/repoman
pym/_emerge/Package.py
pym/_emerge/depgraph.py
pym/portage/_deprecated.py
pym/portage/dbapi/bintree.py
pym/portage/package/ebuild/config.py
56 files changed:
bin/binhost-snapshot
bin/ebuild
bin/ebuild-helpers/4/dodoc
bin/ebuild-helpers/die
bin/ebuild-helpers/dobin
bin/ebuild-helpers/doconfd
bin/ebuild-helpers/dodir
bin/ebuild-helpers/dodoc
bin/ebuild-helpers/doenvd
bin/ebuild-helpers/doexe
bin/ebuild-helpers/dohtml
bin/ebuild-helpers/doinfo
bin/ebuild-helpers/doinitd
bin/ebuild-helpers/doins
bin/ebuild-helpers/dolib
bin/ebuild-helpers/doman
bin/ebuild-helpers/domo
bin/ebuild-helpers/dosbin
bin/ebuild-helpers/dosym
bin/ebuild-helpers/ecompress
bin/ebuild-helpers/ecompressdir
bin/ebuild-helpers/emake
bin/ebuild-helpers/fowners
bin/ebuild-helpers/fperms
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/ebuild-helpers/portageq
bin/ebuild-ipc
bin/ebuild-ipc.py
bin/ebuild.sh
bin/emerge-webrsync
bin/isolated-functions.sh
bin/misc-functions.sh
bin/portageq
bin/quickpkg
bin/repoman
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/__init__.py
pym/portage/dbapi/bintree.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/tests/runTests
runtests.sh