Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 12 Apr 2010 18:07:18 +0000 (20:07 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 12 Apr 2010 18:07:18 +0000 (20:07 +0200)
commit173875dcfe628018572c96cc1a0b14fcc444248c
tree8a97b5af8bc6172b405d8197ffa7bea71d32ee56
parent9f5a8caf22e700f2f11f222aaa526e2588344638
parenta0d55a7bc4a0d595b01a4d11072f813870a58bf5
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/repoman
pym/portage/const.py
pym/portage/data.py

Keep PORTAGE_USERNAME and PORTAGE_GROUPNAME in, since in Prefix these
have been variable for a long time.
12 files changed:
bin/isolated-functions.sh
bin/repoman
pym/_emerge/EbuildFetcher.py
pym/portage/__init__.py
pym/portage/const.py
pym/portage/data.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/util/__init__.py
pym/portage/versions.py