Make sure the correct boot library path is used. Bug #503746. Patch by Georgi Georgiev

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

6 files changed, 13 insertions, 235 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 176ea202cb4f..e5273e4ca81d 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.171 2014/03/03 20:26:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.172 2014/03/15 16:49:36 hwoarang Exp $
+
+  15 Mar 2014; Markos Chandras <hwoarang@gentoo.org>
+  -rb_libtorrent-0.16.12.ebuild, -rb_libtorrent-0.16.13.ebuild,
+  -rb_libtorrent-0.16.14.ebuild, rb_libtorrent-0.16.10.ebuild,
+  rb_libtorrent-0.16.15.ebuild:
+  Make sure the correct boot library path is used. Bug #503746. Patch by Georgi
+  Georgiev
 
 *rb_libtorrent-0.16.15 (03 Mar 2014)
 
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild
index bc9f2ee10cc2..f2d7b31ed885 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.10.ebuild,v 1.7 2013/09/07 20:11:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild,v 1.8 2014/03/15 16:49:36 hwoarang Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.6"
@@ -64,6 +64,7 @@ src_configure() {
 		$(use_enable python python-binding) \
 		$(use_enable ssl encryption) \
 		$(use_enable static-libs static) \
+		--with-boost-libdir=/usr/$(get_libdir) \
 		${myconf}
 }
 
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.12.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.12.ebuild
deleted file mode 100644
index 64ff462407ba..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.12.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 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.12.ebuild,v 1.1 2013/10/26 13:11:14 hwoarang 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?,threads(+)]
-	>=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() {
-	local myconf
-
-	# bug 441842
-	myconf="--disable-silent-rules"
-
-	# use multi-threading versions of boost libs
-	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"
-
-	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) \
-		${myconf}
-}
-
-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.16.13.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.13.ebuild
deleted file mode 100644
index 23cbffb303db..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.13.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 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.13.ebuild,v 1.1 2013/12/22 10:59:12 hwoarang 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?,threads(+)]
-	>=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() {
-	local myconf
-
-	# bug 441842
-	myconf="--disable-silent-rules"
-
-	# use multi-threading versions of boost libs
-	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"
-
-	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) \
-		${myconf}
-}
-
-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.16.14.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.14.ebuild
deleted file mode 100644
index bf09beefd679..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.14.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 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.14.ebuild,v 1.1 2014/02/04 17:14:26 hwoarang 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="mirror://sourceforge/libtorrent/${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?,threads(+)]
-	>=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() {
-	local myconf
-
-	# bug 441842
-	myconf="--disable-silent-rules"
-
-	# use multi-threading versions of boost libs
-	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"
-
-	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) \
-		${myconf}
-}
-
-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.16.15.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.15.ebuild
index f20e1c880721..291a22440433 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.15.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.15.ebuild,v 1.1 2014/03/03 20:26:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.15.ebuild,v 1.2 2014/03/15 16:49:36 hwoarang Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.6"
@@ -64,6 +64,7 @@ src_configure() {
 		$(use_enable python python-binding) \
 		$(use_enable ssl encryption) \
 		$(use_enable static-libs static) \
+		--with-boost-libdir=/usr/$(get_libdir) \
 		${myconf}
 }