Restrict test on 0.13-r1, which breaks due to CVE patch. Remove old ebuild.

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

4 files changed, 10 insertions, 60 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index e7eb5a805439..2f2943e89ed6 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,11 @@
 # 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.60 2009/06/28 14:50:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.61 2009/06/29 00:06:04 yngwin Exp $
+
+  29 Jun 2009; Ben de Groot <yngwin@gentoo.org>
+  rb_libtorrent-0.13-r1.ebuild, -rb_libtorrent-0.14.4.ebuild:
+  Restrict test on 0.13-r1, which breaks due to CVE patch. Remove old
+  ebuild.
 
 *rb_libtorrent-0.14.4-r1 (28 Jun 2009)
 
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index c43d0a99925e..e20cf8282867 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -4,9 +4,8 @@ AUX rb_libtorrent-0.13-gcc44.patch 290 RMD160 04399530320a6457dfbda2e6ff4cbf8afc
 AUX rb_libtorrent-0.14.1-ax_python_path.patch 1084 RMD160 13f8d86ced91b9c617c3d5cd256056c9ae799dd3 SHA1 38165920f011971146d20feeb801df48e9fe664e SHA256 689cbb500e2bc7bd2a0ca7d48a84916497a7cba1cc65689b492e2d3dfddcaa20
 DIST libtorrent-0.13.tar.gz 1502517 RMD160 40b97552ca2b664facf864e48cc09a0cf4d84809 SHA1 010c02e350dc68263bb791bc8c37df341301e9bb SHA256 b187e6af2d2adc90417f991431fab5b0d6e61d71d0164345fad940a79cc45ee2
 DIST libtorrent-rasterbar-0.14.4.tar.gz 1990752 RMD160 6fdb4afb5895e426883a1a6947c04dffed3a5178 SHA1 3494f610ea0a329d33c03d031043476453897acd SHA256 759be15068a9b2186876f3d0c781a63ccb42ad7b959dbd11756c903287cae53c
-EBUILD rb_libtorrent-0.13-r1.ebuild 1554 RMD160 20c5a709e06559c9345701974781fc8f128d77fb SHA1 c133db4e306fda435af7e2ab2dc4accffd900a32 SHA256 e5e43a1fbb0d6cfdac38d489e8f1b6f1ce9cdf8542b0b89dccbbecd4100725c8
+EBUILD rb_libtorrent-0.13-r1.ebuild 1609 RMD160 584aa68a8e7f6d4a2e5989a54eaaf6f6a271fc1a SHA1 2e83902c8c10686c236c789d035ee7564dc3403e SHA256 d0486a816dc724a898cd219b514579417a2e1fb5682fe3d0ec14cecaf7153acd
 EBUILD rb_libtorrent-0.13.ebuild 1375 RMD160 29fd7fa11063e4ec0a35b5734a44f82c59c56958 SHA1 b37474a18317328f8821ae276802264736004ce0 SHA256 5addf2c16e9589528a57e0842e9e220888293f8b19a685b4ea218d8f45f4850a
 EBUILD rb_libtorrent-0.14.4-r1.ebuild 1774 RMD160 7391833176f2bb4880f15fba467eeb40a86d7605 SHA1 cb9745e3e6ac1c102d17c6acaa5c1d9ac1f879ea SHA256 0135cbddf46cf0e29fca597dc73e93d3178e16d79d064f684cd2cbeedcbecd54
-EBUILD rb_libtorrent-0.14.4.ebuild 1590 RMD160 2bcdc1d9d03cae0cee312fa3cb5d7c89bb57d926 SHA1 20e20eff49d5d3ece87797381685a72687d8e74e SHA256 c2efe1e32c65d546adbd098def8b7ec66071e531196fd3de5df559e0fdd692cc
-MISC ChangeLog 10360 RMD160 8071602245ca90eb4beaf28dfabbf82700ecb017 SHA1 4429146b320f737875bc51c6359e924f18ce498b SHA256 27d79f771f4c41806d86bc0c11fe81eedc4673e6d54159191ab5be137668105f
+MISC ChangeLog 10551 RMD160 e9cca36028a1543242cb7c1c6f6e3b40535c6f49 SHA1 87b3944aebb301eb69f0c431519754d8f377173e SHA256 07a4ba80bf0fccd040e9da7489bd9b6312518b3f17454e3fc638327d37d22137
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild
index 929c0ba3c276..5b0e78265026 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild
@@ -1,10 +1,11 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild,v 1.2 2009/06/29 00:06:04 yngwin Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic
 
+RESTRICT="test"  # tests break due to the CVE patch :(
 MY_P=${P/rb_/}
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.4.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.4.ebuild
deleted file mode 100644
index 80f01f249b60..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.4.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.4.ebuild,v 1.1 2009/06/06 16:30:06 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
-}