Merge with trunk 4721:4722
authorFabian Groffen <grobian@gentoo.org>
Mon, 16 Oct 2006 09:06:28 +0000 (09:06 -0000)
committerFabian Groffen <grobian@gentoo.org>
Mon, 16 Oct 2006 09:06:28 +0000 (09:06 -0000)
commit29c8476476f78e7e2ccaecb8cbd09033cbc022d6
treeeacbd080ea6ff510c7246b4a5982d1e2b2214392
parentb16786098deb74e6827b5d634e771f4d4da79751
Merge with trunk 4721:4722
For bug #133908, prevent collisions in ${PKGDIR}/All/ by automatically
bumping colliding packages to ${PKGDIR}/${CATEGORY}/ just before a
collision would occur.  Newly built packages are always stored in
${PKGDIR}/All/, should this be100% compatible with previous behavior.

svn path=/main/branches/prefix/; revision=4723
bin/emerge
pym/portage.py