--- nicotine+-1.2.16.ebuild	2015-03-12 14:31:10.238631542 +0800
+++ nicotine+-1.2.16-r1.ebuild	2015-03-12 15:18:47.610418755 +0800
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.16.ebuild,v 1.8 2015/02/18 19:08:02 rhill Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
+EAPI=5
 
-inherit distutils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
 
 DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
 HOMEPAGE="http://nicotine-plus.sourceforge.net"
@@ -13,33 +15,32 @@
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-python/pygtk-2.12
+RDEPEND=">=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
 	gnome-base/librsvg"
 
 DEPEND="${RDEPEND}"
 
-PYTHON_MODNAME="pynicotine"
 
 pkg_setup() {
-	python_set_active_version 2
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
+	distutils-r1_src_prepare
 	sed -i -e 's:\(Icon=\).*:\1nicotine-plus-32px:' \
 		"${S}"/files/nicotine.desktop
 }
 
 src_install() {
-	distutils_src_install
-	python_convert_shebangs -r 2 "${D}"
+	distutils-r1_src_install
+	python_fix_shebang "${D}"
 	dosym nicotine.py /usr/bin/nicotine
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
 	echo
 	elog "You may want to install these packages to add additional features"
 	elog "to Nicotine+:"