--- media-sound/soundconverter/soundconverter-2.0.4.ebuild
+++ media-sound/soundconverter/soundconverter-2.0.4-r1.ebuild
@@ -2,12 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-2.0.4.ebuild,v 1.3 2013/02/25 12:18:29 ago Exp $
 
-EAPI=4
+# TODO: convert
+#	dev-python/gconf-python
+#	dev-python/gnome-vfs-python
+#	dev-python/libgnome-python
+
+EAPI=5
 
 GCONF_DEBUG=no
-PYTHON_DEPEND="2:2.7"
-
-inherit gnome2 multilib python
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2 multilib python-single-r1
 
 DESCRIPTION="A simple audiofile converter application for the GNOME environment"
 HOMEPAGE="http://soundconverter.org/"
@@ -17,12 +21,14 @@
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="aac flac mp3 opus vorbis"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="dev-python/gconf-python
+RDEPEND="${PYTHON_DEPS}
+	dev-python/gconf-python
 	dev-python/gnome-vfs-python
-	=dev-python/gst-python-0.10*
-	dev-python/pygobject:2
-	>=dev-python/pygtk-2.12
+	=dev-python/gst-python-0.10*[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
 	dev-python/libgnome-python
 	gnome-base/libglade
 	aac? (
@@ -48,24 +54,15 @@
 	virtual/pkgconfig
 	sys-devel/gettext"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	python_set_active_version 2
-	python_pkg_setup
-}
+DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 src_prepare() {
 	>py-compile
-	python_convert_shebangs -r 2 .
+	python_fix_shebang .
 	gnome2_src_prepare
 }
 
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-	gnome2_pkg_postinst
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
 }
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-	gnome2_pkg_postrm
-}