Backport fix from 0.16.5. Bug #440976

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

4 files changed, 24 insertions, 102 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 586b6e640e45..a7b0e8e36847 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,10 @@
 # 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.137 2012/10/31 17:26:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.138 2012/11/02 20:06:46 hwoarang Exp $
+
+  02 Nov 2012; Markos Chandras <hwoarang@gentoo.org>
+  -rb_libtorrent-0.16.4.ebuild, rb_libtorrent-0.16.3.ebuild:
+  Backport fix from 0.16.5. Bug #440976
 
   31 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   rb_libtorrent-0.16.5.ebuild:
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index eef813fb03ec..65ef39d40fbb 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -9,24 +9,28 @@ DIST libtorrent-rasterbar-0.15.10.tar.gz 2623718 SHA256 36e79fa4e79d5b0911ade11b
 DIST libtorrent-rasterbar-0.15.5.tar.gz 2606717 SHA256 150cbda406ac5ff57330446487961503c87d22bfb61a72d695ab4520b4c18a43
 DIST libtorrent-rasterbar-0.15.9.tar.gz 2619950 SHA256 a2ea68011e9933c7deb473268122f016171d24f0f35e744fbdadd14bf6bac23d
 DIST libtorrent-rasterbar-0.16.3.tar.gz 2899811 SHA256 54f509fe1434b0cb3829f4c8e2b209a878a4f7bc6b4a38cf0e41c193326f9d9e SHA512 2d381f4292678a27350683299539c3aead215bc3603a35e44e6115c720aa04256678181f0bdd299e50cc53177f16b958e4705046f9f90e3eaae48a23707db2eb WHIRLPOOL 359ff2b5493bd6fba6731b8a88679f50fe7a390f6f99eaa4b104d4e3a3d85b0702f317c306d1c4a81fefda86c8c8c4f85dfdb3dd4ac7b8a4123de7c8d96b459b
-DIST libtorrent-rasterbar-0.16.4.tar.gz 2907218 SHA256 025531e1da1d5478486d475835327a395fbcff27f29f3767731cce361622c4f0 SHA512 519a6eb4692436acee7d212c9994653032915b58d39b7a0776b5ddd163fba792bfe27f7590d9c2fcc00abdae0d6b5c2c656f6cc33fd26562ad7ec100d9e9553a WHIRLPOOL 15567738091d69b35181661ca31c4558443bc86728a6c38bbdffc5a8b79aec1fcc1623e0c04c9c1f8ce24ab8020f85e805371f015fea4d03cc237b60795949cf
 DIST libtorrent-rasterbar-0.16.5.tar.gz 2912302 SHA256 35884b450e49b7d62d327c9952241adfcfa534af8f7b1bdab1d3333cf9b0f3cb SHA512 eb6a2af19c185acda0a93c1adc87c8eedaa1323a01ba169414066fe6063e6ff8b78843adf38f2ade1246afdc7bebcaaa0533f45c92ecdb3b08f408dcb9773963 WHIRLPOOL 08153d61a9f5158dd1f4e387c390a3f840025c7673432d9d97eae6582a2d1d94c405a3c11f7b2b6445a792add2b7aa7c7790a58117ee638dee0831e291c3b40d
 EBUILD rb_libtorrent-0.15.10.ebuild 2296 SHA256 75490bbbd52fffc7178e8e5b8aa8298d618ccc38a2957546805bbf3e939cc02e SHA512 76f906cb9d4adb9847c805b333e516cb83516005c38c659d2347d3dad8383974a040459d51db33fe46bc366540c551c6e415d8ef339770d3cdb0d508c6b94d39 WHIRLPOOL a4979b9356038ad2e14dd7d6c756e583635bd00a24820494f8a8edf479274160687bd582b83e64d41f66de5a7457dfccd1cfd9300ec16cc4e0654bf97a7727fe
 EBUILD rb_libtorrent-0.15.5.ebuild 2099 SHA256 62793b52847ed2bb992fdb01631ca50e77253b45537bd56118391648b197b36a SHA512 238a7ee418c8e022278c25507402ec329bc15c79b10fa8518b0edae95e57c1e238ee20dfd6b5c3629b616ae355cb9028d7d797cb6023bbe3d366a3cb57602049 WHIRLPOOL 3c99e6c5eab5055f884b3c9e314775bef44b64adb71c41103ad013ca2846ae4a4c8d97262253cb4392826f227d4091f4d76e7f30653f023b5c7c478c994c3544
 EBUILD rb_libtorrent-0.15.9.ebuild 2335 SHA256 65b4cd3a8e89eba0a13c911e5b9f3b5bc85269eeceb08ebb3272fc623ef66659 SHA512 9413a278a70b5e15e7bcf61a86c7e6cc0b79a329a986df815216bbc8e3abe36027f7852f976bce63586360f098c7e845d7ba8accee70e793bcd55a861a4d9e40 WHIRLPOOL ad28a500ecf7e2b7ea1d25d417e886a6b01f59944bf595d9a192062f44e4d155e6f4528d0e151840cfbc9d8014b815c026f1ff45ea75cf25c0ffc66adb777b54
