From: Fabian Groffen Date: Sun, 13 Mar 2011 14:42:58 +0000 (+0100) Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e8dc4226bf5bad8ade819aa5282ec6aca01f220;p=portage.git Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/ebuild-ipc.py --- 0e8dc4226bf5bad8ade819aa5282ec6aca01f220 diff --cc bin/ebuild-ipc.py index 786f4a766,d8e7e5512..761b695ae --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2010 Gentoo Foundation + # Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # This is a helper which ebuild processes can use