--- /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild	2013-05-21 08:48:41.000000000 -0400
+++ baselayout-2.2.ebuild	2013-06-13 06:34:14.000000000 -0400
@@ -12,7 +12,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build kernel_linux"
+IUSE="build kernel_linux uclibc"
 
 PDEPEND="sys-apps/openrc"
 
@@ -168,7 +168,11 @@
 	# path and the symlinked path doesn't change the resulting cache.
 	local libdir ldpaths
 	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}"
+		if use uclibc; then
+			ldpaths+=":/usr/local/${libdir}"
+		else
+			ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}"
+		fi
 	done
 	echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic