Bug #244792 - Remove confcache support.

svn path=/main/trunk/; revision=11770

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 00600473b3c959ad703eb9150059719d06bce339..01c9a0c3741c1c4a73de537d90b466b50b5b8d55 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -495,32 +495,7 @@ econf() {
                        LOCAL_EXTRA_ECONF="--libdir=${CONF_LIBDIR_RESULT} ${LOCAL_EXTRA_ECONF}"
                fi
 
-               local TMP_CONFCACHE_DIR CONFCACHE_ARG
-               if hasq confcache $FEATURES && ! hasq confcache $RESTRICT; then
-                       CONFCACHE="$(type -P confcache)"
-                       if [ -z "${CONFCACHE}" ]; then
-                               ewarn "disabling confcache, binary cannot be found"
-                       else
-                               CONFCACHE="${CONFCACHE/ /\ }"
-                               TMP_CONFCACHE_DIR="${CONFCACHE:+${CONFCACHE_DIR:-${PORTAGE_TMPDIR}/confcache}}"
-                               TMP_CONFCACHE_DIR="${TMP_CONFCACHE_DIR/ /\ }"
-                               CONFCACHE_ARG="--confcache-dir"
-                               local s
-                               if [ -n "$CCACHE_DIR" ]; then
-                                       s="$CCACHE_DIR"
-                               fi
-                               if [ -n "$DISTCC_DIR" ]; then
-                                       s="${s:+${s}:}$DISTCC_DIR"
-                               fi
-                               if [ -n "$s" ]; then
-                                       CONFCACHE_ARG="--confcache-ignore $s $CONFCACHE_ARG"
-                               fi
-                       fi
-               else
-                       CONFCACHE=
-               fi
-
-               vecho ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \
+               vecho "${ECONF_SOURCE}/configure" \
                        --prefix=/usr \
                        --host=${CHOST} \
                        --mandir=/usr/share/man \
@@ -531,7 +506,7 @@ econf() {
                        "$@" \
                        ${LOCAL_EXTRA_ECONF}
 
-               if ! ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \
+               if ! "${ECONF_SOURCE}/configure" \
                        --prefix=/usr \
                        --host=${CHOST} \
                        --mandir=/usr/share/man \

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4b9457ae9305af9ddf9a14e484c8c948cd0c741f..4713d8830c7b4d9b64943a01019d70952795102b 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4922,10 +4922,6 @@ def _prepare_features_dirs(mysettings):
                        "basedir_var":"CCACHE_DIR",
                        "default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"),
                        "always_recurse":False},
-               "confcache":{
-                       "basedir_var":"CONFCACHE_DIR",
-                       "default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "confcache"),
-                       "always_recurse":False},
                "distcc":{
                        "basedir_var":"DISTCC_DIR",
                        "default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"),