--- /usr/portage/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild	2003-09-17 19:09:38.000000000 +0200
+++ baselayout-1.8.6.10-r2.ebuild	2003-09-22 01:52:30.000000000 +0200
@@ -191,7 +191,7 @@
 	keepdir /usr/bin
 	keepdir /lib /usr/lib
 	keepdir /var /var/run /var/lock/subsys /var/state
-	keepdir /var/spool /var/tmp /var/lib/misc
+	keepdir_mount /var/spool /var/tmp /var/lib/misc
 	keepdir /var/log/news
 	dosym ../var/tmp /usr/tmp
 
@@ -204,7 +204,7 @@
 		dosym lib /usr/X11R6/lib64
 	fi
 
-	keepdir /home
+	keepdir_mount /home
 	keepdir /usr/include /usr/src
 	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
 	keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share
@@ -225,7 +225,7 @@
 
 	for foo in games lib sbin share bin share/doc share/man src
 	do
-		keepdir /usr/local/${foo}
+		keepdir_mount /usr/local/${foo}
 	done
 	# Local FHS compat symlinks
 	dosym share/man /usr/local/man
@@ -257,7 +257,7 @@
 	chmod 775 ${D}/var/lock
 	insopts -m0644
 
-	keepdir /opt /etc/opt
+	keepdir_mount /opt /etc/opt
 
 	insinto /etc
 	ln -s ../proc/filesystems ${D}/etc/filesystems
@@ -286,8 +286,8 @@
 		#keepdir /lib/dev-state/pts /lib/dev-state/shm
 	else
 		# Normal
-		keepdir /dev
-		keepdir /dev/pts /dev/shm
+		keepdir_mount /dev
+		keepdir_mount /dev/pts /dev/shm
 		dosym ../sbin/MAKEDEV /dev/MAKEDEV
 	fi