Cleanup, add 0.13-r1 with security fix for bug 273156, various other fixes

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

11 files changed, 191 insertions, 280 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 040b7ce75100..965048fdeb2f 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-libs/rb_libtorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.58 2009/06/27 12:56:43 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.59 2009/06/28 00:02:56 yngwin Exp $
+
+*rb_libtorrent-0.13-r1 (27 Jun 2009)
+
+  27 Jun 2009; Ben de Groot <yngwin@gentoo.org>
+  -rb_libtorrent-0.12.1.ebuild, +rb_libtorrent-0.13-r1.ebuild,
+  -rb_libtorrent-0.13_p2335.ebuild,
+  +files/rb_libtorrent-0.13-CVE-2009-1760.patch,
+  -rb_libtorrent-0.13.1.ebuild, +files/rb_libtorrent-0.13-boost-1.37.patch,
+  +files/rb_libtorrent-0.13-gcc44.patch, -rb_libtorrent-0.14.1.ebuild,
+  -rb_libtorrent-0.14.2.ebuild:
+  Remove all older ebuilds, except for latest stable.
+  Add 0.13-r1 with the following changes:
+  - add security patch for CVE-2009-1760 (bug 273156)
+  - add patch to fix building with boost-1.37 (bug 270447)
+  - migrate to EAPI=2 and general cleanup
+  - use append-ldflags from flag-o-matic.eclass
+  - disable as-needed for now (bug 271818)
+  - add minor patch to fix compilation with gcc-4.4
+  - add doc useflag to install HTML documentation
 
   27 Jun 2009; Ben de Groot <yngwin@gentoo.org> metadata.xml:
   Add qt herd as co-maintainer, as this is a dependency of qbittorrent
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index 1b0e3f756286..a31a82c90b6a 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,17 +1,11 @@
+AUX rb_libtorrent-0.13-CVE-2009-1760.patch 2436 RMD160 0121d5e8e3c0f1a5c56f699bac317dd2a1f60fbf SHA1 8429c9be191af5a995f0e6a2f8a15761402cd74f SHA256 d0402cb71e97609e56f56376dc36d62531a244c40a267c7bdfd40cb728bbd16a
+AUX rb_libtorrent-0.13-boost-1.37.patch 519 RMD160 3126c253c5b330a99b93bcadb803145a751df248 SHA1 9745aee26b0ad9801c517086805ee064a3d82a95 SHA256 1f6d979590f8873717c78cdf5fe0214f4f7f8ccd5b0e417b1de233e6875367f8
+AUX rb_libtorrent-0.13-gcc44.patch 290 RMD160 04399530320a6457dfbda2e6ff4cbf8afc10357f SHA1 4916a56e3fc44089e8e1dda8fddcfce765e550e5 SHA256 7ffd5c9a4a1f1c2bfb75e7631faa7566da86524bbdbbe1ea1ad2e55ddba9681a
 AUX rb_libtorrent-0.14.1-ax_python_path.patch 1084 RMD160 13f8d86ced91b9c617c3d5cd256056c9ae799dd3 SHA1 38165920f011971146d20feeb801df48e9fe664e SHA256 689cbb500e2bc7bd2a0ca7d48a84916497a7cba1cc65689b492e2d3dfddcaa20
-DIST libtorrent-0.12.1.tar.gz 1188288 RMD160 cafb097a2b8a76777eb7a229cfbeb4113081a42e SHA1 4c405008b78a7b54099fce848dbb9f1a2f7782fe SHA256 0db29ea807dfd682bed5992950c35c40e8a53a4c5b2f383b8d071c4bfb9f64db
 DIST libtorrent-0.13.tar.gz 1502517 RMD160 40b97552ca2b664facf864e48cc09a0cf4d84809 SHA1 010c02e350dc68263bb791bc8c37df341301e9bb SHA256 b187e6af2d2adc90417f991431fab5b0d6e61d71d0164345fad940a79cc45ee2
