--- /home/rl03/gentoo-x86/eclass/webapp.eclass	2006-06-25 03:34:36.000000000 +0000
+++ webapp.eclass	2006-06-25 03:33:45.000000000 +0000
@@ -37,6 +37,7 @@
 
 ETC_CONFIG="${ROOT}/etc/vhosts/webapp-config"
 WEBAPP_CONFIG="${ROOT}/usr/sbin/webapp-config"
+WEBAPP_CLEANER="${ROOT}/usr/bin/webapp-cleaner"
 
 # ------------------------------------------------------------------------
 # INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
@@ -496,22 +497,10 @@
 		einfo "Running ${my_cmd}"
 		${my_cmd}
 
-		# remove the old version
-		#
-		# why do we do this?  well ...
-		#
-		# normally, emerge -u installs a new version and then removes the
-		# old version.  however, if the new version goes into a different
-		# slot to the old version, then the old version gets left behind
-		#
-		# if USE=-vhosts, then we want to remove the old version, because
-		# the user is relying on portage to do the magical thing for it
-
-		if [ "${IS_UPGRADE}" = "1" ] ; then
-			einfo "Removing old version ${REMOVE_PKG}"
+		# run webapp-cleaner instead of emerge
+		echo
+		${WEBAPP_CLEANER} -p -C ${PN}
 
-			emerge -C "${REMOVE_PKG}"
-		fi
 	else
 		# vhosts flag is on
 		#