--- baselayout-2.0.0.ebuild.orig	2008-04-19 02:37:05.000000000 -0400
+++ baselayout-2.0.0.ebuild	2008-04-22 20:24:56.000000000 -0400
@@ -49,7 +49,18 @@
 			ln -s "${lib}" "${ROOT}usr/local/lib"
 		fi
 
-		emake -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
+		# Catalyst puts this in the way...
+		if [ -e "${ROOT}proc/self" ] ; then
+			umount "${ROOT}proc"
+			reproc=yes
+		fi
+
+		emake -C "${S}" DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
+
+		if [ "${reproc}" = "yes" ] ; then
+			mount -t proc none "${ROOT}proc"
+		fi
+
 	fi
 }