Version bump

Package-Manager: portage-2.1.9.30/cvs/Linux x86_64

5 files changed, 27 insertions, 93 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 08076c621515..e51a866a7753 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.99 2011/01/06 11:53:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.100 2011/01/08 12:05:23 hwoarang Exp $
+
+*rb_libtorrent-0.15.5 (08 Jan 2011)
+
+  08 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
+  -rb_libtorrent-0.15.0.ebuild, -rb_libtorrent-0.15.3.ebuild,
+  +rb_libtorrent-0.15.5.ebuild:
+  Version bump
 
   06 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
   rb_libtorrent-0.15.1.ebuild, rb_libtorrent-0.15.3.ebuild,
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index 072ccd2cac45..2781ab005862 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -6,22 +6,20 @@ AUX rb_libtorrent-0.14.9-as-needed-fix.patch 520 RMD160 e75c51c39acd3df37274d465
 AUX rb_libtorrent-0.15.1-ax_pthread_asneeded.patch 4254 RMD160 57ecaa0aba6363cbac669f901529c1b157de9aa5 SHA1 af7171eadbe4e2dbcd9fbf5a0752579b9a6d3890 SHA256 aeba842df39d7149ef3722b6c62956f7c20ed1a81b778252ea7ed0514ab2ece3
 DIST libtorrent-rasterbar-0.14.12.tar.gz 1989687 RMD160 2fea2f10b0351ff7b269258ecc57a267415620cf SHA1 e1165fccd4a34ed1d686b350b88e9a5a321b7515 SHA256 046e2b83fb796f0cd2d7183dc31b978d6dd028e8c084fac1ec5dc93bc7ac1f40
 DIST libtorrent-rasterbar-0.14.9.tar.gz 1989956 RMD160 67f31b8dd98a3ead862a042ae226b23bdeb242a0 SHA1 cd7579100529cb2b0f0b4fcd2bee3d28c35b74c3 SHA256 08ea1eeea7d0fb8ed2ca2628c2e9c79d3bacc9f08011b4d9020a15dcd24e6ea3
-DIST libtorrent-rasterbar-0.15.0.tar.gz 2569328 RMD160 fa91bdcaf39e6d0da2c68346c9acffaa62a6a846 SHA1 ebc9ce111f59e538aff17102fcce907fd967cd8b SHA256 e1a79045ad041dd82850d2255037108bb17dcbe9a9a8819169a2624b72667db0
 DIST libtorrent-rasterbar-0.15.1.tar.gz 2464727 RMD160 1408abbf37c77059b9db1693c94da9d31b2c5462 SHA1 0a6e24c4a137d202243fab5ed4cf3c6acecebde9 SHA256 a837cd101177b24989609191cee568bc94b2defab13ac28c97b6c0951c73a952
-DIST libtorrent-rasterbar-0.15.3.tar.gz 2569466 RMD160 a915b14524eb9c57129eeed7874bd44efc093a48 SHA1 1d49a807ea2340f810b2c553c217c074c1e82be5 SHA256 4ac3bee3e89a754915e32647b03c1128bcfd46c76ea3b967980bb41571537552
 DIST libtorrent-rasterbar-0.15.4.tar.gz 2569642 RMD160 bc7ffa94c4c18e692c94a7cae562c483409b5b0e SHA1 1010884449d9dd8d56c95308670d87c7d3cad69b SHA256 9ebbd5f6f91037ddde84333b28ac8bcb81e003d4582e072a5ce140a215b04dde
+DIST libtorrent-rasterbar-0.15.5.tar.gz 2606717 RMD160 ee5640c530e785cfd78d11db12d6d22d93c5c3c2 SHA1 da81d92bb00f51edcd7dcea1e00e3c54806a43b4 SHA256 150cbda406ac5ff57330446487961503c87d22bfb61a72d695ab4520b4c18a43
 EBUILD rb_libtorrent-0.14.12.ebuild 2452 RMD160 ec4ce4996158ca3c222cbaddc0d8e5466d970a01 SHA1 4b17a5d9654520a145f54f8119479652f59feeeb SHA256 7b02babf2a5eba71ef7cffb01ec250af3bac77fbabd73978400746217df775f9
 EBUILD rb_libtorrent-0.14.9-r1.ebuild 2452 RMD160 6b800bc9d4f9a75f2c02bc5cc774e54848929f3d SHA1 aff1a616adf3eded5eebbb4013f1965d50dca780 SHA256 ea0b8cee83db50c4acd3e72ba2636e96f7152901ce1c72e52def0ae15a92a398
-EBUILD rb_libtorrent-0.15.0.ebuild 2452 RMD160 5c49320fa9de86616d39064114e1432001fef5c1 SHA1 ab1b8f8e0651e6f177ebb703cc028f308962b0dc SHA256 71c6bc97b6f01550dc88af066fbcaa0b38ae946cd8b3e21fa25a3fdc8f6c391e
 EBUILD rb_libtorrent-0.15.1.ebuild 2124 RMD160 5ba9d5bc09b76ad98d50d9cd0e60f16f510ebfd8 SHA1 877d03dd9131477e98721d0be2793b2886929628 SHA256 972ff0d734681495c17199fd0ffa29e5ebaa9d955e28406969362172b75eebe1
