Handle USE=threads for boost 1.52.0-r1 and later. Remove keywords from ebuilds that depends on older boost versions.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 1CD13C8AD4301342)

6 files changed, 34 insertions, 15 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index bf1cf39b58b8..8abea0075f60 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/rb_libtorrent
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.139 2012/11/03 23:14:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.140 2012/11/08 06:24:13 flameeyes Exp $
+
+  08 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  rb_libtorrent-0.15.10.ebuild, rb_libtorrent-0.15.5.ebuild,
+  rb_libtorrent-0.15.9.ebuild, rb_libtorrent-0.16.3.ebuild,
+  rb_libtorrent-0.16.5.ebuild:
+  Handle USE=threads for boost 1.52.0-r1 and later. Remove keywords from ebuilds
+  that depends on older boost versions.
 
   03 Nov 2012; Markos Chandras <hwoarang@gentoo.org>
   rb_libtorrent-0.15.10.ebuild, rb_libtorrent-0.15.5.ebuild,
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.10.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.10.ebuild
index 8f4d430472df..cb9eb4e67189 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.10.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.10.ebuild
@@ -1,6 +1,6 @@
 # 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.10.ebuild,v 1.6 2012/11/03 23:14:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.10.ebuild,v 1.7 2012/11/08 06:24:13 flameeyes Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.6"
@@ -23,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.48[python?]
+DEPEND=">=dev-libs/boost-1.48[python?,threads(+)]
 	>=sys-devel/libtool-2.2
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
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 ceaad8112e5c..95ea1ccf5705 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2012/11/03 23:14:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild,v 1.9 2012/11/08 06:24:13 flameeyes Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.6"
@@ -19,7 +19,7 @@ SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="sparc"
 IUSE="debug doc examples python ssl"
 RESTRICT="test"
 
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 4c4e30826b55..80ef3f2d3b19 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2012/11/03 23:14:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild,v 1.8 2012/11/08 06:24:13 flameeyes Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.6"
@@ -19,7 +19,7 @@ SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="ppc64"
 IUSE="debug doc examples python ssl static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.3.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.3.ebuild
index b823a650f4a0..883818366106 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.3.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.3.ebuild
@@ -1,6 +1,6 @@
 # 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.16.3.ebuild,v 1.2 2012/11/02 20:06:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.3.ebuild,v 1.3 2012/11/08 06:24:13 flameeyes Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.6"
@@ -23,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.48[python?]
+DEPEND=">=dev-libs/boost-1.48[python?,threads(+)]
 	>=sys-devel/libtool-2.2
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
@@ -42,9 +42,15 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf
+
 	# use multi-threading versions of boost libs
-	local myconf="--with-boost-system=boost_system-mt \
-		--with-boost-python=boost_python-${PYTHON_ABI}-mt"
+	if has_version '>=dev-libs/boost-1.52.0-r1'; then
+		myconf+=" --with-boost-python=boost_python-${PYTHON_ABI}"
+	else
+		myconf+=" --with-boost-system=boost_system-mt \
+			--with-boost-python=boost_python-${PYTHON_ABI}-mt"
+	fi
 
 	local LOGGING
 	use debug && myconf+=" --enable-logging=verbose"
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild
index ddf15f5f0312..1b41957d7f03 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild
@@ -1,6 +1,6 @@
 # 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.16.5.ebuild,v 1.2 2012/10/31 17:26:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.5.ebuild,v 1.3 2012/11/08 06:24:13 flameeyes Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.6"
@@ -23,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.48[python?]
+DEPEND=">=dev-libs/boost-1.48[python?,threads(+)]
 	>=sys-devel/libtool-2.2
 	sys-libs/zlib
 	examples? ( !net-p2p/mldonkey )
@@ -42,9 +42,15 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf
+
 	# use multi-threading versions of boost libs
-	local myconf="--with-boost-system=boost_system-mt \
-		--with-boost-python=boost_python-${PYTHON_ABI}-mt"
+	if has_version '>=dev-libs/boost-1.52.0-r1'; then
+		myconf+=" --with-boost-python=boost_python-${PYTHON_ABI}"
+	else
+		myconf+=" --with-boost-system=boost_system-mt \
+			--with-boost-python=boost_python-${PYTHON_ABI}-mt"
+	fi
 
 	local LOGGING
 	use debug && myconf+=" --enable-logging=verbose"