diff -urN portage-2.2_rc33-orig/bin/ebuild.sh portage-2.2_rc33/bin/ebuild.sh
--- portage-2.2_rc33-orig/bin/ebuild.sh	2009-05-06 16:14:22 +0900
+++ portage-2.2_rc33/bin/ebuild.sh	2009-05-06 16:15:38 +0900
@@ -1005,6 +1005,18 @@
 	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
+		rm -rf "${D}"/usr/lib/python*/site-packages/*/{locale,i18n}
+	fi
 	touch "${PORTAGE_BUILDDIR}/.installed"
 	vecho ">>> Completed installing ${PF} into ${D}"
 	vecho