Prepare for PYTHON_ABI-versioned Boost Python libraries in Boost 1.48. Patch by Arfrever.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

6 files changed, 112 insertions, 18 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index a15c3f3a204c..b1e47ab60080 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/rb_libtorrent
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.116 2011/11/22 21:28:44 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.117 2012/01/28 20:00:21 floppym Exp $
+
+*rb_libtorrent-0.15.9-r1 (28 Jan 2012)
+
+  28 Jan 2012; Mike Gilbert <floppym@gentoo.org>
+  +rb_libtorrent-0.15.9-r1.ebuild, rb_libtorrent-0.15.5.ebuild,
+  rb_libtorrent-0.15.6.ebuild, rb_libtorrent-0.15.8.ebuild,
+  rb_libtorrent-0.15.9.ebuild:
+  Prepare for PYTHON_ABI-versioned Boost Python libraries in Boost 1.48. Patch
+  by Arfrever.
 
 *rb_libtorrent-0.15.9 (22 Nov 2011)
 
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild
index 7ca4d295b391..5485beb48aac 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild
@@ -1,9 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.15.5.ebuild,v 1.5 2011/03/23 19:29:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild,v 1.6 2012/01/28 20:00:21 floppym Exp $
 
 EAPI="2"
-inherit eutils versionator
+PYTHON_DEPEND="python? 2:2.6"
+PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
+
+inherit eutils python versionator
 
 MY_P=${P/rb_/}
 MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -19,10 +23,7 @@ KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="debug doc examples python ssl"
 RESTRICT="test"
 
-DEPEND=">=dev-libs/boost-1.36
-	python? ( >=dev-libs/boost-1.36[python]
-		|| ( dev-lang/python:2.6[threads]
-		dev-lang/python:2.7[threads] ) )
+DEPEND="<dev-libs/boost-1.48[python?]
 	>=sys-devel/libtool-2.2
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild
index e0341b4c149d..de7cc0dc2017 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.15.6.ebuild,v 1.5 2011/05/26 21:21:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild,v 1.6 2012/01/28 20:00:21 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.6"
 PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
 
 inherit eutils versionator python
 
@@ -22,7 +23,7 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug doc examples python ssl"
 RESTRICT="test"
 
-DEPEND=">=dev-libs/boost-1.36[python?]
+DEPEND="<dev-libs/boost-1.48[python?]
 	>=sys-devel/libtool-2.2
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.8.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.8.ebuild
index e36b56e87d5d..09b94e7369e8 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.8.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.8.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.15.8.ebuild,v 1.1 2011/09/30 12:27:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.8.ebuild,v 1.2 2012/01/28 20:00:21 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.6"
 PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
 
 inherit eutils versionator python
 
@@ -22,7 +23,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples python ssl static-libs"
 RESTRICT="test"
 
-DEPEND=">=dev-libs/boost-1.36[python?]
+DEPEND="<dev-libs/boost-1.48[python?]
 	>=sys-devel/libtool-2.2
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.9-r1.ebuild
new file mode 100644
index 000000000000..bfa296e4e5e2
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.9-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 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.15.9-r1.ebuild,v 1.1 2012/01/28 20:00:21 floppym Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.6"
+PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
+
+inherit multilib python versionator
+
+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="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples python ssl static-libs"
+RESTRICT="test"
+
+DEPEND=">=dev-libs/boost-1.48[python?]
+	>=sys-devel/libtool-2.2
+	sys-libs/zlib
+	examples? ( !net-p2p/mldonkey )
+	ssl? ( dev-libs/openssl )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	use python && python_convert_shebangs -r 2 .
+}
+
+src_configure() {
+	# use multi-threading versions of boost libs
+	local BOOST_LIBS="--with-boost-system=boost_system-mt \
+		--with-boost-filesystem=boost_filesystem-mt \
+		--with-boost-thread=boost_thread-mt \
+		--with-boost-python=boost_python-${PYTHON_ABI}-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="--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-zlib=system \
+		${LOGGING} \
+		--with-boost=${BOOST_INC} \
+		--with-boost-libdir=${BOOST_LIB} \
+		${BOOST_LIBS}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
+	dodoc ChangeLog AUTHORS NEWS README
+	if use doc; then
+		dohtml docs/*
+	fi
+}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild
index 3be6cdfa373b..54d049586e9d 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.15.9.ebuild,v 1.1 2011/11/22 21:28:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild,v 1.2 2012/01/28 20:00:21 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.6"
 PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
 
 inherit eutils versionator python
 
@@ -22,7 +23,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples python ssl static-libs"
 RESTRICT="test"
 
-DEPEND=">=dev-libs/boost-1.36[python?]
+DEPEND="<dev-libs/boost-1.48[python?]
 	>=sys-devel/libtool-2.2
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )