--- rb_libtorrent-0.16.17-r1.ebuild	2014-11-15 16:33:02.000000000 +0800
+++ rb_libtorrent-0.16.17-r2.ebuild	2015-03-03 11:23:27.342917455 +0800
@@ -1,13 +1,12 @@
-# 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-libs/rb_libtorrent/rb_libtorrent-0.16.17-r1.ebuild,v 1.1 2014/11/15 08:33:02 hwoarang Exp $
 
-EAPI="5"
-PYTHON_DEPEND="python? 2:2.7"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads"
 
-inherit multilib python versionator
+inherit multilib python-r1 versionator
 
 MY_P=${P/rb_/}
 MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -23,53 +22,58 @@
 IUSE="debug doc examples python ssl static-libs test"
 RESTRICT="test"
 
-DEPEND=">=dev-libs/boost-1.48:=[python?,threads(+)]
+DEPEND=">=dev-libs/boost-1.48:=[threads]
 	>=sys-devel/libtool-2.2
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
-	ssl? ( dev-libs/openssl )"
+	ssl? ( dev-libs/openssl )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost[python,${PYTHON_USEDEP}]
+	)"
 RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 src_prepare() {
-	use python && python_convert_shebangs -r 2 .
+	use python && python_copy_sources
 }
 
 src_configure() {
-	local myconf
-
-	# bug 441842
-	myconf="--disable-silent-rules"
-
-	# use multi-threading versions of boost libs
-	if has_version '>=dev-libs/boost-1.52.0-r1'; then
-		myconf+=" --with-boost-python=boost_python-${PYTHON_ABI}"
-	else
-		myconf+=" --with-boost-system=boost_system-mt \
-			--with-boost-python=boost_python-${PYTHON_ABI}-mt"
-	fi
+	local myconf=(
+		--disable-silent-rules # bug 441842
+		$(use_enable debug)
+		$(use_enable test tests)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		--with-boost-libdir=/usr/$(get_libdir)
+	)
+
+	use debug && myconf+=( --enable-logging=verbose )
+
+        econf "${myconf[@]}" --disable-python-binding
+
+        if use python; then
+                python_configure() {
+                        run_in_build_dir econf "${myconf[@]}" --enable-python-binding --with-boost-python=boost_python-${EPYTHON#python}
+                }
 
-	local LOGGING
-	use debug && myconf+=" --enable-logging=verbose"
-
-	econf $(use_enable debug) \
-		$(use_enable test tests) \
-		$(use_enable examples) \
-		$(use_enable python python-binding) \
-		$(use_enable ssl encryption) \
-		$(use_enable static-libs static) \
-		--with-boost-libdir=/usr/$(get_libdir) \
-		${myconf}
+                python_foreach_impl python_configure
+        fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
+
+	if use python; then
+		python_install() {
+			emake -C "${BUILD_DIR}"/bindings/python \
+				DESTDIR="${D}" install
+		}
+
+		python_foreach_impl python_install
+	fi
+
 	use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
 	dodoc ChangeLog AUTHORS NEWS README
 	if use doc; then