--- gtklp-1.2.7.ebuild	2009-10-08 11:05:45.208244585 +1100
+++ gtklp-1.2.7-r1.ebuild	2009-10-08 11:05:32.240281146 +1100
@@ -9,7 +9,7 @@
 DESCRIPTION="A GUI for cupsd"
 HOMEPAGE="http://gtklp.sourceforge.net"
 SRC_URI="mirror://sourceforge/gtklp/${P}.src.tar.gz
-	mirror://gentoo/gtklp-logo.png.gz"
+	mirror://sourceforge/gtklp/logo.xpm.gz -> gtklp-logo.xpm.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -40,8 +40,7 @@
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS BUGS ChangeLog README TODO USAGE || die
 
-	mv gtklp/{logo,gtklp-logo}.xpm
-	doicon gtklp/gtklp-logo.xpm
-	make_desktop_entry 'gtklp -i' "print files via CUPS" gtklp-logo 'System;Printing'
+	doicon ${WORKDIR}/gtklp-logo.xpm
+	make_desktop_entry 'gtklp -i' "Print files via CUPS" gtklp-logo 'System;Printing'
 	make_desktop_entry gtklpq "CUPS queue manager" gtklp-logo 'System;Printing'
 }