--- yum-3.2.27.ebuild
+++ yum-3.2.27.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-3.2.27.ebuild,v 1.1 2010/03/19 13:20:39 deathwing00 Exp $
 
-EAPI=2
-NEED_PYTHON=1
-inherit python eutils multilib
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite"
+
+inherit eutils python
 
 DESCRIPTION="automatic updater and package installer/remover for rpm systems"
 HOMEPAGE="http://yum.baseurl.org/"
@@ -15,27 +17,27 @@
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/python-2.5[sqlite]
-	app-arch/rpm[python]
+RDEPEND="app-arch/rpm[python]
 	dev-python/sqlitecachec
 	dev-python/celementtree
 	dev-libs/libxml2[python]
 	dev-python/urlgrabber"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_install() {
-	python_version
 	emake install DESTDIR="${D}" || die
-	rm -r "${D}"/etc/rc.d || die
-	find "${D}" -name '*.py[co]' -print0 | xargs -0 rm -f
+	rm -r "${ED}etc/rc.d" || die
+	find "${ED}" -name '*.py[co]' -print0 | xargs -0 rm -f
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize \
-		/usr/$(get_libdir)/python${PYVER}/site-packages/{yum,rpmUtils} \
-		/usr/share/yum-cli
+	python_mod_optimize yum rpmUtils /usr/share/yum-cli
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/{yum,rpmUtils} /usr/share/yum-cli
+	python_mod_cleanup yum rpmUtils /usr/share/yum-cli
 }