--- crosstex-0.6.ebuild
+++ crosstex-0.6.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-tex/crosstex/crosstex-0.6.ebuild,v 1.1 2008/08/07 22:41:27 aballier Exp $
 
-inherit python
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit multilib python
 
 DESCRIPTION="CrossTeX - object oriented BibTeX replacement"
 HOMEPAGE="http://www.cs.cornell.edu/people/egs/crosstex/"
@@ -13,19 +16,23 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-RDEPEND="dev-lang/python
-	dev-python/ply"
+RDEPEND="dev-python/ply"
 DEPEND="${RDEPEND}"
 
-src_install() {
-	python_version
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
-	cd "${S}"
+src_install() {
 	emake \
 		ROOT="${D}" \
 		PREFIX="/usr" \
-		LIBDIR="/$(get_libdir)/python${PYVER}/site-packages" \
-		install || die "make install failed"
+		LIBDIR="/$(get_libdir)/python$(python_get_version)/site-packages" \
+		install || die "emake install failed"
+
+	python_convert_shebangs -r $(python_get_version) "${D}"
+	python_need_rebuild
 
 	insinto /usr/share/doc/${PF}
 	doins "${PN}".pdf
@@ -36,10 +43,9 @@
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize	/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	python_mod_optimize ${PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup ${PN}
 }