diff -ur fvwm-crystal.orig/fvwm-crystal-3.0.6-r1.ebuild fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild
--- fvwm-crystal.orig/fvwm-crystal-3.0.6-r1.ebuild	2011-11-25 23:36:29.286998118 +0800
+++ fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild	2011-11-25 23:41:15.053997987 +0800
@@ -1,20 +1,22 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild,v 1.4 2011/09/27 13:52:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild,v 1.5 2011/11/11 17:07:35 ssuominen Exp $
 
-EAPI="2"
-
-inherit eutils
+EAPI=4
+PYTHON_DEPEND="2"
+inherit eutils python
 
 DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency"
 HOMEPAGE="http://gna.org/projects/fvwm-crystal/"
 SRC_URI="http://download.gna.org/${PN}/${PV}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
-RDEPEND=">=x11-wm/fvwm-2.5.13[png]
-	dev-lang/python
+DOCS="doc/*"
+
+RDEPEND=">=x11-wm/fvwm-2.6.2[png]
 	media-gfx/imagemagick
 	|| ( x11-misc/stalonetray x11-misc/trayer )
 	|| ( x11-misc/habak x11-misc/hsetroot )
@@ -23,22 +25,23 @@
 
 src_prepare() {
 	find . -type d -name '.svn' -prune -exec rm -rf {} ';' || die
-	epatch "${FILESDIR}/fvwm-crystal.apps.patch"
+	epatch "${FILESDIR}"/fvwm-crystal.apps.patch
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	einstall
 
-	dodoc AUTHORS README INSTALL NEWS ChangeLog doc/* || die
+	dodoc ${DOCS}
 
 	docinto examples
-	dodoc addons/* || die
+	dodoc addons/*
 
 	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/fvwm-crystal || die
+	doexe "${FILESDIR}"/fvwm-crystal
 
 	insinto /usr/share/xsessions
-	doins addons/fvwm-crystal.desktop || die
+	doins addons/fvwm-crystal.desktop
+	python_convert_shebangs 2 "${ED}"usr/share/${PN}/fvwm/scripts/FvwmMPD/*.py
 }
 
 pkg_postinst() {