-EBUILD rb_libtorrent-0.15.3.ebuild 2082 RMD160 14f01f42e80669b70c5801927faa07c72a66f03a SHA1 70c4f863a64ddf2b7c532fea053bc8edfac1227f SHA256 88f037c696a5b8b4ac7cd0f8a0a84d2234b10cf863babf2f6ffc8584b36d3f37
 EBUILD rb_libtorrent-0.15.4.ebuild 2107 RMD160 79269e6edaece6c747aa967a7206c4be3d982a89 SHA1 4f076f0ec6d2f60b4c5b3bdc5df89ddf6aef8515 SHA256 0ab999effa1f1e0f0d509d6206efb0f222de301d95b2f1110ff6ec130d6e1d74
-MISC ChangeLog 17273 RMD160 e9d940446e4226465c63b246c25ebc5c6992ad20 SHA1 b2380566afc11a17a8d225f3040e86cda935c7dc SHA256 2efdaa20fbc8a1e0e9d9bb455afc1ae5ccaeb24c61f05e3f0ee1c0fea4b6512b
-MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
+EBUILD rb_libtorrent-0.15.5.ebuild 2107 RMD160 67b4dea44906df291dbc68e6ff63a864a2ceb556 SHA1 2c6bf81c3c4dc520a8616635bd3aaa7e2d71554b SHA256 fe76330c9ec47b0ae15839b7a4302093876d74cf6a60a4aacc40ae1a401db6fb
+MISC ChangeLog 17474 RMD160 485404cfc55d9c53a79fa99793605365a0dedbc0 SHA1 4e2ca3612cb9597eea9ca15d256f3393c452d9d8 SHA256 f8f28ba8deaf6176450d4a33a92a0fbc7a86100e3a18f3ed849ec42f6203e489
+MISC metadata.xml 279 RMD160 fee9ba43ed5741d59ca721d799c0580f00cc71ef SHA1 093f218c86045f1c60aebde8a54cb673dee8f7f7 SHA256 36618b123d1f4f5b758e481463ea56c0d2a61230f223ccb4a8f1cc2ed4d01584
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0lrSgACgkQ9/cejkQaxBDhIwCfVc3EFfopjYGrLY5a542vYIjM
-V9cAnRaeM/KVVZQT1bjY/JMKT98I1qtI
-=qwQU
+iEUEARECAAYFAk0oUrwACgkQ9/cejkQaxBCbugCY37gp1hOr3ZWOtSzJV/yx8A3o
++QCdEbIYfMMHyaPz6p2i+QoYpgJfAkg=
+=sJyp
 -----END PGP SIGNATURE-----
diff --git a/net-libs/rb_libtorrent/metadata.xml b/net-libs/rb_libtorrent/metadata.xml
index ffa9c3a4a3dd..d9be487a044c 100644
--- a/net-libs/rb_libtorrent/metadata.xml
+++ b/net-libs/rb_libtorrent/metadata.xml
@@ -3,4 +3,8 @@
 <pkgmetadata>
   <herd>net-p2p</herd>
   <herd>qt</herd>
+  <maintainer>
+  	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.0.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.0.ebuild
deleted file mode 100644
index f13ce94263b0..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 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.15.0.ebuild,v 1.2 2010/11/11 15:27:23 ssuominen Exp $
-
-EAPI="2"
-inherit autotools eutils flag-o-matic 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 ~x86 ~x86-fbsd"
-IUSE="debug doc examples python"
-RESTRICT="test"
-
-DEPEND="|| ( >=dev-libs/boost-1.35
-		( ~dev-libs/boost-1.34.1 dev-cpp/asio ) )
-	python? ( >=dev-libs/boost-1.35.0-r5[python] dev-lang/python:2.6[threads] )
-	>=sys-devel/libtool-2.2
-	sys-libs/zlib
-	examples? ( !net-p2p/mldonkey )"  #292998
-RDEPEND="${DEPEND}"
-
-#src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-0.14.9-as-needed-fix.patch  #276873
-	#epatch "${FILESDIR}"/${PN}-0.14.8-boost-detect.patch   #295474
-	#rm ltmain.sh  #298069
-	#eautoreconf
-#}
-
-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"
-
-	# 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="/usr/include/boost-${BOOST_VER}"
-	BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}"
-
-	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} \
-		--with-boost=${BOOST_INC} \
-		--with-boost-libdir=${BOOST_LIB} \
-		${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.15.3.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild
index 725062c35a24..e9a67d1e8841 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.3.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2011 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.15.3.ebuild,v 1.5 2011/01/06 11:53:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild,v 1.1 2011/01/08 12:05:23 hwoarang Exp $
 
 EAPI="2"
-WANT_AUTOMAKE="1.11.1"
-inherit autotools eutils versionator
+inherit eutils versionator
 
 MY_P=${P/rb_/}
 MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -17,7 +16,7 @@ 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"
+IUSE="debug doc examples python ssl"
 RESTRICT="test"
 
 DEPEND=">=dev-libs/boost-1.36
@@ -26,7 +25,9 @@ DEPEND=">=dev-libs/boost-1.36
 		dev-lang/python:2.7[threads] ) )
 	>=sys-devel/libtool-2.2
 	sys-libs/zlib
-	examples? ( !net-p2p/mldonkey )"  #292998
+	examples? ( !net-p2p/mldonkey )
+	ssl? ( dev-libs/openssl )"
+
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -44,12 +45,13 @@ src_configure() {
 	BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}"
 
 	local LOGGING
-	use debug && LOGGING="--with-logging=verbose"
+	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) \
 		--with-zlib=system \
 		${LOGGING} \
 		--with-boost=${BOOST_INC} \