--- archivemail-0.9.0.ebuild	2014-09-24 15:42:40.718911125 +0800
+++ archivemail-0.9.0.ebuild	2015-03-06 07:18:26.377481482 +0800
@@ -1,11 +1,13 @@ 
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/archivemail-0.9.0.ebuild,v 1.6 2014/08/10 20:43:13 slyfox Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
+EAPI=5
 
-inherit distutils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
 
 DESCRIPTION="Tool written in Python for archiving and compressing old email in mailboxes"
 HOMEPAGE="http://archivemail.sourceforge.net/"
@@ -13,30 +15,23 @@ 
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 sparc x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
 DOCS="examples/* FAQ"
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	distutils_src_prepare
+python_prepare_all() {
 	# Fix tests for python-2.7
 	sed -i -e 's:\(fp_archive = \)FixedGzipFile:\1gzip.GzipFile:' \
 		test_archivemail || die "sed failed"
+	distutils-r1_python_prepare_all
 }
 
-src_test() {
+python_test() {
 	echo ">>> Test phase: ${CATEGORY}/${PF}"
 	"${S}"/test_archivemail || die "test_archivemail failed"
 }
-
-src_install() {
-	distutils_src_install --install-data=/usr/share
-	mv "${D}/usr/share/share/man" "${D}/usr/share/" && \
-		rm -rf "${D}/usr/share/share" || die
-}