-EBUILD rb_libtorrent-0.16.3.ebuild 2188 SHA256 235690768f271022c46ef5278d633095629c25d806ad95519da1cfde13b1ddc8 SHA512 0b43e76c3dd20ee4c57c12d4fee7d1c5f4bb17a2c6473b1ad41a425e44e53593f909bb12675f13d90dbeec36e642776f29a208400e6556ef45db3d0d14114361 WHIRLPOOL b5e948b0da2f860cffaf2329f864fe838ad083391c5cd5dc7972870b3a1d73a3bc21edab1b7389df6b300125e1affff73c3dffd7f95b7417763d91926a09eb93
-EBUILD rb_libtorrent-0.16.4.ebuild 2188 SHA256 8c2604b713dd63c92f5cb3fab146278f5e23653e3d46e3f9d9bf5bb879b67b15 SHA512 2b6d7392a9bf120cf4d9e1f3d188de58d1ae5e202752518f9fc49e8e2d112be702b93a085f5001cba71bb847bdc4ae91a3e886affef90a88363c647e8c0c8325 WHIRLPOOL ef0f0be453f21a98b4267eae2436a3b52aa88f1f45e9a619548ef2be5a8cb90cf0b83413d2d72cfd9d386c74615be949a74ebaeaaf35d421941e6842773b427e
+EBUILD rb_libtorrent-0.16.3.ebuild 1743 SHA256 eb6ddab83979d97317bfd565c1e744e0d0cd83518ef9b84fb781fdd1e1e8b6aa SHA512 531cebb85d78420ce19656b411ab452c53debda8ea5db32fbab000b66c27c6fdaec6a85f3795f0cc380b91ebc4cd81a4d03613dc814808ee23bfa7669165ab35 WHIRLPOOL d890370f873a83df00e41e89ff703624132f27c2b9f3261545591f855238cc8c62b2c3554a9c36cdee90f86b356d9750407964c3669f8ae6ab6111616e271778
 EBUILD rb_libtorrent-0.16.5.ebuild 1744 SHA256 c7f61701c7dee54a8f53a9c1f9d41bffe2ee5648bbb4f1749f6e765ad906e583 SHA512 b8db1e8527ee2bd57bd5924b2ecc9096ebf5b4cd1c399036a70d82e888ccee48df6e2fc173e163c21bdcfec5bb8f1275bcd69e73d6052e250236077e6208abcb WHIRLPOOL 8ed7e62dd821b29ee8d5b39f668470220ea375f016356e64df8b7d6af51f068652e94c2d618609fd75bbc48c1e3429804e87981323431671c98e647e3f89028d
-MISC ChangeLog 22942 SHA256 5704ec5e38bbb69a7262836d8d7e0fd785ada358a019ee30dcddddbeb884ec2c SHA512 0dedeb8b5bbd01dd4c03d87e13883d12448c8efb0a11cb5e3c30b804e59c8ff2cd826586377abc613a50732e81285c77fc2a7d14eb898149b610c6f00a313bd5 WHIRLPOOL ada36ec548397fa69fb3ab7b4053f5cffb5c799f65949a4a119910d4756d4ffae16e34c066de0fe6136befab5be26eedbe5661ce8e6f44cc75cf9075fe4c42fd
+MISC ChangeLog 23096 SHA256 e954751ac6660441339866a5810acd37ccb03686bc5571a597c2ab810d8016bb SHA512 1f7ace786aaedbf6d646e3281c6964c012e296f7374e4b857e9ab7882eb4c4c0668129076273db0e86b25babeb2d841d2b5458adf18cd8b22580dad3ac643eac WHIRLPOOL 91a698220245fe566d3dc852817d76c26e785ce24809057695230057f6578541cb69c29679965fad803e15ea477ab495cc8ea2a0cb2b111e67c7820197990da2
 MISC metadata.xml 338 SHA256 c3c6440b48a876a0f8126eaf17c31f5f77f2eaf2d84068c9d43bfba6cd5d187c SHA512 b9b57d5e8f907705b27f55f31bc4d7e68c8f076162d2ca2f6a34be64a0e17c80f20798f15df493d7a1ba29d88148b1ddb49ef757acda58f2b7e1b5d1126d9418 WHIRLPOOL 1ca916d0c644bd428c6f21cd7c126cf6b8783a5b84eb4468712f6843bb14bff6869d39440af9c482a0bb9d40fd037aace45524609476b7e83d92420a757892f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQkV92AAoJEBzRPIrUMBNCM4kH/RzpFsUedgT1CnzgQ0cl8l/d
