--- screenlets-0.1.2.ebuild	2011-04-12 05:57:58.000000000 +0200
+++ screenlets-0.1.2.ebuild	2013-01-17 17:30:41.469982956 +0100
@@ -2,7 +2,7 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-plugins/screenlets/screenlets-0.1.2.ebuild,v 1.2 2011/04/11 20:52:51 arfrever Exp $
 
-EAPI=3
+EAPI=5
 PYTHON_DEPEND="2"
 
 inherit distutils eutils
@@ -24,8 +24,6 @@ 
 	x11-libs/libnotify
 	x11-misc/xdg-utils"
 
-S="${WORKDIR}/${PN}"
-
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
@@ -34,18 +32,16 @@ 
 src_prepare() {
 	distutils_src_prepare
 	python_convert_shebangs -r 2 src
-	sed -e "s/exec python/&2/" -i src/bin/* || die "sed failed"
+	sed -i $(find src/ -type f) -e 's|exec python|&2|g;s|python -u|python2 -u|g' || die
+	sed -i desktop-menu/screenlets-{daemon,manager}.desktop -e 's|> .*||g' || die
 }
 
 src_install() {
 	distutils_src_install
 
-	insinto /usr/share/desktop-directories
-	doins desktop-menu/desktop-directories/Screenlets.directory || die "doins failed"
-
 	insinto /usr/share/icons
-	doins desktop-menu/screenlets.svg || die "doins failed"
+	doins desktop-menu/screenlets.svg
 
 	# Insert .desktop files
-	domenu desktop-menu/*.desktop || die "domenu failed"
+	domenu desktop-menu/*.desktop
 }