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

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 23 insertions, 72 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/Manifest b/net-libs/rb_libtorrent/Manifest
index 32031754f3e5..077203d34760 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,9 +1,7 @@
 AUX 0.14.6-configure-ldflags-fix.patch 364 RMD160 e637a5c5116892fc7b27d5245abb913c876d2781 SHA1 ef62a4a94119d219c1c93a61c449dafe9c550ecb SHA256 38582ae08e589848fd09cefe5295da74abc3a296c1f6954037caf4a6deef8933
 DIST libtorrent-rasterbar-0.14.6.tar.gz 1995813 RMD160 454bb4550e1c8b782017214375c15add42c23a39 SHA1 2e3829a8c266c5a4ecd2d31bac223a1a60d644b9 SHA256 98540fe765163e6f22d53462694aee4e4213606179974470ebe1d8adc02b5f56
-DIST libtorrent-rasterbar-0.14.7.tar.gz 1938654 RMD160 54e0f756f9b8d9a55f4c004292089c8171d5eb36 SHA1 a7765748b6bb9385eb65185702244418dab9098b SHA256 1ff89795c8433dfd9ba94d45f21048abcb73cf9f8b56eff9bdf34b5e3b41694b
 DIST libtorrent-rasterbar-0.14.8.tar.gz 2000424 RMD160 5aefdd9aa072eb4b4b61149330f25d73254e607e SHA1 4eaaec1dd33924955c7f2c1209abab8aa81defd8 SHA256 1d9f00133ebd0d082308f1a92a59eafc0d718e3aeb3dadac10f1e1d3d2e01600
 EBUILD rb_libtorrent-0.14.6.ebuild 1911 RMD160 99e33437d348984bb1d0533b8fcff51ddadf48db SHA1 fe6e2b0b9e8f5f13572cd199efa8f398a2eb82ac SHA256 27401568d0211873dc2f3aaa2703ab65e5053bb0abb09740f8ad9a97d92899bd
-EBUILD rb_libtorrent-0.14.7.ebuild 1873 RMD160 1435d5b6efbfac4de2dcdf3756804d3a54db2ece SHA1 445fb47847cbbcdf24a623eb9cb868479a11070a SHA256 99adf422c9e8e5e67f95815967208c720b392b9a648681ae09620b77822505ee
-EBUILD rb_libtorrent-0.14.8.ebuild 1880 RMD160 3d04038c908b7a0e3b456555839528aff954f50f SHA1 4cc956a363a25feb048a405c8312586b30a17d4e SHA256 fd89708cfed6ad82f4b7de04cda8081b45a522ac95a526bed9bbb5460b772381
-MISC ChangeLog 12660 RMD160 4496f5661b2f9abc3f7b3145de507f14d027ab28 SHA1 e8db55dada57c309e94ae48de7160d4ad3e7be69 SHA256 e09b9b24fccd8b78e090ec455f82a097f4353820e1311eece52b2138c357cf66
+EBUILD rb_libtorrent-0.14.8-r1.ebuild 2299 RMD160 0edee9bb846dee26c9ad57a75cb5f070a04a5ffe SHA1 a65181883df177a8c942e17d337e1bc13b8fe620 SHA256 78495e7c0319f2d513b9698acd4d059eac1b664d8545c09047c1a4d5142c329b
+MISC ChangeLog 12975 RMD160 e38ee7eb17bef9c8534edbf8757993723b4344d7 SHA1 5b61ba70ebf6852a8d357820a298cf0e5e32920f SHA256 1eb28ef5fa974974de1aaa79ab2a47460bb848a564dfcfe1e10fda959a4b63fc
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
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}
 }