Remove old versions requiring boost that is no longer in tree. Cleanup old files.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

7 files changed, 10 insertions, 319 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 1acef5c2c04f..afcd00612bed 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,15 @@
 # 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.141 2012/11/21 20:47:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.142 2012/11/22 02:35:12 flameeyes Exp $
+
+  22 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/rb_libtorrent-0.14.12_boost-1.45.patch,
+  -files/rb_libtorrent-0.14.8-boost-detect.patch,
+  -files/rb_libtorrent-0.14.9-as-needed-fix.patch,
+  -files/rb_libtorrent-0.15.1-ax_pthread_asneeded.patch,
+  -rb_libtorrent-0.15.5.ebuild, -rb_libtorrent-0.15.9.ebuild:
+  Remove old versions requiring boost that is no longer in tree. Cleanup old
+  files.
 
   21 Nov 2012; Markos Chandras <hwoarang@gentoo.org>
   rb_libtorrent-0.16.5.ebuild:
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.12_boost-1.45.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.12_boost-1.45.patch
deleted file mode 100644
index 7dbf2304df2b..000000000000
--- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.12_boost-1.45.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libtorrent-rasterbar-0.14.12/include/libtorrent/udp_socket.hpp
-===================================================================
---- libtorrent-rasterbar-0.14.12.orig/include/libtorrent/udp_socket.hpp
-+++ libtorrent-rasterbar-0.14.12/include/libtorrent/udp_socket.hpp
-@@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
- #include "libtorrent/buffer.hpp"
- #include "libtorrent/session_settings.hpp"
- 
--#include <vector>
-+#include <list>
- #include <boost/function.hpp>
- #include <boost/thread/mutex.hpp>
- 
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.8-boost-detect.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.8-boost-detect.patch
deleted file mode 100644
index 6f557547a394..000000000000
--- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.8-boost-detect.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- m4/ax_boost_base-fixed.m4.orig	2010-01-16 00:10:19.000000000 +0100
-+++ m4/ax_boost_base-fixed.m4	2010-01-16 00:12:32.000000000 +0100
-@@ -89,7 +89,7 @@
- 	dnl or if you install boost with RPM
- 	if test "$ac_boost_path" != ""; then
- 		BOOST_LDFLAGS="-L$ac_boost_path/lib"
--		BOOST_CPPFLAGS="-I$ac_boost_path/include"
-+		BOOST_CPPFLAGS="-I$ac_boost_path"
- 	else
- 		for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
- 			if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
---- bindings/python/setup.py.in.orig	2010-01-16 00:14:36.000000000 +0100
-+++ bindings/python/setup.py.in	2010-01-16 00:15:15.000000000 +0100
-@@ -62,7 +62,7 @@
- source_list = os.listdir(os.path.join(os.path.dirname(__file__), "src"))
- source_list = [os.path.join("src", s) for s in source_list if s.endswith(".cpp")]
- 
--extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ @BOOST_SYSTEM_LIB@ @SSL_LDFLAGS@ @SSL_CXXFLAGS@'
-+extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ @BOOST_SYSTEM_LIB@ @SSL_LDFLAGS@ @SSL_CXXFLAGS@'
- 
- setup( name='python-libtorrent',
- 	version='@PACKAGE_VERSION@',
---- src/Makefile.am.orig	2010-01-16 00:16:08.000000000 +0100
-+++ src/Makefile.am	2010-01-16 00:17:16.000000000 +0100
-@@ -108,7 +108,7 @@
- $(top_srcdir)/include/libtorrent/version.hpp
- 
- 
--libtorrent_rasterbar_la_LDFLAGS = $(LDFLAGS) -version-info $(INTERFACE_VERSION_INFO)
-+libtorrent_rasterbar_la_LDFLAGS = $(LDFLAGS) -version-info $(INTERFACE_VERSION_INFO) @BOOST_LDFLAGS@
- libtorrent_rasterbar_la_LIBADD = @ZLIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@
- 
- AM_CXXFLAGS= -ftemplate-depth-100 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_CXXFLAGS@
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.9-as-needed-fix.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.9-as-needed-fix.patch
deleted file mode 100644
index fc18070f5286..000000000000
--- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.9-as-needed-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.orig	2010-02-19 08:03:57.000000000 +0100
-+++ configure.in	2010-03-24 01:04:37.000000000 +0100
-@@ -157,7 +157,6 @@
- 
- dnl Apply boost config.
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
--LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- 
- if [[ "x$BUILD_TESTCLIENT" != "xno" ]]; then
- 	CLIENT_TEST_BIN=client_test;
-@@ -519,6 +518,9 @@
- dnl Compile time options.
- AC_SUBST(COMPILETIME_OPTIONS)
- 
-+dnl Check for clock_gettime
-+AC_SEARCH_LIBS([clock_gettime],[rt])
-+
- AC_OUTPUT([Makefile
- 	   src/Makefile
- 	   include/Makefile
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.15.1-ax_pthread_asneeded.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.15.1-ax_pthread_asneeded.patch
deleted file mode 100644
index 3171d03ce309..000000000000
--- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.15.1-ax_pthread_asneeded.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-http://bugs.gentoo.org/247067
-
---- m4/ax_pthread.m4
-+++ m4/ax_pthread.m4
-@@ -266,6 +266,117 @@
-         else
-           PTHREAD_CC=$CC
- 	fi
-+
-+        # The next part tries to detect GCC inconsistency with -shared on some
-+        # architectures and systems. The problem is that in certain
-+        # configurations, when -shared is specified, GCC "forgets" to
-+        # internally use various flags which are still necessary.
-+
-+        #
-+        # Prepare the flags
-+        #
-+        save_LDFLAGS="$LDFLAGS"
-+        save_CFLAGS="$CFLAGS"
-+        save_LIBS="$LIBS"
-+        save_CC="$CC"
-+
-+        # Try with the flags determined by the earlier checks.
-+        #
-+        # -Wl,-z,defs forces link-time symbol resolution, so that the
-+        # linking checks with -shared actually have any value
-+        #
-+        # FIXME: -fPIC is required for -shared on many architectures,
-+        # so we specify it here, but the right way would probably be to
-+        # properly detect whether it is actually required.
-+        CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        CC="$PTHREAD_CC"
-+
-+        # In order not to create several levels of indentation, we test
-+        # the value of "$done" until we find the cure or run out of ideas.
-+        done="no"
-+
-+        # First, make sure the CFLAGS we added are actually accepted by our
-+        # compiler.  If not (and OS X's ld, for instance, does not accept -z),
-+        # then we can't do this test.
-+        if test x"$done" = xno; then
-+           AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies])
-+           AC_TRY_LINK(,, , [done=yes])
-+
-+           if test "x$done" = xyes ; then
-+              AC_MSG_RESULT([no])
-+           else
-+              AC_MSG_RESULT([yes])
-+           fi
-+        fi
-+
-+        if test x"$done" = xyes; then
-+           done="no"
-+           AC_MSG_CHECKING([whether -pthread is sufficient with -shared])
-+           AC_TRY_LINK([#include <pthread.h>],
-+              [pthread_t th; pthread_join(th, 0);
-+              pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+              pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+              [done=yes])
-+
-+           if test "x$done" = xyes; then
-+              AC_MSG_RESULT([yes])
-+           else
-+              AC_MSG_RESULT([no])
-+           fi
-+        fi
-+
-+        #
-+        # Linux gcc on some architectures such as mips/mipsel forgets
-+        # about -lpthread
-+        #
-+        if test x"$done" = xno; then
-+           AC_MSG_CHECKING([whether -lpthread fixes that])
-+           LIBS="-lpthread $PTHREAD_LIBS $save_LIBS"
-+           AC_TRY_LINK([#include <pthread.h>],
-+              [pthread_t th; pthread_join(th, 0);
-+              pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+              pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+              [done=yes])
-+
-+           if test "x$done" = xyes; then
-+              AC_MSG_RESULT([yes])
-+              PTHREAD_LIBS="-lpthread $PTHREAD_LIBS"
-+           else
-+              AC_MSG_RESULT([no])
-+           fi
-+        fi
-+        #
-+        # FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc
-+        #
-+        if test x"$done" = xno; then
-+           AC_MSG_CHECKING([whether -lc_r fixes that])
-+           LIBS="-lc_r $PTHREAD_LIBS $save_LIBS"
-+           AC_TRY_LINK([#include <pthread.h>],
-+               [pthread_t th; pthread_join(th, 0);
-+                pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+                pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+               [done=yes])
-+
-+           if test "x$done" = xyes; then
-+              AC_MSG_RESULT([yes])
-+              PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"
-+           else
-+              AC_MSG_RESULT([no])
-+           fi
-+        fi
-+        if test x"$done" = xno; then
-+           # OK, we have run out of ideas
-+           AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries])
-+
-+           # so it's not safe to assume that we may use pthreads
-+           acx_pthread_ok=no
-+        fi
-+
-+        CFLAGS="$save_CFLAGS"
-+        LIBS="$save_LIBS"
-+        CC="$save_CC"
-+
- else
-         PTHREAD_CC="$CC"
- fi
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild
deleted file mode 100644
index 95ea1ccf5705..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild
+++ /dev/null
@@ -1,60 +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.15.5.ebuild,v 1.9 2012/11/08 06:24:13 flameeyes Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2:2.6"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils 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="sparc"
-IUSE="debug doc examples python ssl"
-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}"
-
-src_configure() {
-	# use multi-threading versions of boost libs
-	local BOOST_LIBS="--with-boost-system=boost_system-mt \
-		--with-boost-filesystem=boost_filesystem-mt \
-		--with-boost-thread=boost_thread-mt \
-		--with-boost-python=boost_python-mt"
-
-	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) \
-		--with-zlib=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
-}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild
deleted file mode 100644
index 80ef3f2d3b19..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild
+++ /dev/null
@@ -1,70 +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.15.9.ebuild,v 1.8 2012/11/08 06:24:13 flameeyes Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2:2.6"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils 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="ppc64"
-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() {
-	use python && python_set_active_version 2
-}
-
-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-filesystem=boost_filesystem-mt \
-		--with-boost-thread=boost_thread-mt \
-		--with-boost-python=boost_python-mt"
-
-	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) \
-		--with-zlib=system \
-		${LOGGING} \
-		${BOOST_LIBS}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die 'emake install failed'
-	use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
-	dodoc ChangeLog AUTHORS NEWS README || die 'dodoc failed'
-	if use doc ; then
-		dohtml docs/* || die "Could not install HTML documentation"
-	fi
-}