Fix boost detection, thanks to Sebastian Mingramm in bug 295474. Remove previous version. 0.14.8-r1 is next stable candidate.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 21 insertions, 68 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 588a86801bf2..5143f2b7266b 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/rb_libtorrent
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.75 2010/01/11 18:40:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.76 2010/01/14 12:27:02 yngwin Exp $
+
+*rb_libtorrent-0.14.8-r1 (14 Jan 2010)
+
+  14 Jan 2010; Ben de Groot <yngwin@gentoo.org>
+  -rb_libtorrent-0.14.7.ebuild, -rb_libtorrent-0.14.8.ebuild,
+  +rb_libtorrent-0.14.8-r1.ebuild:
+  Fix boost detection, thanks to Sebastian Mingramm in bug 295474. Remove
+  previous version. 0.14.8-r1 is next stable candidate.
 
 *rb_libtorrent-0.14.8 (11 Jan 2010)
 
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.7.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.7.ebuild
deleted file mode 100644
index 5007e676238a..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 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.14.7.ebuild,v 1.4 2010/01/09 20:36:44 armin76 Exp $
-
-EAPI="2"
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/rb_/}
-MY_P=${MY_P/torrent/torrent-rasterbar}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
-SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug doc examples python test"
-RESTRICT="test"
-
-DEPEND="|| ( >=dev-libs/boost-1.35
-		( ~dev-libs/boost-1.34.1 dev-cpp/asio ) )
-	python? ( >=dev-libs/boost-1.35.0-r5[python] dev-lang/python:2.6[threads] )
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.14.6-configure-ldflags-fix.patch  #290756
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -pthread
-
-	#use multi-threading versions of boost libs
-	local BOOST_LIBS="--with-boost-system=boost_system-mt \
-		--with-boost-asio=boost_system-mt \
-		--with-boost-filesystem=boost_filesystem-mt \
-		--with-boost-thread=boost_thread-mt \
-		--with-boost-regex=boost_regex-mt \
-		--with-boost-python=boost_python-mt \
-		--with-boost-program_options=boost_program_options-mt"
-
-	local LOGGING
-	use debug && LOGGING="--with-logging=verbose"
-
-	econf $(use_enable debug) \
-		$(use_enable test tests) \
-		$(use_enable examples) \
-		$(use_enable python python-binding) \
-		--with-zlib=system \
-		--with-asio=system \
-		${LOGGING} \
-		${BOOST_LIBS}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die 'emake install failed'
-	dodoc ChangeLog AUTHORS NEWS README || die 'dodoc failed'
-	if use doc ; then
-		dohtml docs/* || die "Could not install HTML documentation"
-	fi
-}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.8.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r1.ebuild
index cfcdae56c82d..76136a9aeabe 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.8.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 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.14.8.ebuild,v 1.1 2010/01/11 18:40:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r1.ebuild,v 1.1 2010/01/14 12:27:02 yngwin Exp $
 
 EAPI="2"
-inherit autotools eutils flag-o-matic
+inherit autotools eutils flag-o-matic versionator
 
 MY_P=${P/rb_/}
 MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -33,7 +33,7 @@ src_prepare() {
 src_configure() {
 	append-ldflags -pthread
 
-	#use multi-threading versions of boost libs
+	# use multi-threading versions of boost libs
 	local BOOST_LIBS="--with-boost-system=boost_system-mt \
 		--with-boost-asio=boost_system-mt \
 		--with-boost-filesystem=boost_filesystem-mt \
@@ -42,6 +42,13 @@ src_configure() {
 		--with-boost-python=boost_python-mt \
 		--with-boost-program_options=boost_program_options-mt"
 
+	# detect boost version and location, bug 295474
+	BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	BOOST_INC="/usr/include/boost-${BOOST_VER}"
+	BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}"
+
 	local LOGGING
 	use debug && LOGGING="--with-logging=verbose"
 
@@ -52,6 +59,8 @@ src_configure() {
 		--with-zlib=system \
 		--with-asio=system \
 		${LOGGING} \
+		--with-boost=${BOOST_INC} \
+		--with-boost-libdir=${BOOST_LIB} \
 		${BOOST_LIBS}
 }