Add FEATURES=distcc-pump support.

This will fix bug #288597.

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c3cf18164cf16db254152829dcf6aa96b6f53a23..37a30848106b03098f6a0fc7d2e77b8fc7804212 100755 (executable)
--- 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 acb18ae88b57d3e75cbd17e799e76695524ccbbf..e6e159e814bda8c013a5e98fcf4a29278587c2e2 100644 (file)
--- 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 66b6bc8bc75add0a89c094dd77d46ca09bec429c..ed09b50872c24217c03b67ae03e377348e794e9f 100644 (file)
--- 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 6b7b05bf3ca1955c99f259c1da8293f96db3c84c..9def85a0509cd45c45b4a219c9fdc8d86ffb9d57 100644 (file)
--- 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",