--- /usr/lib/portage/bin/ebuild.sh.orig	2004-11-03 16:46:55 +0000
+++ /usr/lib/portage/bin/ebuild.sh	2004-10-28 18:15:57 +0000
@@ -1005,6 +1005,23 @@
 
 	pkg_preinst
 
+	# hopefully this will someday allow us to get rid of the no* feature flags
+	# we don't want globbing for initial expansion, but afterwards, we do
+	local shopts=$-
+	set -o noglob
+	for no_inst in `echo "${INSTALL_MASK}"` ; do
+		set +o noglob
+		einfo "Removing ${no_inst}"
+		# normal stuff
+		rm -Rf ${IMAGE}/${no_inst} >&/dev/null
+
+		# we also need to handle globs (*.a, *.h, etc)
+		find "${IMAGE}" -name ${no_inst} -exec rm -fR {} \; >&/dev/null
+	done
+	# set everything back the way we found it
+	set +o noglob
+	set -${shopts}
+
 	# remove man pages
 	if hasq noman $FEATURES; then
 		rm -fR "${IMAGE}/usr/share/man"