-DIST libtorrent-0.13_p2335.tar.bz2 1537298 RMD160 877aab8ba3a95e6d8dd49a5f380c970f9c8a1ec7 SHA1 5dd3ccddff19645e54c05eeefe9a8c497d1cf6ef SHA256 84d0690a988dcba61e9f4c2507738251d043515bcff1e20e2fe7bb977f6ea0d4
-DIST libtorrent-rasterbar-0.13.1.tar.gz 1469775 RMD160 9d806ee7914165d71c1c307b14874beef3033ca5 SHA1 af9c9709b62a9f06736b3d9e3dea4f8822eac948 SHA256 eed01a0f130c0c7cfdd56b172924bd8085821f372cdf5a44e85a3f855d1654bd
-DIST libtorrent-rasterbar-0.14.1.tar.gz 1780177 RMD160 d48a79c8b9c062d4726ee2312577306d13834f46 SHA1 0407b072765180367e4d58e9d20ad276ead3dc27 SHA256 7297861ef3b530509da1cb680e9d76804d557e9d77a082dd0f89c78caeec1317
-DIST libtorrent-rasterbar-0.14.2.tar.gz 1978048 RMD160 d34200669812025af682bcad752b7a24ffa984e5 SHA1 066779fd771791adf925780b05fc5160d588f897 SHA256 bf43ea3fbedc2839f66357c3f0bea5f05f563cd9ffd9f7c3c6d81f33374a466e
 DIST libtorrent-rasterbar-0.14.4.tar.gz 1990752 RMD160 6fdb4afb5895e426883a1a6947c04dffed3a5178 SHA1 3494f610ea0a329d33c03d031043476453897acd SHA256 759be15068a9b2186876f3d0c781a63ccb42ad7b959dbd11756c903287cae53c
-EBUILD rb_libtorrent-0.12.1.ebuild 1363 RMD160 d56e4d09649577a1a5f862af3de95015514cf8b2 SHA1 4ee40a1b9c903018af6aba6b5ec596cde9dae9c7 SHA256 3d0f3504cd36b9db8286ba8ae1780da7db8c0645ed4947e1e177511a57e3613d
-EBUILD rb_libtorrent-0.13.1.ebuild 1417 RMD160 9fa81d4c9541df0365a5fdd4ea4313ae93b95b6f SHA1 77332af178cd1c0a29517a3dab1919c903ebfa57 SHA256 27a34e13eed0a8570fd00fafb3e7ece5f140cc28036f98a666aaa9c508a66cc6
+EBUILD rb_libtorrent-0.13-r1.ebuild 1554 RMD160 20c5a709e06559c9345701974781fc8f128d77fb SHA1 c133db4e306fda435af7e2ab2dc4accffd900a32 SHA256 e5e43a1fbb0d6cfdac38d489e8f1b6f1ce9cdf8542b0b89dccbbecd4100725c8
 EBUILD rb_libtorrent-0.13.ebuild 1375 RMD160 29fd7fa11063e4ec0a35b5734a44f82c59c56958 SHA1 b37474a18317328f8821ae276802264736004ce0 SHA256 5addf2c16e9589528a57e0842e9e220888293f8b19a685b4ea218d8f45f4850a
-EBUILD rb_libtorrent-0.13_p2335.ebuild 1466 RMD160 ce0142d67b1d6ad9e7cafcc793a3ec1bef96b028 SHA1 d74623987e37c0054613236bfac8a0699b17dfd7 SHA256 70902eba4a8d72d78163fbbd450d6f03d6a844803503cf2e703f9a86dc70510f
-EBUILD rb_libtorrent-0.14.1.ebuild 1694 RMD160 d5254807dc5af519ac01280dffee9171d20ae175 SHA1 044de6090d78e522c4198007d84e85eaec307cbf SHA256 3451875ea1bd7337418ce6a876e6be67982094293ab1028c060aa6a8793d7e32
-EBUILD rb_libtorrent-0.14.2.ebuild 1590 RMD160 6f0b15dab9c0f18668bb0b22a0d4bfce8e804734 SHA1 4b2c8b64b655f7bf82a7bc2add3303e061befb40 SHA256 b9194b81d9787665f25d417b7dd3d5c4aaf0522ca74654a2537d3d49a5b9bcb3
 EBUILD rb_libtorrent-0.14.4.ebuild 1590 RMD160 2bcdc1d9d03cae0cee312fa3cb5d7c89bb57d926 SHA1 20e20eff49d5d3ece87797381685a72687d8e74e SHA256 c2efe1e32c65d546adbd098def8b7ec66071e531196fd3de5df559e0fdd692cc
