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

diff --git a/ChangeLog b/ChangeLog
index b2b4e47bd17a694a6d3808df64641c1cb0e01c29..c8bd9303dfa300b9d10b0ae7624a61608d8a10fb 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)
+
   12 Sep 2009; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/livecdfs-update.sh:
   Apply patch from Gentoo bug #284585

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index fe20194bb48563d5e183d65ffb67945901df9a64..1c227aa48f7b2b3ba862cf7e0891ea33ebc7d852 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/*
 }