[gentoo-commits] proj/portage:2.1.9 commit in: man/, bin/, pym/portage/, pym/_emerge/

[gentoo-commits] proj/portage:2.1.9 commit in: man/, bin/, pym/portage/, pym/_emerge/

[Zac Medico]

commit:     c5346405cd10a848e95a21665e61843027ebad21
Author:     MATSUU Takuto <matsuu <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 19:20:58 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu May 26 03:36:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c5346405

Add FEATURES=distcc-pump support.

This will fix bug #288597.

---
 bin/ebuild.sh              |    7 +++++++
 man/make.conf.5            |    3 +++
 pym/_emerge/EbuildPhase.py |    2 +-
 pym/portage/const.py       |    2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c3cf181..37a3084 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1071,6 +1071,13 @@ dyn_compile() {
 
 	trap abort_compile SIGINT SIGQUIT
 
+	if hasq distcc $FEATURES && hasq distcc-pump $FEATURES ; then
+		if [[ -z $INCLUDE_SERVER_PORT ]] || [[ ! -w $INCLUDE_SERVER_PORT ]] ; then
+			eval $(/usr/bin/pump --startup)
+			trap "/usr/bin/pump --shutdown" EXIT
+		fi
+	fi
+
 	ebuild_phase pre_src_compile
 
 	vecho ">>> Compiling source in $PWD ..."

diff --git a/man/make.conf.5 b/man/make.conf.5
index acb18ae..e6e159e 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -257,6 +257,9 @@ will be reused whenever they are available.
 .B distcc
 Enable portage support for the distcc package.
 .TP
+.B distcc\-pump
+Enable portage support for the distcc package with pump mode.
+.TP
 .B distlocks
 Portage uses lockfiles to ensure competing instances don't clobber
 each other's files. This feature is enabled by default but may cause

diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index 66b6bc8..ed09b50 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -31,7 +31,7 @@ class EbuildPhase(CompositeTask):
 	__slots__ = ("actionmap", "phase", "settings")
 
 	# FEATURES displayed prior to setup phase
-	_features_display = ("ccache", "distcc", "fakeroot",
+	_features_display = ("ccache", "distcc", "distcc-pump", "fakeroot",
 		"installsources", "keeptemp", "keepwork", "nostrip",
 		"preserve-libs", "sandbox", "selinux", "sesandbox",
 		"splitdebug", "suidctl", "test", "userpriv",

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 6b7b05b..9def85a 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -88,7 +88,7 @@ EBUILD_PHASES            = ("pretend", "setup", "unpack", "prepare", "configure"
 SUPPORTED_FEATURES       = frozenset([
                            "assume-digests", "binpkg-logs", "buildpkg", "buildsyspkg", "candy",
                            "ccache", "chflags", "collision-protect", "compress-build-logs",
-                           "digest", "distcc", "distlocks", "fakeroot",
+                           "digest", "distcc", "distcc-pump", "distlocks", "fakeroot",
                            "fail-clean", "fixpackages", "force-mirror", "getbinpkg",
                            "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",
                            "metadata-transfer", "mirror", "multilib-strict", "news",