From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 12 May 2008 19:17:48 +0000 (-0000)
Subject: manually merge differences with the trunk
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9320aa925455dda6392d1d5bc9b6105274ae3447;p=portage.git

manually merge differences with the trunk

svn path=/main/branches/prefix/; revision=10305
---

diff --git a/bin/dolib.a b/bin/dolib.a
index a1cc01641..22c570587 100755
--- a/bin/dolib.a
+++ b/bin/dolib.a
@@ -3,5 +3,5 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-exec env LIBOPTIONS="-m 0644" \
+exec env LIBOPTIONS="-m0644" \
 	dolib "$@"
diff --git a/bin/dolib.so b/bin/dolib.so
index 6dae7d052..63baaae00 100755
--- a/bin/dolib.so
+++ b/bin/dolib.so
@@ -3,5 +3,5 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-exec env LIBOPTIONS="-m 0755" \
+exec env LIBOPTIONS="-m0755" \
 	dolib "$@"
diff --git a/bin/dosbin b/bin/dosbin
index e454aa777..c2b1eb063 100755
--- a/bin/dosbin
+++ b/bin/dosbin
@@ -16,7 +16,7 @@ ret=0
 
 for x in "$@" ; do
 	if [[ -e ${x} ]] ; then
-		install -m 0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED}${DESTTREE}/sbin"
+		install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED}${DESTTREE}/sbin"
 	else
 		echo "!!! ${0##*/}: ${x} does not exist" 1>&2
 		false