--- media-gfx/inkscape/inkscape-0.48.4.ebuild
+++ media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
@@ -4,12 +4,11 @@
 
 EAPI=5
 
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
-
 GCONF_DEBUG=no
 
-inherit autotools eutils flag-o-matic gnome2 python toolchain-funcs
+PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_REQ_USE="xml"
+inherit autotools eutils flag-o-matic python-single-r1 gnome2 toolchain-funcs
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${MY_P}"
@@ -20,12 +19,13 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="dia gnome postscript inkjar lcms nls spell wmf"
 
 RESTRICT="test"
 
 COMMON_DEPEND="
+	${PYTHON_DEPS}
 	>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers(+)]
 	dev-cpp/glibmm
 	>=dev-cpp/gtkmm-2.18.0:2.4
@@ -35,11 +35,11 @@
 	>=dev-libs/libxml2-2.6.20
 	>=dev-libs/libxslt-1.0.15
 	dev-libs/popt
-	dev-python/lxml
+	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/imagemagick[cxx]
 	media-libs/fontconfig
 	media-libs/freetype:2
-	>=media-libs/libpng-1.2
+	media-libs/libpng:0
 	app-text/libwpd:0.9
 	app-text/libwpg:0.2
 	sci-libs/gsl
@@ -59,7 +59,7 @@
 # on that.
 RDEPEND="
 	${COMMON_DEPEND}
-	dev-python/numpy
+	dev-python/numpy[${PYTHON_USEDEP}]
 	media-gfx/uniconvertor
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
@@ -78,13 +78,18 @@
 	epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \
 		"${FILESDIR}"/${PN}-0.48.2-libwpg.patch \
 		"${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
-		"${FILESDIR}"/${P}-python2.patch \
-		"${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch
+		"${FILESDIR}"/${PN}-0.48.4-epython.patch \
+		"${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch \
+		"${FILESDIR}"/${PN}-0.48.4-automake-1.3.patch
+
+	sed -i \
+		-e "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
 
 	eautoreconf
 
 	# bug 421111
-	python_convert_shebangs -r 2 share/extensions
+	python_fix_shebang share/extensions
 }
 
 src_configure() {
@@ -106,3 +111,8 @@
 src_compile() {
 	emake AR="$(tc-getAR)"
 }
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}