emerge-*webrsync: fix post_sync for prefix

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 5644abfa4e2ba32fbf17491759fd3b8f60605f6b..fd71a1d8dd26233ae1eeb5e213f947160866a193 100755 (executable)
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -39,8 +39,9 @@ else
        eecho "could not find 'portageq'; aborting"
        exit 1
 fi
-eval $("${portageq}" envvar -v DISTDIR FEATURES FETCHCOMMAND GENTOO_MIRRORS \
-       PORTAGE_BIN_PATH PORTAGE_GPG_DIR \
+eval $("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
+       FETCHCOMMAND GENTOO_MIRRORS \
+       PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \
        PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS \
        PORTAGE_RSYNC_OPTS PORTAGE_TMPDIR PORTDIR \
        SYNC USERLAND http_proxy ftp_proxy)
@@ -232,7 +233,8 @@ sync_local() {
                vecho "Updating cache ..."
                emerge --metadata
        fi
-       [ -x /etc/portage/bin/post_sync ] && /etc/portage/bin/post_sync
+       local post_sync=${PORTAGE_CONFIGROOT}etc/portage/bin/post_sync
+       [ -x "${post_sync}" ] && "${post_sync}"
        # --quiet suppresses output if there are no relevant news items
        has news ${FEATURES} && emerge --check-news --quiet
        return 0

diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
index 0b282d955d38efbca4529ccd35c1d4c01e13376d..4eb17b7c80d74c22025604baf329378df5d0443d 100755 (executable)
--- a/misc/emerge-delta-webrsync
+++ b/misc/emerge-delta-webrsync
@@ -33,7 +33,7 @@ else
 fi
 eval $("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
        FETCHCOMMAND GENTOO_MIRRORS \
-       PORTAGE_BIN_PATH PORTAGE_GPG_DIR \
+       PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \
        PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS \
        PORTAGE_RSYNC_OPTS PORTAGE_TMPDIR PORTDIR \
        USERLAND http_proxy ftp_proxy)
@@ -284,8 +284,8 @@ sync_local() {
                echo "transferring metadata/cache"
                emerge --metadata
        fi
-       local post_sync=/etc/portage/bin/post_sync
-       [[ -x "${post_sync}" ]] && ${post_sync}
+       local post_sync=${PORTAGE_CONFIGROOT}etc/portage/bin/post_sync
+       [ -x "${post_sync}" ] && "${post_sync}"
 }
 
 fetch_from_mirrors() {