--- util-linux-2.21.1.ebuild.orig	2012-04-14 06:31:27.000000000 +0100
+++ util-linux-2.21.1.ebuild	2012-04-16 13:34:46.006342596 +0100
@@ -49,7 +49,6 @@
 	else
 		use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
 	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
 	elibtoolize
 }
 
@@ -103,7 +102,11 @@
 	fi
 
 	# need the libs in /
-	gen_usr_ldscript -a blkid mount uuid
+	gen_usr_ldscript -a blkid uuid
+
+	# uClibc can't build libmount (yet)
+	[[ -f "${ED}/usr/$(get_libdir)/libmount.so" ]] && gen_usr_ldscript -a mount
+
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name '*.la' -delete