Remove unpatched ebuild. Add version bump (bug 280967).

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

4 files changed, 70 insertions, 61 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index f62f818e49dc..458efc59abc2 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,12 @@
 # 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.63 2009/06/29 21:25:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.64 2009/08/15 23:29:06 yngwin Exp $
+
+*rb_libtorrent-0.14.5 (15 Aug 2009)
+
+  15 Aug 2009; Ben de Groot <yngwin@gentoo.org> -rb_libtorrent-0.13.ebuild,
+  +rb_libtorrent-0.14.5.ebuild:
+  Remove unpatched ebuild. Add version bump (bug 280967).
 
   29 Jun 2009; Markus Meier <maekke@gentoo.org>
   rb_libtorrent-0.13-r1.ebuild:
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index 18d9c117f6af..a9bf83a11c9d 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rb_libtorrent-0.13-CVE-2009-1760-test-fix.patch 710 RMD160 42b171fa60ed4e1af3d08dcc6b58a5fece888876 SHA1 7744d8f827bbf74b888e4297ed6d98d22752c4eb SHA256 41242b68d0e50329cd7056d57ab9681d7f9f9d368eb20b8026b4b291e9d9da10
 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
 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
+DIST libtorrent-rasterbar-0.14.5.tar.gz 1992627 RMD160 e9fad2cac8d054d4da86d591b027e8447a005c2f SHA1 ce19fddad4165502d3fcd9f1fc120ad2fad8bcd6 SHA256 4253ad5002e81d95ed8b3ff4116113f1ce7812f6eaf15a1ceef8cad9eecaaad8
 EBUILD rb_libtorrent-0.13-r1.ebuild 1608 RMD160 43f6754f1f7b7ecb00aa33d0d5c5f522500853fc SHA1 2b81d709fb0fa6f46e292b5d079d65ff76957933 SHA256 885071d79c6584668d743c6fb790176e434655b2e020af9db0c4fc7f5675561c
-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
-MISC ChangeLog 10958 RMD160 b4db80b632e9353b198aa6e137e40ecffd26b8f8 SHA1 faa7954f1cc3d0db01e5ded659ef2bcc26bfa657 SHA256 51218d7779f4f7061efa2b6e2237b57ebc1cf6368bbef0694c7bbfada166370f
+EBUILD rb_libtorrent-0.14.5.ebuild 1771 RMD160 f239ad06e464c685eb085251b13b5c7d9c4501a1 SHA1 f7182d7adfe5dca9fc30eea5c8ea87e809559bba SHA256 09171fdbf03965cad1dd00b5af58489312bc4c2d15e8d45a2a9fc11900cbdb15
+MISC ChangeLog 11162 RMD160 82c46eab432422b94e5d0f9bd10dba4a38ef901f SHA1 bb273b47fdfceecbc9c95a78ea67b632995b5baf SHA256 c8318759a49ba9f9a6dfc2387f5cb74c4e6ac4974e490f10a304fef1f57dec69
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpJMYMACgkQkKaRLQcq0GK0sQCcC+7yWxEdiGwqfmAKLxUhodXH
-LtcAoIP1LPzGtIb/ylXcVBFEvH22hPTj
-=3KXX
------END PGP SIGNATURE-----
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.13.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.13.ebuild
deleted file mode 100644
index d3037d28aa49..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.13.ebuild
+++ /dev/null
@@ -1,48 +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.ebuild,v 1.4 2008/08/09 16:59:27 coldwind 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 ~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.14.5.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.5.ebuild
new file mode 100644
index 000000000000..70ce6a5c08dd
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.14.5.ebuild
@@ -0,0 +1,60 @@
+# 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.5.ebuild,v 1.1 2009/08/15 23:29:06 yngwin Exp $
+
+EAPI="2"
+inherit eutils flag-o-matic
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug doc examples python test"
+
+DEPEND="!net-libs/libtorrent
+	|| ( >=dev-libs/boost-1.35
+		( ~dev-libs/boost-1.34.1 dev-cpp/asio ) )
+	python? ( || ( >=dev-libs/boost-1.35.0-r5[python]
+		=dev-libs/boost-1.35.0-r2 ) )
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	append-ldflags -pthread
+
+	#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"
+
+	local LOGGING
+	use debug && LOGGING="--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 \
+		${LOGGING} \
+		${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
+}