Run depclean at the end of stage generation (for Gentoo bug #295132)

diff --git a/ChangeLog b/ChangeLog
index d03832ea32be96f736da9ced2376a2016497dae2..877a23d0d46b2fa7b61d4a3adc5ea0c12abe7554 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  28 Dec 2009; Andrew Gaffney <agaffney@gentoo.org>
+  targets/support/chroot-functions.sh:
+  Run depclean at the end of stage generation (for Gentoo bug #295132)
+
   26 Dec 2009; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/rc-update.sh:
   Add patch to start hald before xdm for Gentoo bug #280209

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 4641b4413090d4e77c84dbe01b6465e3896dee7d..7136083c87f566f436d3899952b1e517c5460299 100644 (file)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -208,6 +208,14 @@ cleanup_stages() {
                        echo "Skipping removal of world file for ${clst_target}"
                        ;;
        esac
+       case ${clst_target} in
+               stage1|stage2|stage3|stage4|system)
+                       run_merge --depclean --with-bdeps=n
+                       ;;
+               *)
+                       echo "Skipping depclean operation for ${clst_target}"
+                       ;;
+       esac
 
        rm -f /var/log/emerge.log /var/log/portage/elog/*
 }