libtorrent: use flags update, multilib support

1 files changed, 22 insertions, 8 deletions

diff --git a/net-libs/libtorrent/libtorrent-scm.ebuild b/net-libs/libtorrent/libtorrent-scm.ebuild
index 93ee86c..a877d7c 100644
--- a/net-libs/libtorrent/libtorrent-scm.ebuild
+++ b/net-libs/libtorrent/libtorrent-scm.ebuild
@@ -3,7 +3,7 @@
 # $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
+inherit base eutils toolchain-funcs flag-o-matic libtool git-2 multilib multilib-minimal
 
 DESCRIPTION="LibTorrent is a BitTorrent library written in C++ for *nix."
 HOMEPAGE="http://libtorrent.rakshasa.no/"
@@ -13,11 +13,12 @@ LICENSE="GPL-2"
 KEYWORDS=""
 
 EGIT_REPO_URI="git://github.com/rakshasa/libtorrent.git"
-EGIT_BOOTSTRAP="./autogen.sh"
 
-IUSE="debug ipv6"
+IUSE="debug ipv6 +c++0x +ssl static-libs"
 
-RDEPEND=">=dev-libs/libsigc++-2.2.2"
+RDEPEND=">=dev-libs/libsigc++-2.2.2
+	ssl? ( dev-libs/openssl )
+"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/cppunit"
@@ -31,9 +32,14 @@ DEPEND="${RDEPEND}
 #	 #Don't remove. Needed for *bsd.
 #}
 
-
-src_compile() {
+src_prepare() {
+	./autogen.sh
 	elibtoolize
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+
 	replace-flags -Os -O2
 
 	if [[ $(tc-arch) = "x86" ]]; then
@@ -43,16 +49,24 @@ src_compile() {
 	econf \
 		$(use_enable debug) \
 		$(use_enable ipv6) \
+		$(use_enable c++0x) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
 		--enable-aligned \
-		--enable-static \
 		--enable-shared \
 		--disable-dependency-tracking \
 		|| die "econf failed"
 
+
+}
+
+
+multilib_src_compile() {
+
 	emake || die "emake failed"
 }
 
-src_install() {
+multilib_src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS NEWS README
 }