From 3f6ebaf5f56f2c31e3639ec16c8e21db0a734cc8 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Thu, 18 Oct 2012 00:54:14 +0200
Subject: Make __source_all_bashrcs() and install_symlink_html_docs()
 compatible with subslots.

---
 bin/ebuild.sh         | 2 +-
 bin/misc-functions.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b04244128..d83789c49 100755
--- 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 4a1c46dc3..f3b0cc0a3 100755
--- 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}"
-- 
cgit v1.2.3-1-g7c22