--- x11-wm/openbox/openbox-3.5.2.ebuild
+++ x11-wm/openbox/openbox-3.5.2-r1.ebuild
@@ -3,7 +3,9 @@
 # $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.2.ebuild,v 1.1 2013/08/14 18:05:31 hwoarang Exp $
 
 EAPI="5"
-inherit multilib autotools python eutils
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit multilib autotools python-r1 eutils
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/"
@@ -13,19 +15,25 @@
 LICENSE="GPL-2"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="branding debug imlib nls python session startup-notification static-libs"
+IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/glib:2
 	>=dev-libs/libxml2-2.0
-	python? ( dev-python/pyxdg )
 	>=media-libs/fontconfig-2
 	x11-libs/libXft
+	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXt
 	>=x11-libs/pango-1.8[X]
 	imlib? ( media-libs/imlib2 )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	x11-libs/libXinerama"
+	svg? ( gnome-base/librsvg:2 )
+	xdg? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	)
+	"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -34,7 +42,7 @@
 	x11-proto/xineramaproto"
 
 src_prepare() {
-	use python && python_convert_shebangs -r 2 .
+	use xdg && python_export_best
 	epatch "${FILESDIR}"/${P}-gnome-session.patch
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
@@ -47,13 +55,13 @@
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-silent-rules \
 		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
 		$(use_enable imlib imlib2) \
-		$(use_enable nls) \
+		$(use_enable svg librsvg) \
 		$(use_enable startup-notification) \
 		$(use_enable session session-management) \
-		$(use_enable static-libs static) \
 		--with-x
 }
 
@@ -67,10 +75,14 @@
 		doins -r "${WORKDIR}"/Surreal_Gentoo
 		# make it the default theme
 		sed -i \
-			"/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
 			"${D}"/etc/xdg/openbox/rc.xml \
 			|| die "failed to set Surreal Gentoo as the default theme"
 	fi
-	! use static-libs && rm "${ED}"/usr/$(get_libdir)/lib{obt,obrender}.la
-	! use python && rm "${ED}"/usr/libexec/openbox-xdg-autostart
+	use static-libs || prune_libtool_files --all
+	if use xdg ; then
+		python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart
+	else
+		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
+	fi
 }