some slight updates to sabayonlive

git-svn-id: http://svn.sabayonlinux.org/overlay@2093 d7aec97c-591d-0410-af39-a8856400b30a

app-misc/sabayonlive-tools/Manifest

@@ -2,9 +2,9 @@ AUX 1.7.3/bashlogin 133 RMD160 5c2aae2522427c3ff1d9260764b0ed20cd1a0909 SHA1 a57
 AUX 1.7.3/livecd-functions.sh 17609 RMD160 d8c04a34fd18f5b5abebcd2f76f7fc93fee2e53c SHA1 1af8738cabfb08e6414b5c064481a893e7f14b07 SHA256 fff774d8ad984d35026c872e56c8b76f6db4a16a369659f519cc94312d1c00bc
 AUX 1.7.3/net-setup 1525 RMD160 bc9ecc263f7547a16efa7acc279d186fc56925d7 SHA1 718a7f8f5a5912e32a41701c6a90caf94bbe3027 SHA256 2356972db6ed044e74c4fc91cc7ef19f678aac3cf149f48fcde88922d7531468
 AUX 1.7.3/opengl-activator 9886 RMD160 757e7689224332cffb96a16dc902d96f88612c16 SHA1 c4a3190f62f3d81546f27b4e81bf8bb73842c1d3 SHA256 61c2c230f4ab9092cbd222f090c288029e3215029b26a81b9bd04397650828c7
-AUX 1.7.3/sabayonlive 34353 RMD160 afa97df044bd3eb0cdb03592fddcd20db0f3e53d SHA1 0ac9ca957e604986c0ba31e5dab279766442b166 SHA256 84363cfa7de114dea4ac05b59b3a9a2cc1bb825fe958cf5aa077a45776ef06c6
+AUX 1.7.3/sabayonlive 35690 RMD160 39da94594d385789eb292b06c0a59133aa17b2e9 SHA1 68b5ce2be172f369b62d175b09a5e14af17c6fb5 SHA256 1cfc752b656e9b07d081d2c8d2907df14cdf96cba680c0dff0607506c673aead
 AUX 1.7.3/vga-cmd-parser 1382 RMD160 75a4ba47833ec376fa91938c9553e68c058629da SHA1 3976899be5f88ee5e072d06e551252026ac36a3a SHA256 9b4faeac836b52a0a6550a48babeed40c00ea2cad7674bb1ad037c04791a7ebc
 AUX 1.7.3/x-setup-configuration 12298 RMD160 6492da4dbb9ca14bad636266a2bd14590b9f2110 SHA1 fb71d93b6e447b4f1bc0df6d7dd1a4f2eeebbad3 SHA256 8ca0f8f80e0c6f46e403a1317076a51634c596f80964cfd702a9531bdce7f6ca
 AUX 1.7.3/x-setup-init.d 1330 RMD160 09c155ffe3aa9a65760bdef8cece2737ccc9c6c3 SHA1 11982feb8b32cd30ac972767f0c8094220e5c1c6 SHA256 bfbbdafc69b24274791bd412d223f8bc2c443cf942cfd3b989bc23916f9833ad
 AUX 1.7.3/xorg.conf 3585 RMD160 22844b7acc67f0b8ba46931eebebd09ddfef0321 SHA1 733cc7a6e4a2e37d5623d38bc3e416169b698550 SHA256 0ff697fd6120936ba6700f46e71811331580f1ac718daa997ee29a46bcafb17d
-EBUILD sabayonlive-tools-1.7.3-r3.ebuild 1203 RMD160 33764b79820724e9dc8db764bdbead3315946975 SHA1 92f5cb4fd71f4f0fafdb532edf4e4013c724b146 SHA256 7ca04a6ce89ad93738bacd5a66b4a6495524daf7590ca1d3f1d83bbbcef39991
+EBUILD sabayonlive-tools-1.7.3-r4.ebuild 1203 RMD160 33764b79820724e9dc8db764bdbead3315946975 SHA1 92f5cb4fd71f4f0fafdb532edf4e4013c724b146 SHA256 7ca04a6ce89ad93738bacd5a66b4a6495524daf7590ca1d3f1d83bbbcef39991

app-misc/sabayonlive-tools/files/1.7.3/sabayonlive

@@ -99,6 +99,7 @@ start() {
 	rm -f /usr/share/autostart/kerry.autostart.desktop
 	rm -f /usr/share/autostart/kbluetooth.autostart.desktop
 	rm -f /usr/share/autostart/beagled.desktop
+	rm -f /usr/share/autostart/etp-applet.desktop
 
         # Remove broken entries in /etc/mtab
         sed -i '/.*newroot.*/d' /etc/mtab
@@ -293,6 +294,18 @@ start() {
                         #AutoLoginUser=sabayonuser
                         sed -i 's/AutoLoginUser=.*/AutoLoginUser=sabayonuser/' /usr/kde/3.5/share/config/kdm/kdmrc
 	
+                    ;;
+                    session=xfce)
+
+                        # change default DE to XFCE
+                        echo "[Desktop]" > /home/sabayonuser/.dmrc
+                        echo "Session=xfce" >> /home/sabayonuser/.dmrc
+                        chown sabayonuser /home/sabayonuser/.dmrc
+                        #AutoLoginEnable=true
+                        sed -i 's/AutoLoginEnable=false/AutoLoginEnable=true/' /usr/kde/3.5/share/config/kdm/kdmrc
+                        #AutoLoginUser=sabayonuser
+                        sed -i 's/AutoLoginUser=.*/AutoLoginUser=sabayonuser/' /usr/kde/3.5/share/config/kdm/kdmrc
+
                     ;;
                     session=gnome)
 
@@ -950,6 +963,30 @@ if mydev.startswith("/dev") and os.path.isfile(sh_file):
 
         fi
 
+	# Dirty workaround for kde4 apps in !=kde4 DEs
+	python -c '
+import os
+kde4_de_dir = "/usr/kde/4.0/share/applications/kde4"
+kde4_de_files = os.listdir(kde4_de_dir)
+for kde4file in kde4_de_files:
+	kde4file = kde4_de_dir+"/"+kde4file
+	f = open(kde4file,"r")
+	k4content = f.readlines()
+	f.close()
+	f = open(kde4file,"w")
+	for line in k4content:
+		if line.startswith("Exec="):
+			line = line.replace("Exec=","Exec=/usr/kde/3.9/bin/")
+		if line.startswith("Name="):
+			line = line.strip()
+			line += " KDE 4\n"
+		f.write(line)
+	f.flush()
+	f.close()
+'
+	# Add sudo to gparted exec=
+	sed -i 's/Exec=/Exec=sudo /' /home/sabayonuser/Desktop/gparted.desktop
+
 	# Start Accel Manager or Configure XGL/AIGLX
 	start_acceleration_manager