--- file-5.12-r1.ebuild	2013-02-09 07:52:20.000000000 +0100
+++ file-5.12-r2.ebuild	2013-03-02 18:06:16.200741930 +0100
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild,v 1.1 2013/02/09 06:52:20 vapier Exp $
 
-EAPI="2"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
+EAPI=5
 
-inherit eutils distutils libtool toolchain-funcs
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+DISTUTILS_OPTIONAL=1
+
+inherit eutils distutils-r1 libtool toolchain-funcs
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -20,11 +20,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="python static-libs zlib"
 
-RDEPEND="zlib? ( sys-libs/zlib )"
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}"
 
-PYTHON_MODNAME="magic.py"
-
 src_prepare() {
 	epatch "${WORKDIR}"/${P}-magic-updates-4d53f0549fb40b179eaee53c63c42e1685e4ebab.patch
 
@@ -77,21 +76,13 @@ src_compile() {
 	fi
 	do_make
 
-	use python && cd python && distutils_src_compile
+	use python && cd python && distutils-r1_src_compile
 }
 
 src_install() {
 	do_make DESTDIR="${D}" install || die
 	dodoc ChangeLog MAINT README
 
-	use python && cd python && distutils_src_install
+	use python && cd python && distutils-r1_src_install
 	use static-libs || rm -f "${D}"/usr/lib*/libmagic.la
 }
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}