-MISC ChangeLog 9128 RMD160 87da3fed7535ebf8ba7503b10445e88294d54762 SHA1 dd675b73d16ad5dceaf0f920e998e36cc4b4fa46 SHA256 0f5f1b0eeca29f5a524110132ea18685dd1d65801bc3f148fcde0d8442bbbff4
+MISC ChangeLog 9986 RMD160 6052e89fe320db17862e6a7157e0a166e7f049fe SHA1 cbf6e7934021bac27f4c337f134e1f6c66ea869f SHA256 bd5fbe71d298d8d3d408843f37f42e5ac9b41fc0f3394967d760ba25bbebdee1
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760.patch
new file mode 100644
index 000000000000..d91e20689bd3
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760.patch
@@ -0,0 +1,92 @@
+From 160ea4fe2beb1d433c96fc432772fd0122421c95 Mon Sep 17 00:00:00 2001
+From: Robert Buchholz <rbu@gentoo.org>
+Date: Mon, 8 Jun 2009 12:04:41 +0200
+Subject: [PATCH] backport CVE-2009-1760 fix from r3621
+
+---
+ src/torrent_info.cpp |   47 ++++++++++++++++++++++++++++-------------------
+ 1 files changed, 28 insertions(+), 19 deletions(-)
+
+diff --git a/src/torrent_info.cpp b/src/torrent_info.cpp
+index 57c8a97..fc6d284 100755
+--- a/src/torrent_info.cpp
++++ b/src/torrent_info.cpp
+@@ -39,6 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ #include <iterator>
+ #include <algorithm>
+ #include <set>
++#include <string>
+ 
+ #ifdef _MSC_VER
+ #pragma warning(push, 1)
+@@ -74,6 +75,29 @@ namespace
+ 		str += 0x80 | (chr & 0x3f);
+ 	}
+ 
++	bool valid_path_element(std::string const& element)
++	{
++		if (element.empty()
++			|| element == "." || element == ".."
++			|| element[0] == '/' || element[0] == '\\'
++			|| element[element.size()-1] == ':')
++			return false;
++		return true;
++	}
++
++	fs::path sanitize_path(fs::path const& p)
++	{
++		fs::path new_path;
++		for (fs::path::const_iterator i = p.begin(); i != p.end(); ++i)
++		{
++			if (!valid_path_element(*i)) continue;
++			std::string pe = *i;
++			new_path /= pe;
++		}
++		TORRENT_ASSERT(!new_path.is_complete());
++		return new_path;
++	}
++
+ 	void verify_encoding(file_entry& target)
+ 	{
+ 		std::string tmp_path;
+@@ -184,9 +208,9 @@ namespace
+ 		for (entry::list_type::const_iterator i = list->begin();
+ 			i != list->end(); ++i)
+ 		{
+-			if (i->string() != "..")
+-				target.path /= i->string();
++			target.path /= i->string();
+ 		}
++		target.path = sanitize_path(target.path);
+ 		verify_encoding(target);
+ 		if (target.path.is_complete()) throw std::runtime_error("torrent contains "
+ 			"a file with an absolute path: '"
+@@ -349,23 +373,8 @@ namespace libtorrent
+ 		else
+ 		{ m_name = info["name"].string(); }
+ 		
+-		fs::path tmp = m_name;
+-  		if (tmp.is_complete())
+-  		{
+- 			m_name = tmp.leaf();
+-  		}
+- 		else if (tmp.has_branch_path())
+-  		{
+- 			fs::path p;
+- 			for (fs::path::iterator i = tmp.begin()
+- 				, end(tmp.end()); i != end; ++i)
+- 			{
+- 				if (*i == "." || *i == "..") continue;
+- 				p /= *i;
+- 			}
+- 			m_name = p.string();
+- 		}
+- 		if (m_name == ".." || m_name == ".")
++		m_name = sanitize_path(m_name).string();
++		if (!valid_path_element(m_name))
+  			throw std::runtime_error("invalid 'name' of torrent (possible exploit attempt)");
+ 	
+ 		// extract file list
+-- 
+1.6.3.1
+
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-boost-1.37.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-boost-1.37.patch
new file mode 100644
index 000000000000..f1b95d8d6050
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-boost-1.37.patch
@@ -0,0 +1,11 @@
+diff -ur libtorrent-0.13.orig/include/libtorrent/disk_io_thread.hpp libtorrent-0.13/include/libtorrent/disk_io_thread.hpp
+--- libtorrent-0.13.orig/include/libtorrent/disk_io_thread.hpp	2009-05-27 10:45:06.000000000 +0200
++++ libtorrent-0.13/include/libtorrent/disk_io_thread.hpp	2009-05-27 11:33:50.000000000 +0200
+@@ -38,6 +38,7 @@
+ #endif
+ 
+ #include "libtorrent/storage.hpp"
++#include <boost/thread/condition.hpp>
+ #include <boost/thread/thread.hpp>
+ #include <boost/function.hpp>
+ #include <boost/thread/mutex.hpp>
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-gcc44.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-gcc44.patch
new file mode 100644
index 000000000000..e89c19c85fdc
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-gcc44.patch
@@ -0,0 +1,10 @@
+--- libtorrent-0.13/src/identify_client.cpp.orig	2009-06-28 01:11:36.000000000 +0200
++++ libtorrent-0.13/src/identify_client.cpp	2009-06-28 01:12:33.000000000 +0200
+@@ -34,6 +34,7 @@
+ 
+ #include <cctype>
+ #include <algorithm>
++#include <cstdio>
+ 
+ #ifdef _MSC_VER
+ #pragma warning(push, 1)
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.12.1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.12.1.ebuild
deleted file mode 100644
index d187590b20b4..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.12.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 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.12.1.ebuild,v 1.4 2008/04/19 17:09:42 armin76 Exp $
-
-inherit eutils autotools
-
-MY_P=${P/rb_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="BitTorrent library written in C++ for *nix."
-HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
-SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/boost
-	!net-libs/libtorrent"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# We need boost built with threads
-	if ! built_with_use --missing true "dev-libs/boost" threads; then
-		eerror "${PN} needs dev-libs/boost built with threads USE flag"
-		die "dev-libs/boost is built without threads USE flag"
-	fi
-}
-
-src_compile() {
-	BOOST_LIBS="--with-boost-date-time=boost_date_time-mt \
-			--with-boost-filesystem=boost_filesystem-mt \
-			--with-boost-thread=boost_thread-mt \
-			--with-boost-regex=boost_regex-mt \
-			--with-boost-program_options=boost_program_options-mt"
-
-	econf $(use_enable debug) \
-		 ${BOOST_LIBS} \
-		 LDFLAGS="${LDFLAGS} -pthread" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog AUTHORS NEWS README
-}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild
new file mode 100644
index 000000000000..929c0ba3c276
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 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.13-r1.ebuild,v 1.1 2009/06/28 00:02:56 yngwin Exp $
+
+EAPI="2"
+inherit eutils flag-o-matic
+
+MY_P=${P/rb_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A 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 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug doc"
+
+DEPEND="|| ( >=dev-libs/boost-1.34.1
+		~dev-libs/boost-1.33.1[threads] )
+	!net-libs/libtorrent"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2009-1760.patch  # bug 273156
+	epatch "${FILESDIR}"/${P}-boost-1.37.patch     # bug 270447
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
+src_configure() {
+	append-ldflags -pthread
+
+	# fails with as-needed, bug 271818
+	append-ldflags -Wl,--no-as-needed
+
+	# use multi-threaded boost libs
+	local BOOST_LIBS="--with-boost-date-time=boost_date_time-mt \
+		--with-boost-filesystem=boost_filesystem-mt \
+		--with-boost-thread=boost_thread-mt \
+		--with-boost-regex=boost_regex-mt \
+		--with-boost-program_options=boost_program_options-mt"
+
+	econf $(use_enable debug) ${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.13.1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.13.1.ebuild
deleted file mode 100644
index 37d4d510b33d..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.13.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 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.13.1.ebuild,v 1.1 2008/07/05 19:14:17 armin76 Exp $
-
-inherit eutils autotools
-
-MY_P=${P/rb_/}
-MY_P=${MY_P/torrent/torrent-rasterbar}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="BitTorrent library written in C++ for *nix."
-HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
-SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-IUSE="debug"
-
-DEPEND="dev-libs/boost
-	!net-libs/libtorrent"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# We need boost built with threads
-	if ! built_with_use --missing true "dev-libs/boost" threads; then
-		eerror "${PN} needs dev-libs/boost built with threads USE flag"
-		die "dev-libs/boost is built without threads USE flag"
-	fi
-}
-
-src_compile() {
-	BOOST_LIBS="--with-boost-date-time=boost_date_time-mt \
-			--with-boost-filesystem=boost_filesystem-mt \
-			--with-boost-thread=boost_thread-mt \
-			--with-boost-regex=boost_regex-mt \
-			--with-boost-program_options=boost_program_options-mt"
-
-	econf $(use_enable debug) \
-		 ${BOOST_LIBS} \
-		 LDFLAGS="${LDFLAGS} -pthread" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog AUTHORS NEWS README
-}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.13_p2335.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.13_p2335.ebuild
deleted file mode 100644
index 93b60227aa86..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.13_p2335.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 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.13_p2335.ebuild,v 1.1 2008/06/03 10:40:41 armin76 Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit eutils autotools
-
-MY_P="${P/rb_/}"
-
-DESCRIPTION="BitTorrent library written in C++ for *nix."
-HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/boost
-	!net-libs/libtorrent"
-
-pkg_setup() {
-	# We need boost built with threads
-	if ! built_with_use --missing true "dev-libs/boost" threads; then
-		eerror "${PN} needs dev-libs/boost built with threads USE flag"
-		die "dev-libs/boost is built without threads USE flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	BOOST_LIBS="--with-boost-date-time=boost_date_time-mt \
-			--with-boost-filesystem=boost_filesystem-mt \
-			--with-boost-thread=boost_thread-mt \
-			--with-boost-regex=boost_regex-mt \
-			--with-boost-program_options=boost_program_options-mt"
-
-	econf $(use_enable debug) \
-		 ${BOOST_LIBS} \
-		 LDFLAGS="${LDFLAGS} -pthread" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog AUTHORS NEWS README
-}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.1.ebuild
deleted file mode 100644
index f21047f840cd..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 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.1.ebuild,v 1.1 2008/12/28 21:35:27 coldwind Exp $
-
-inherit eutils autotools
-
-MY_P=${P/rb_/}
-MY_P=${MY_P/torrent/torrent-rasterbar}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="BitTorrent library written in C++ for *nix."
-HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
-SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-IUSE="debug examples python test"
-
-DEPEND="
-	>=dev-libs/boost-1.34
-	|| ( >=dev-libs/boost-1.35 dev-cpp/asio )
-	sys-libs/zlib
-	!net-libs/libtorrent"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ax_python_path.patch
-	eautoreconf
-}
-
-src_compile() {
-	#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"
-
-	#TODO: We might want to add 'use debug -> --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 \
-		${BOOST_LIBS} \
-		LDFLAGS="${LDFLAGS} -pthread" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog AUTHORS NEWS README
-}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.2.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.2.ebuild
deleted file mode 100644
index ed2673ea9a17..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 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.2.ebuild,v 1.2 2009/03/29 16:55:21 armin76 Exp $
-
-inherit eutils autotools
-
-MY_P=${P/rb_/}
-MY_P=${MY_P/torrent/torrent-rasterbar}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="BitTorrent library written in C++ for *nix."
-HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
-SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-IUSE="debug examples python test"
-
-DEPEND="
-	>=dev-libs/boost-1.34
-	|| ( >=dev-libs/boost-1.35 dev-cpp/asio )
-	sys-libs/zlib
-	!net-libs/libtorrent"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	#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"
-
-	#TODO: We might want to add 'use debug -> --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 \
-		${BOOST_LIBS} \
-		LDFLAGS="${LDFLAGS} -pthread" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog AUTHORS NEWS README
-}