Make __source_all_bashrcs() and install_symlink_html_docs() compatible with subslots.

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b04244128e51c32ccf9d4be6b28fb61865502992..d83789c49bc3ba989a0757fd66c1c897289559d7 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -398,7 +398,7 @@ __source_all_bashrcs() {
        if [[ $EBUILD_PHASE != depend ]] ; then
                # The user's bashrc is the ONLY non-portage bit of code that can
                # change shopts without a QA violation.
-               for x in "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT},${P},${PF}}; do
+               for x in "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT%/*},${P},${PF}}; do
                        if [ -r "${x}" ]; then
                                # If $- contains x, then tracing has already been enabled
                                # elsewhere for some reason. We preserve it's state so as

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 4a1c46dc3c6fe7033ce9ed3dbae0ab3ef2ebe3ca..f3b0cc0a3f98539edc8969b7578d33a31d5b781a 100755 (executable)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -34,7 +34,7 @@ install_symlink_html_docs() {
                        if [ -z "${SLOT}" -o "${SLOT}" = "0" ] ; then
                                mysympath="${DOC_SYMLINKS_DIR}/${CATEGORY}/${PN}"
                        else
-                               mysympath="${DOC_SYMLINKS_DIR}/${CATEGORY}/${PN}-${SLOT}"
+                               mysympath="${DOC_SYMLINKS_DIR}/${CATEGORY}/${PN}-${SLOT%/*}"
                        fi
                        einfo "Symlinking ${mysympath} to the HTML documentation"
                        dodir "${DOC_SYMLINKS_DIR}/${CATEGORY}"