libtorrent: build fix, removed multilib support

1 files changed, 11 insertions, 28 deletions

diff --git a/net-libs/libtorrent/libtorrent-scm.ebuild b/net-libs/libtorrent/libtorrent-scm.ebuild
index a877d7c..9790ebb 100644
--- a/net-libs/libtorrent/libtorrent-scm.ebuild
+++ b/net-libs/libtorrent/libtorrent-scm.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.12.4.ebuild,v 1.6 2009/03/06 00:11:38 jer Exp $
+
 EAPI=5
 
-inherit base eutils toolchain-funcs flag-o-matic libtool git-2 multilib multilib-minimal
+inherit eutils toolchain-funcs libtool git-2
 
-DESCRIPTION="LibTorrent is a BitTorrent library written in C++ for *nix."
-HOMEPAGE="http://libtorrent.rakshasa.no/"
+DESCRIPTION="BitTorrent library written in C++ for *nix"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
@@ -23,14 +23,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/cppunit"
 
-#PATCHES=( "${FILESDIR}/${P}-gcc44.patch" )
-
-#src_unpack() {
-#	base_src_unpack
-#	git_src_unpack
-#	cd "${S}"
-#	 #Don't remove. Needed for *bsd.
-#}
 
 src_prepare() {
 	./autogen.sh
@@ -38,15 +30,9 @@ src_prepare() {
 	multilib_copy_sources
 }
 
-multilib_src_configure() {
-
-	replace-flags -Os -O2
+src_configure() {
 
-	if [[ $(tc-arch) = "x86" ]]; then
-		filter-flags -fomit-frame-pointer -fforce-addr
-	fi
-
-	econf \
+	CONFIG_SHELL=${BASH} econf \
 		$(use_enable debug) \
 		$(use_enable ipv6) \
 		$(use_enable c++0x) \
@@ -55,18 +41,15 @@ multilib_src_configure() {
 		--enable-aligned \
 		--enable-shared \
 		--disable-dependency-tracking \
+		--with-posix-fallocate \
 		|| die "econf failed"
 
 
 }
 
 
-multilib_src_compile() {
-
-	emake || die "emake failed"
-}
 
-multilib_src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS NEWS README
+src_install() {
+	default
+	prune_libtool_files --all
 }