From 40f53e56d80e7773bdce4112cae4024b4cbb77be Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Thu, 21 Oct 2010 09:54:17 +0200
Subject: [PATCH] [remaster/mcs] more cleanup and shrinking work

---
 molecules/3rdparty/mcs.common                 | 35 ++++++++++++++++++-
 .../remaster_mcs_inner_chroot_script_after.sh |  3 ++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/molecules/3rdparty/mcs.common b/molecules/3rdparty/mcs.common
index 0080810..7db8f63 100644
--- a/molecules/3rdparty/mcs.common
+++ b/molecules/3rdparty/mcs.common
@@ -36,7 +36,37 @@ pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh MCS
 destination_iso_directory: /sabayon/iso
 
 # List of packages that would be removed from chrooted system (comma separated)
-packages_to_remove: app-office/openoffice, app-emulation/wine, sabayon-mce, sabayon-music, sun-jre-bin
+packages_to_remove:
+	app-office/openoffice,
+	app-emulation/wine,
+	sabayon-mce, 
+	sabayon-music,
+	sun-jre-bin,
+	gnome-extra/gcalctool,
+	x11-terms/guake,
+	app-misc/gnote,
+	gnome-extra/gnome-games,
+	games-puzzle/world-of-goo-demo,
+	app-text/evince,
+	media-gfx/shotwell,
+	media-gfx/gimp,
+	net-p2p/deluge,
+	net-dialup/gnome-ppp,
+	net-irc/xchat,
+	net-im/pidgin,
+	mail-client/evolution,
+	app-admin/sulfur,
+	sys-apps/magneto-core,
+	media-tv/xbmc,
+	media-sound/audacious,
+	app-cdr/brasero,
+	media-video/totem,
+	www-plugins/adobe-flash,
+	media-libs/libdvdcss,
+	media-libs/libdvdread,
+	gnome-extra/gnome-media,
+	x11-wm/compiz
+
 
 # List of packages that would be added from chrooted system (comma separated)
 packages_to_add:
@@ -55,6 +85,9 @@ packages_to_add:
 # Custom shell call to packages add (default is: equo install)
 custom_packages_add_cmd: equo install --relaxed
 
+# Custom shell call to packages removal (default is: equo remove)
+custom_packages_remove_cmd: equo remove --deep
+
 # Custom command for updating repositories (default is: equo update)
 # repositories_update_cmd:
 
diff --git a/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh b/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
index 84f96b5..3cc0695 100755
--- a/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
+++ b/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
@@ -134,6 +134,9 @@ rc-update del music default
 rm /.mcs -rf
 
 # Sabayon stuff
+echo "Working out Sabayon stuff"
+rm -rf /install-data || exit 1
+rm -rf /usr/share/sabayon/xdg || exit 1
 
 mount -t proc proc /proc
 /lib/rc/bin/rc-depend -u