--- dir2ogg.orig/dir2ogg-0.11.8-r1.ebuild	2011-11-28 23:13:43.028968342 +0800
+++ dir2ogg.orig/dir2ogg-0.11.8-r1.ebuild	2011-11-28 23:24:11.049968162 +0800
@@ -2,9 +2,9 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild,v 1.1 2010/10/10 06:04:30 radhermit Exp $
 
-EAPI=2
-inherit versionator
-
+EAPI=4
+inherit versionator python
+PYTHON_DEPEND="2:2.5"
 MY_PR=$(get_version_component_range 1-2)
 
 DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format."
@@ -16,8 +16,7 @@ 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="aac cdparanoia flac mac mp3 musepack wavpack wma"
 
-RDEPEND=">=dev-lang/python-2.5
-	dev-python/pyid3lib
+RDEPEND="dev-python/pyid3lib
 	media-sound/vorbis-tools[ogg123]
 	>=media-libs/mutagen-1.11
 	aac? ( || ( media-libs/faad2
@@ -38,8 +37,15 @@ 
 	wma? ( media-video/mplayer )"
 DEPEND=""
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_install() {
-	dobin dir2ogg || die
+	dobin dir2ogg
 	doman dir2ogg.1
 	dodoc NEWS README
+
+	python_convert_shebangs 2 "${ED}"/usr/bin/dir2ogg
 }