--- /usr/portage/local/my/media-gfx/picasa/picasa-3.0.5719.02.ebuild.orig	2008-10-08 18:08:29.314116235 -0400
+++ /usr/portage/local/my/media-gfx/picasa/picasa-3.0.5719.02.ebuild	2008-10-08 18:49:13.798866325 -0400
@@ -50,6 +50,9 @@
 	dodir /opt/google/picasa/3.0
 	mv bin wine "${D}/opt/google/picasa/3.0/"
 
+	dodir /opt/google/picasa/3.0/desktop
+	mv desktop/picasa32x32.xpm "${D}/opt/google/picasa/3.0/desktop/"
+
 	dodir /usr/bin
 	for i in picasa picasafontcfg mediadetector showpicasascreensaver; do
 		dosym /opt/google/picasa/3.0/bin/${i} /usr/bin/${i}
@@ -59,16 +62,14 @@
 
 	cd desktop
 
-	mv google-picasa-mediadetector.desktop.template google-picasa-mediadetector.desktop
-	mv google-picasa.desktop.template google-picasa.desktop
-	mv google-picasa-fontcfg.desktop.template google-picasa-fontcfg.desktop
-
-	sed -i -e "s:EXEC:mediadetector:" google-picasa-mediadetector.desktop
-	sed -i -e "s:EXEC:picasa:" google-picasa.desktop
-	sed -i -e "s:ICON:picasa.xpm:" google-picasa{,-mediadetector}.desktop
-	sed -i -e "s:EXEC:picasafontcfg:" google-picasa-fontcfg.desktop
-	sed -i -e "s:ICON:picasa-fontcfg.xpm:" google-picasa-fontcfg.desktop
+	mv picasa.desktop.template picasa.desktop
+	mv picasa-fontcfg.desktop.template picasa-fontcfg.desktop
+
+	sed -i -e "s:EXEC:picasa:" picasa.desktop
+	sed -i -e "s:ICON:picasa.xpm:" picasa.desktop
+	sed -i -e "s:EXEC:picasafontcfg:" picasa-fontcfg.desktop
+	sed -i -e "s:ICON:picasa-fontcfg.xpm:" picasa-fontcfg.desktop
 
-	doicon picasa.xpm picasa-fontcfg.xpm
-	domenu {google-picasa{,-mediadetector,-fontcfg},picasascr}.desktop
+	doicon picasa{,-fontcfg}.xpm
+	domenu {picasa{,-fontcfg,-kdehal},picasascr}.desktop
 }