--- dep-clean.orig	2003-05-26 13:58:08.000000000 +0300
+++ dep-clean	2003-05-26 14:34:49.000000000 +0300
@@ -7,7 +7,8 @@
 
 tmp="/tmp/$$"
 
-#Get PORTDIR_OVERLAY from portage
+#Get PORTDIR and PORTDIR_OVERLAY from portage
+PORTDIR="$(/usr/lib/portage/bin/portageq portdir)"
 PORTDIR_OVERLAY="$(/usr/lib/portage/bin/portageq portdir_overlay)"
 
 rm -rf ${tmp} > /dev/null 2>&1
@@ -173,8 +174,8 @@
 fi
 
 cat ${tmp}/current | grep -f ${tmp}/world | sort > ${tmp}/world.inst
-find /usr/portage ${PORTDIR_OVERLAY} -iname '*.ebuild' | \
-	cut -f4,6 -d/ | sed -e 's:\.ebuild::' > ${tmp}/ebuilds
+find ${PORTDIR} ${PORTDIR_OVERLAY} -iname '*.ebuild' | \
+	sed 's:.*/\(.*/.*\).ebuild:\1:' > ${tmp}/ebuilds
 grep -xf ${tmp}/world.inst ${tmp}/ebuilds >> ${tmp}/world.new
 
 if [ ${verb} ]; then