diff -urN ../portage-2.2_rc1-orig/bin/ebuild.sh bin/ebuild.sh
--- ../portage-2.2_rc1-orig/bin/ebuild.sh	2008-06-08 02:18:35 +0900
+++ bin/ebuild.sh	2008-06-21 12:41:03 +0900
@@ -977,6 +977,17 @@
 	export _E_DOCDESTTREE_=""
 
 	ebuild_phase src_install
+	if test -d "${D}/usr/share/locale" && ! hasq nls ${USE}; then
+		vecho ">>> Deleting locale files (USE=-nls)..."
+		for msgdir in "${D}/usr/share/locale"/*/LC_MESSAGES; do
+			# Make sure it exists first--we don't want to accidentally
+			# rm -rf ${D}/usr/share/locale
+			if test -d "${msgdir}"; then
+				dir=`dirname "${msgdir}"`
+				rm -rf "${dir}"
+			fi
+		done
+	fi
 	touch "${PORTAGE_BUILDDIR}/.installed"
 	vecho ">>> Completed installing ${PF} into ${D}"
 	vecho