[gentoo-commits] proj/portage:multilib commit in: bin/

["Thomas Sachau" <tommy@gentoo.org>]

commit:     89a8b8bc44af7664d1a5d9b064f4442ed7c845bb
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 12:34:35 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 12:34:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=89a8b8bc

Wrap all binaries in /bin /usr/bin /sbin and /usr/sbin

---
 bin/auto-multilib.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 4cafc35..67b53e1 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -72,8 +72,8 @@ prep_ml_binaries() {
 		mv ${binary} ${binary}-${ABI} || die
 		_debug ${binary} ${binary}-${ABI}
 		if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
-			ln -s /usr/bin/abi-wrapper ${binary} || die
-			_debug /usr/bin/abi-wrapper ${binary}
+			ln -s /bin/abi-wrapper ${binary} || die
+			_debug /bin/abi-wrapper ${binary}
 		fi
 	done
 }
@@ -277,14 +277,14 @@ _finalize_abi_install() {
 
 	# Create wrapper symlink for *-config files
 	local i= 
-	prep_ml_binaries $(find "${D}"usr/bin -type f -name '*-config' 2>/dev/null)
+	prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin -type f -name '*-config' 2>/dev/null)
 
 	local noabi=()
 	for i in ${MULTILIB_ABIS}; do
 		noabi+=( ! -name '*-'${i} )
 	done
 	if [[ ${MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]]; then
-		for i in $(find "${D}"usr/bin/ -type f ${noabi[@]}) $(find "${D}"bin/ -type f ${noabi[@]}); do
+		for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]}) ); do
 			prep_ml_binaries "${i}"
 		done
 	fi