From 598e914d27b3a22d1af6ecc7008d01f3db83f14a Mon Sep 17 00:00:00 2001
From: Joost Ruis <joost.ruis@sabayonlinux.org>
Date: Thu, 21 Jun 2012 19:55:55 +0000
Subject: [PATCH] [molecules] introduce mate

---
 molecules/mate.common                         | 104 ++++++++++++++++++
 ...aster_generic_inner_chroot_script_after.sh |  14 +++
 2 files changed, 118 insertions(+)
 create mode 100644 molecules/mate.common

diff --git a/molecules/mate.common b/molecules/mate.common
new file mode 100644
index 0000000..fe65578
--- /dev/null
+++ b/molecules/mate.common
@@ -0,0 +1,104 @@
+# Define an alternative execution strategy, in this case, the value must be
+# "iso_remaster"
+execution_strategy: iso_remaster
+
+# Release string
+release_string: Sabayon Linux
+
+# File to write release string
+release_file: /etc/sabayon-edition
+
+# ISO Image title
+iso_title: Sabayon MATE
+
+# Outer chroot script command, to be executed outside destination chroot before
+# before entering it (and before inner_chroot_script)
+outer_chroot_script: /sabayon/scripts/remaster_pre.sh
+
+# Execute repositories update here, in a more fault-tolerant flavor
+inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
+
+# Inner chroot script command, to be executed inside destination chroot after
+# packages installation and removal
+inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh mate
+
+# Outer chroot script command, to be executed outside destination chroot before
+# before entering it (and AFTER inner_chroot_script)
+outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
+
+# Used to umount /proc and unbind packages dir
+error_script: /sabayon/scripts/remaster_error_script.sh
+
+# Extra mkisofs parameters, perhaps something to include/use your bootloader
+extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat
+
+# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
+pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh MATE
+
+# Post-ISO building script, called after ISO image generation.    
+post_iso_script: /sabayon/scripts/generic_post_iso_script.sh
+
+# Destination directory for the ISO image path (MANDATORY)
+destination_iso_directory: /sabayon/iso
+
+# List of packages that would be removed from chrooted system (comma separated)
+packages_to_remove:
+	www-client/lynx
+
+# List of packages that would be added from chrooted system (comma separated)
+packages_to_add:
+	@X,
+	@mate,
+	@fluxbox,
+	app-admin/rigo,
+	app-misc/sabayon-skel,
+	app-crypt/gnupg,
+	app-crypt/pinentry-gtk2,
+	app-emulation/virtualbox-guest-additions,
+	app-misc/anaconda-runtime-gui,
+	app-text/pastebunz,
+	gnome-extra/nm-applet-gtk2,
+	lxde-base/lxdm,
+	media-fonts/ttf-bitstream-vera,
+	media-fonts/dejavu,
+	media-fonts/corefonts,
+	media-plugins/alsa-plugins,
+	media-sound/audacious,
+	net-dialup/rp-pppoe,
+	net-irc/xchat,
+	net-p2p/transmission-gtk,
+	x11-libs/gksu,
+	x11-terms/xterm,
+	sys-apps/gnome-disk-utility,
+	sys-apps/gpu-detector,
+	sys-auth/consolekit,
+	sys-block/parted,
+	sys-fs/ntfs3g,
+	sys-fs/zfs,
+	sys-power/cpufrequtils,
+	www-client/midori,
+	x11-misc/magneto-gtk,
+	x11-drivers/ati-drivers,
+	x11-drivers/nvidia-drivers,
+	x11-drivers/xf86-video-virtualbox,
+	x11-themes/equinox-themes,
+	x11-themes/gtk-engines:2
+
+# x11-themes/sabayon-artwork-gnome:
+# provides the gtk theme for lxdm
+
+# Custom shell call to packages add (default is: equo install)
+# custom_packages_add_cmd: 
+
+# Custom command for updating repositories (default is: equo update)
+# repositories_update_cmd:
+
+# Determine whether repositories update should be run (if packages_to_add is set)
+# (default is: no), values are: yes, no.
+execute_repositories_update: no
+
+# Directories to remove completely (comma separated)
+# paths_to_remove:
+
+# Directories to empty (comma separated)
+# paths_to_empty:
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 0ad419a..71240a4 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -286,6 +286,18 @@ prepare_lxde() {
 	has_proprietary_drivers && setup_proprietary_gfx_drivers || setup_oss_gfx_drivers
 }
 
+prepare_mate() {
+        setup_networkmanager
+        # Fix ~/.dmrc to have it load LXDE
+        echo "[Desktop]" > /etc/skel/.dmrc
+        echo "Session=MATE" >> /etc/skel/.dmrc
+        remove_desktop_files
+        setup_displaymanager
+        remove_mozilla_skel_cruft
+        setup_cpufrequtils
+        has_proprietary_drivers && setup_proprietary_gfx_drivers || setup_oss_gfx_drivers	
+}
+
 prepare_e17() {
 	setup_networkmanager
 	# Fix ~/.dmrc to have it load E17
@@ -390,6 +402,8 @@ prepare_system() {
 	local de="${1}"
 	if [ "${de}" = "lxde" ]; then
 		prepare_lxde
+        elif [ "${de}" = "mate" ]; then
+                prepare_mate
 	elif [ "${de}" = "e17" ]; then
 		prepare_e17
 	elif [ "${de}" = "xfce" ]; then