git.tremily.us Git - portage.git/commit

author	Fabian Groffen <grobian@gentoo.org>
	Fri, 3 Sep 2010 15:30:54 +0000 (17:30 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Fri, 3 Sep 2010 15:30:54 +0000 (17:30 +0200)
commit	94ce7d265005e1922902ce4c3fb0321d183d0cd6
tree	192d111e23675bb00a76ad3102ab14d90d9a3519	tree \| snapshot
parent	73f311e94c84cd840c61283fad1a8012b1fab221	commit \| diff
parent	94015a2fe3b2d886b71e874c10bdd2504e54a133	commit \| diff

Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild
bin/ebuild-helpers/ecompressdir
bin/ebuild-helpers/prepalldocs
bin/ebuild-helpers/prepallman
bin/ebuild-helpers/prepinfo
bin/ebuild-helpers/prepman
bin/egencache
bin/regenworld
mkrelease.sh
pym/_emerge/AtomArg.py
pym/_emerge/Binpkg.py
pym/_emerge/BinpkgExtractorAsync.py
pym/_emerge/Blocker.py
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/portage/_legacy_globals.py
pym/portage/data.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/fetch.py

39 files changed:

bin/ebuild	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/dodoc	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/ecompressdir	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepalldocs	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepallman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepinfo	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-ipc.py	diff1 \|	diff2 \|	blob \| history
bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/egencache	diff1 \|	diff2 \|	blob \| history
bin/emaint	diff1 \|	diff2 \|	blob \| history
bin/isolated-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/misc-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/portageq	diff1 \|	diff2 \|	blob \| history
bin/quickpkg	diff1 \|	diff2 \|	blob \| history
bin/regenworld	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
cnf/make.globals	diff1 \|	diff2 \|	blob \| history
man/emerge.1	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Binpkg.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/EbuildBuild.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Package.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/actions.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/main.py	diff1 \|	diff2 \|	blob \| history
pym/portage/__init__.py	diff1 \|	diff2 \|	blob \| history
pym/portage/_sets/files.py	diff1 \|	diff2 \|	blob \| history
pym/portage/_sets/profiles.py	diff1 \|	diff2 \|	blob \| history
pym/portage/const.py	diff1 \|	diff2 \|	blob \| history
pym/portage/data.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/bintree.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/vartree.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dispatch_conf.py	diff1 \|	diff2 \|	blob \| history
pym/portage/getbinpkg.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/config.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/doebuild.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/fetch.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	diff1 \|	diff2 \|	blob \| history
pym/portage/versions.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

bin/ebuild	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/dodoc	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/ecompressdir	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepalldocs	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepallman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepinfo	diff1 \|	diff2 \|	blob \| history
bin/ebuild-helpers/prepman	diff1 \|	diff2 \|	blob \| history
bin/ebuild-ipc.py	diff1 \|	diff2 \|	blob \| history
bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/egencache	diff1 \|	diff2 \|	blob \| history
bin/emaint	diff1 \|	diff2 \|	blob \| history
bin/isolated-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/misc-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/portageq	diff1 \|	diff2 \|	blob \| history
bin/quickpkg	diff1 \|	diff2 \|	blob \| history
bin/regenworld	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
cnf/make.globals	diff1 \|	diff2 \|	blob \| history
man/emerge.1	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Binpkg.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/EbuildBuild.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/Package.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/actions.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/depgraph.py	diff1 \|	diff2 \|	blob \| history
pym/_emerge/main.py	diff1 \|	diff2 \|	blob \| history
pym/portage/__init__.py	diff1 \|	diff2 \|	blob \| history
pym/portage/_sets/files.py	diff1 \|	diff2 \|	blob \| history
pym/portage/_sets/profiles.py	diff1 \|	diff2 \|	blob \| history
pym/portage/const.py	diff1 \|	diff2 \|	blob \| history
pym/portage/data.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/bintree.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dbapi/vartree.py	diff1 \|	diff2 \|	blob \| history
pym/portage/dispatch_conf.py	diff1 \|	diff2 \|	blob \| history
pym/portage/getbinpkg.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/config.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/doebuild.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/fetch.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	diff1 \|	diff2 \|	blob \| history
pym/portage/versions.py	diff1 \|	diff2 \|	blob \| history