diff -ur uclibc/uclibc-0.9.27-r1.ebuild uclibc.new/uclibc-0.9.27-r1.ebuild
--- uclibc/uclibc-0.9.27-r1.ebuild	2011-04-20 14:31:26.000000000 -0400
+++ uclibc.new/uclibc-0.9.27-r1.ebuild	2011-08-22 15:56:10.000000000 -0400
@@ -36,7 +36,7 @@
 	) ) )"
 
 LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
+[[ -n ${CHOST} ]] && [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
 KEYWORDS="-* arm m68k ~mips ppc sh sparc x86"
diff -ur uclibc/uclibc-0.9.28.3.ebuild uclibc.new/uclibc-0.9.28.3.ebuild
--- uclibc/uclibc-0.9.28.3.ebuild	2011-04-20 14:31:26.000000000 -0400
+++ uclibc.new/uclibc-0.9.28.3.ebuild	2011-08-22 15:56:19.000000000 -0400
@@ -35,7 +35,7 @@
 	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
+[[ -n ${CHOST} ]] && [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
 KEYWORDS="-* arm m68k -mips ppc sh sparc x86"
diff -ur uclibc/uclibc-0.9.28.3-r3.ebuild uclibc.new/uclibc-0.9.28.3-r3.ebuild
--- uclibc/uclibc-0.9.28.3-r3.ebuild	2011-04-20 14:31:26.000000000 -0400
+++ uclibc.new/uclibc-0.9.28.3-r3.ebuild	2011-08-22 15:56:28.000000000 -0400
@@ -35,7 +35,7 @@
 	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
+[[ -n ${CHOST} ]] && [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
 KEYWORDS="-* arm ~m68k -mips ppc ~sh ~sparc x86"
diff -ur uclibc/uclibc-0.9.28.3-r7.ebuild uclibc.new/uclibc-0.9.28.3-r7.ebuild
--- uclibc/uclibc-0.9.28.3-r7.ebuild	2011-04-20 14:31:26.000000000 -0400
+++ uclibc.new/uclibc-0.9.28.3-r7.ebuild	2011-08-22 15:56:34.000000000 -0400
@@ -35,7 +35,7 @@
 	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
+[[ -n ${CHOST} ]] && [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
 KEYWORDS="-* arm m68k -mips ppc sh ~sparc x86"
diff -ur uclibc/uclibc-0.9.28.3-r8.ebuild uclibc.new/uclibc-0.9.28.3-r8.ebuild
--- uclibc/uclibc-0.9.28.3-r8.ebuild	2011-04-20 14:31:26.000000000 -0400
+++ uclibc.new/uclibc-0.9.28.3-r8.ebuild	2011-08-22 15:56:40.000000000 -0400
@@ -35,7 +35,7 @@
 	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
+[[ -n ${CHOST} ]] && [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
 KEYWORDS="-* arm m68k -mips ppc sh ~sparc x86"
diff -ur uclibc/uclibc-0.9.30.1.ebuild uclibc.new/uclibc-0.9.30.1.ebuild
--- uclibc/uclibc-0.9.30.1.ebuild	2011-04-20 14:31:26.000000000 -0400
+++ uclibc.new/uclibc-0.9.30.1.ebuild	2011-08-22 15:56:56.000000000 -0400
@@ -38,7 +38,7 @@
 RESTRICT="strip"
 
 RDEPEND=""
-if [[ -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then
+if [[ -n $CHOST && -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then
 	DEPEND=""
 	SLOT="${CTARGET}"
 else
diff -ur uclibc/uclibc-0.9.30.1-r1.ebuild uclibc.new/uclibc-0.9.30.1-r1.ebuild
--- uclibc/uclibc-0.9.30.1-r1.ebuild	2011-04-20 14:31:26.000000000 -0400
+++ uclibc.new/uclibc-0.9.30.1-r1.ebuild	2011-08-22 15:57:03.000000000 -0400
@@ -38,7 +38,7 @@
 RESTRICT="strip"
 
 RDEPEND=""
-if [[ -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then
+if [[ -n $CHOST && -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then
 	DEPEND=""
 	SLOT="${CTARGET}"
 else
diff -ur uclibc/uclibc-0.9.30.ebuild uclibc.new/uclibc-0.9.30.ebuild
--- uclibc/uclibc-0.9.30.ebuild	2011-04-20 14:31:26.000000000 -0400
+++ uclibc.new/uclibc-0.9.30.ebuild	2011-08-22 15:57:10.000000000 -0400
@@ -39,7 +39,7 @@
 RESTRICT="strip"
 
 RDEPEND=""
-if [[ -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then
+if [[ -n $CHOST && -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then
 	DEPEND=""
 	SLOT="${CTARGET}"
 else