-4dCRAMc13k5XkrGnAUaUoTUcBGfef6S7Y8J6M/1E9WxH6M+VCW0HesMrGmsqqoy5
-INQRb7vq9WOM9GVWV2IrLcWP37Q6xryDochBwxL9OwR4Kg5+XU/mWauSPEwSB6eU
-TD+ZtiBc1/bitOPaIzu376lsi91nXA4NAY4keWQRcjfKQ2TBV2twGpnaczoz5zRZ
-M+0Km/yJ1A+SDzx9rpEP2tijk7quXK/yLqc07eOVGUsvswquEixL+DepIM8v9MXm
-zp/Qoj+WdAuFhLKHSxVcwuy63HFBP+i4+Cp1cm4w7oOF/Ka62cDZdwaCcxo8yxU=
-=FmS9
+iQIcBAEBCAAGBQJQlCfVAAoJEPqDWhW0r/LCTxoQAKNwECdTW+C0aCIX7aliulrq
+g/pxA0KRfiFxKU8fDq3GfK0NTmbWABUynPnmTw8LBJQ6e0lVAOtTEcxyYtP1kHLl
+PSz2c1extuDds1cWxZ7IJCnv4vbCCyKcPg8PyTO6ERmC7s29fv9hh935mUEmx+At
+eZmmJWhXMysFleigudGRoxhpEAPPFmjmIS2UH8A41uB3O8zMc/JNDRot5hUREyJu
+IE6W7FTvWYnquiVGfQcGO/AdN3gnPJF2M+HMuH7F4DFg/p0TWMGsactt4Wjw3cuv
+eQiXxeYVeae7mUppwwOpCQwTeLYk3S53LN55tlfy44sF1jG8Q5dWvjgLF7RamZzf
+95CxZFvI61bKe7GKHI7TitMF376ybwH8kZO2K6rzB/2d2+ZY5V2Zs2mGanxxMolX
+sUQTCFV9DYzyzvttGLHO59L/3QLOVQcCcegIfTPPqmdDsdVuDnO3r3W9y9lr9Se7
+M9EmSJIWsPiOlQk3XIG74z+lt9QJlTCMn7rFMJtYKo5eXe3rcYy1dLn56I2yqZj+
+zIR/3is/5b/Lt2YvzCgmirX0WbzDn9lv44NvK3XhB4zrziTbgdub2EbQPStSNB1Q
+4O0ReDljEhc/pR3xoRXFaWts1r1bMzDwOIafuG7WCf6sE2BaqFSTN79fBzeofBmU
+hhiImL6epjnXanvm2qbj
+=IwDU
 -----END PGP SIGNATURE-----
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 717ae32b3669..b823a650f4a0 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.1 2012/08/24 23:59:30 hwoarang Exp $
+# $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 $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.6"
@@ -43,17 +43,11 @@ src_prepare() {
 
 src_configure() {
 	# use multi-threading versions of boost libs
-	local BOOST_LIBS="--with-boost-system=boost_system-mt \
+	local myconf="--with-boost-system=boost_system-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="${EPREFIX}/usr/include/boost-${BOOST_VER}"
-	BOOST_LIB="${EPREFIX}/usr/$(get_libdir)/boost-${BOOST_VER}"
 
 	local LOGGING
-	use debug && LOGGING="--enable-logging=verbose"
+	use debug && myconf+=" --enable-logging=verbose"
 
 	econf $(use_enable debug) \
 		$(use_enable test tests) \
@@ -61,10 +55,7 @@ src_configure() {
 		$(use_enable python python-binding) \
 		$(use_enable ssl encryption) \
 		$(use_enable static-libs static) \
-		${LOGGING} \
-		--with-boost=${BOOST_INC} \
-		--with-boost-libdir=${BOOST_LIB} \
-		${BOOST_LIBS}
+		${myconf}
 }
 
 src_install() {
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.4.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.4.ebuild
deleted file mode 100644
index 0701e49fe8e0..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.4.ebuild,v 1.1 2012/10/02 18:19:57 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?]
-	>=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-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="${EPREFIX}/usr/include/boost-${BOOST_VER}"
-	BOOST_LIB="${EPREFIX}/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) \
-		${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
-}