commit: ec8fdb57666d2f8caa61ddfc6f2f86c1064aa3f6 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Mar 9 17:00:40 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Mar 9 17:00:58 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec8fdb57
net-libs/rb_libtorrent: Removed old. Package-Manager: portage-2.2.27 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> net-libs/rb_libtorrent/Manifest | 3 - .../rb_libtorrent-1.0.6-fix-debug-build.patch | 26 --- ..._libtorrent-1.0.6-remove-parse-hash-fails.patch | 185 --------------------- net-libs/rb_libtorrent/rb_libtorrent-1.0.4.ebuild | 75 --------- net-libs/rb_libtorrent/rb_libtorrent-1.0.5.ebuild | 75 --------- net-libs/rb_libtorrent/rb_libtorrent-1.0.6.ebuild | 80 --------- 6 files changed, 444 deletions(-) diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest index 7c9bbd5..eece58d 100644 --- a/net-libs/rb_libtorrent/Manifest +++ b/net-libs/rb_libtorrent/Manifest @@ -1,8 +1,5 @@ DIST libtorrent-rasterbar-0.16.17.tar.gz 3018881 SHA256 67a1d29c626d991d6e39c2f9828ca70c4053d057070ce01fff9b4ad37e64aff0 SHA512 532b2438e24c3ecad239480a1bd6241a0d73d40f8d5bdcf61ddfcee1a41f1644c9004d4f234968efd50158224219b78852ec936a05b75b15f3442b594460cdd6 WHIRLPOOL 755e201741ed77cf91cb0976cbaa83c645647341d2cfe40564552599f2792ba76bd02e82a94669d80b199f1a1d6290824686d2bb52d6b0da8663d2274176f3eb DIST libtorrent-rasterbar-0.16.19.tar.gz 3030253 SHA256 9ebd3fa8accfa27d0c81cdbbe15d7b411ea1deec34ac6325dec7197f05d82982 SHA512 8e605802cb1ae80228d253adba44da6f5af39e7d65c59f65e15444ed1122500529ee068f6d3608b1c2a249f18b4de695073f7b67772fa445618757697d779340 WHIRLPOOL 4429d07bd95f398a09f283a7cbcf6611aeb8ac5d2b8ed76d98f89d601aa6ed66e6eb8f044b351fad6cca3606351ccc67081dba7c8dd8d9c3c433eae84aedeb2c -DIST libtorrent-rasterbar-1.0.4.tar.gz 3297242 SHA256 1f567823133b1493b9717afc8334eed691bf0ab452d4a2e0f644989f13ce9db0 SHA512 1917d1207171d23dbcbbb17f0c3afdadcec059e8e603e2009bb72a610be598f2ff5a5ebdfc5a1b0e07563a05e774b395e24e04fabb17847b6a757f47f41a2313 WHIRLPOOL acbb9658d80f42bc6fe00cbe491e58bc059b6eeb96c0e34f7c86ad549104dabc4c9e2df5c931fd719f064bff6c4d06376022cf0e221034fc5e88af88d258f8f1 -DIST libtorrent-rasterbar-1.0.5.tar.gz 3302804 SHA256 474a43da2147bec7e333c10f70b07221f4732dd67e071d5e90acc7edb8f657b0 SHA512 1ec54dfac1555ac1a843d12e239d781e940ef81ca13a943c58812b0fb62686e89bc5e0135feb94267fb624077cb0ad9971d496d8474b91f3687ef3b90a524df6 WHIRLPOOL a84f7895fdfda2020630c387eedd9b5a82ddc51af6b35fe8a2e7216495baaf9901a58ef2335c254fa3c2e0c713c7e6a1d9f976984fa5998329e47bc95ae22a63 -DIST libtorrent-rasterbar-1.0.6.tar.gz 3307491 SHA256 c97de804b77f44591801631aca3869567671df2d3e2afe7f5453d8db2478fd61 SHA512 798529f877dc94aa8eb635677a2fffb6deead3937153e78ac5344fd81422f9fd9594e227db3ec0ae954dfc59e4dd5f3b8f6dbed2e3aa1f9a710c32b0622f54ee WHIRLPOOL 250651925c4d09b6e73c3c3e4b1e1f9131b49dbf3bdbeda3d683f204d4cebbcb865b694aa5e079072a73be922a25a2378094744bf4dd3bc4e220e9b0115342b6 DIST libtorrent-rasterbar-1.0.7.tar.gz 3298005 SHA256 3e16e024b175fefada17471c659fdbcfab235f9619d4f0913faa13cb02ca8d83 SHA512 d60736af4b7c38317821810995dd9bec21688a9506e9b908394c2a1a87acd2abf23000856dedcad487b9ecc7b5680f83cfc09ff9db79af00fe21e94337daeacf WHIRLPOOL aff289e3ca85eedf688e8a898f0164a4d692e8c813b04dbae6323bc56003f5c3af862167a1d00a8bfe193dfda15d20a18a48bcbeac9313e29d6f2de35d20e621 DIST rb_libtorrent-1.0.8.tar.gz 2977324 SHA256 24498625d946b80b2269789fb666196240fe805a0b6417d83d1f4dd9ee5f9a7a SHA512 7ab98712225e19224c969fe4c6cd2f21f0aff3f5130dc1b3a0ea1b339b23b3cd303e76aeec9ac23e253c77865c60fd6623f7c8cd4e336c5a16fdf3d4627b88e2 WHIRLPOOL 23c3f84f304e642c7c25239a8a209d37afde41454f8688ef1b24c680d0d268e9163244dc06b973a49a8173f7e1cd7b7bf4f359fb89294cee5868060a64dbb2eb DIST rb_libtorrent-1.0.9.tar.gz 2977503 SHA256 f4eadcbc779edc590d0162b0188c1b179d2cc72519c3756989ef925e376ddecd SHA512 0980ebb5567310ad6f235899770cfc7a23ef754f5a8513e1baa8bbec139ff26006a6b47a1cca62e45da496b901c6646eee3dd76ab4bb5410ce3fc119e717c072 WHIRLPOOL 7c6862d9d4fbc27d6de04cba8ac605dbffafcf1b26a3519bc94964727416655450b74cb62928f27fa568dcc163c8a599ca78f080a86171b6e1283d9b794924b8 diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.6-fix-debug-build.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.6-fix-debug-build.patch deleted file mode 100644 index 62429e7..0000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.6-fix-debug-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -Signed-off-by: Markos Chandras <[email protected]> -X-Gentoo-Bug: 559728 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=559728 - -From 06ce6a2d8b048c5791e2cc5acd1dfe8845680a84 Mon Sep 17 00:00:00 2001 -From: Chocobo1 <[email protected]> -Date: Sat, 1 Aug 2015 20:29:43 +0800 -Subject: [PATCH] Fix typo - ---- - src/torrent.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/torrent.cpp b/src/torrent.cpp -index d2da131..2e276ec 100644 ---- a/src/torrent.cpp -+++ b/src/torrent.cpp -@@ -675,7 +675,7 @@ namespace libtorrent - } - - #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING -- debug_log("*** LEAVING SEED MODE (%s)", seed ? "as seed" : "as non-seed"); -+ debug_log("*** LEAVING SEED MODE (%s)", m_seed_mode ? "as seed" : "as non-seed"); - #endif - m_seed_mode = false; - // seed is false if we turned out not diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.6-remove-parse-hash-fails.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.6-remove-parse-hash-fails.patch deleted file mode 100644 index 53ba0b8..0000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.6-remove-parse-hash-fails.patch +++ /dev/null @@ -1,185 +0,0 @@ -X-Gentoo-Bug: 550252 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=550252 -Upstream report: https://github.com/arvidn/libtorrent/issues/157 -[markos]: Merge commits -Signed-off-by: Markos Chandras <[email protected]> - -From 61a896035782436d5a8cceef1fc997e97ebbe019 Mon Sep 17 00:00:00 2001 -From: arvidn <[email protected]> -Date: Sat, 12 Sep 2015 09:54:40 -0400 -Subject: [PATCH] remove parse_hash_fails.cpp - -From 21e908ed1ea661c41e836230b8cf066688038d2b Mon Sep 17 00:00:00 2001 -From: arvidn <[email protected]> -Date: Sat, 12 Sep 2015 09:56:30 -0400 -Subject: [PATCH] remove parse_hash_fails from Jamfile also ---- - tools/Makefile.am | 2 - - tools/parse_hash_fails.cpp | 104 -------------------------------------------- - tools/parse_request_log.cpp | 5 ++- - tools/Jamfile | 1 - - 4 files changed, 5 insertions(+), 108 deletions(-) - delete mode 100644 tools/parse_hash_fails.cpp - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 0e41abd..4d90a78 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -1,5 +1,4 @@ - tool_programs = \ -- parse_hash_fails \ - parse_request_log - - if ENABLE_EXAMPLES -@@ -25,7 +24,6 @@ EXTRA_DIST = Jamfile \ - run_regression_tests.py\ - run_tests.py - --parse_hash_fails_SOURCES = parse_hash_fails.cpp - parse_request_log_SOURCES = parse_request_log.cpp - - LDADD = $(top_builddir)/src/libtorrent-rasterbar.la -diff --git a/tools/parse_hash_fails.cpp b/tools/parse_hash_fails.cpp -deleted file mode 100644 -index f686c5e..0000000 ---- a/tools/parse_hash_fails.cpp -+++ /dev/null -@@ -1,104 +0,0 @@ --/* -- --Copyright (c) 2012, Arvid Norberg --All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions --are met: -- -- * Redistributions of source code must retain the above copyright -- notice, this list of conditions and the following disclaimer. -- * Redistributions in binary form must reproduce the above copyright -- notice, this list of conditions and the following disclaimer in -- the documentation and/or other materials provided with the distribution. -- * Neither the name of the author nor the names of its -- contributors may be used to endorse or promote products derived -- from this software without specific prior written permission. -- --THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" --AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE --IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE --ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE --LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS --INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN --CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) --ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --POSSIBILITY OF SUCH DAMAGE. -- --*/ -- --#include <stdlib.h> --#include <string> --#include <cstring> --#include "libtorrent/file.hpp" -- --using namespace libtorrent; -- --void print_usage() --{ -- fprintf(stderr, "usage: parse_hash_fails log-directory\n"); -- exit(1); --} -- --int main(int argc, char* argv[]) --{ -- if (argc != 2) print_usage(); -- -- error_code ec; -- directory d(argv[1], ec); -- if (ec) -- { -- fprintf(stderr, "failed to open directory: %s\n%s\n" -- , argv[1], ec.message().c_str()); -- return 1; -- } -- -- for (; !d.done(); d.next(ec)) -- { -- if (ec) -- { -- fprintf(stderr, "error listing directory: %s\n", ec.message().c_str()); -- return 1; -- } -- std::string filename = d.file(); -- char hash[41]; -- int piece; -- int block; -- char state[10]; // good, bad -- if (sscanf(filename.c_str(), "%40s_%d_%d_%4s.block", hash, &piece, &block, state) != 4) -- { -- fprintf(stderr, "no match: %s\n", filename.c_str()); -- continue; -- } -- -- if (strcmp(state, "good") != 0) continue; -- -- char target_filename[1024]; -- snprintf(target_filename, sizeof(target_filename), "%s_%d_%d.diff", hash, piece, block); -- -- fprintf(stderr, "diffing %s\n", filename.c_str()); -- char cmdline[2048]; -- snprintf(cmdline, sizeof(cmdline), "xxd %s >temp_good", combine_path(argv[1], filename).c_str()); -- system(cmdline); -- snprintf(cmdline, sizeof(cmdline), "xxd %s/%s_%d_%d_bad.block >temp_bad", argv[1], hash, piece, block); -- system(cmdline); -- snprintf(cmdline, sizeof(cmdline), "diff -y temp_good temp_bad | colordiff >%s" -- , combine_path(argv[1], target_filename).c_str()); -- system(cmdline); -- } -- -- FILE* log_file = fopen(argv[1], "r"); -- if (log_file == 0) -- { -- fprintf(stderr, "failed to open logfile: %s\n%d: %s\n" -- , argv[1], errno, strerror(errno)); -- return 1; -- } -- -- return 0; --} -- -- -diff --git a/tools/parse_request_log.cpp b/tools/parse_request_log.cpp -index c719f65..8394918 100644 ---- a/tools/parse_request_log.cpp -+++ b/tools/parse_request_log.cpp -@@ -30,13 +30,16 @@ POSSIBILITY OF SUCH DAMAGE. - - */ - --#include "libtorrent/file.hpp" -+#include "libtorrent/config.hpp" - #include "libtorrent/io.hpp" - #include <cstring> - #include <boost/bind.hpp> - #include <stdlib.h> - #include <map> - #include <vector> -+#include <assert.h> -+#include <stdio.h> -+#include <errno.h> - - using namespace libtorrent; - using namespace libtorrent::detail; // for write_* and read_* -diff --git a/tools/Jamfile b/tools/Jamfile -index 69ee424..0c156d0 100644 ---- a/tools/Jamfile -+++ b/tools/Jamfile -@@ -33,7 +33,6 @@ project tools - <link>static - ; - --exe parse_hash_fails : parse_hash_fails.cpp ; - exe parse_request_log : parse_request_log.cpp ; - exe dht : dht_put.cpp : <include>../ed25519/src ; - diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.4.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.4.ebuild deleted file mode 100644 index e683398..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.4.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4} ) -PYTHON_REQ_USE="threads" -DISTUTILS_OPTIONAL=true -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils multilib distutils-r1 - -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://libtorrent.org"; -SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc examples python ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/boost-1.53:=[threads] - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl:0= ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost[python,${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2" - -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.2-python.patch ) - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_configure() { - local myeconfargs=( - --disable-silent-rules # bug 441842 - --with-boost-libdir=/usr/$(get_libdir) - $(use_enable debug) - $(use_enable test tests) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable python python-binding) - $(usex debug "--enable-logging=verbose" "") - ) - - use python && python_setup - - autotools-utils_src_configure - use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure -} - -src_compile() { - autotools-utils_src_compile - use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS=( "${S}"/docs/. ) - - autotools-utils_src_install - use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.5.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.5.ebuild deleted file mode 100644 index 4d7b03a..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4} ) -PYTHON_REQ_USE="threads" -DISTUTILS_OPTIONAL=true -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils multilib distutils-r1 - -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://libtorrent.org"; -SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc examples python ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/boost-1.53:=[threads] - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl:0= ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2" - -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.2-python.patch ) - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_configure() { - local myeconfargs=( - --disable-silent-rules # bug 441842 - --with-boost-libdir=/usr/$(get_libdir) - $(use_enable debug) - $(use_enable test tests) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable python python-binding) - $(usex debug "--enable-logging=verbose" "") - ) - - use python && python_setup - - autotools-utils_src_configure - use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure -} - -src_compile() { - autotools-utils_src_compile - use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS=( "${S}"/docs/. ) - - autotools-utils_src_install - use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.6.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.6.ebuild deleted file mode 100644 index 5d8c19f..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.6.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4} ) -PYTHON_REQ_USE="threads" -DISTUTILS_OPTIONAL=true -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils multilib distutils-r1 versionator - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -MY_PV=$(replace_all_version_separators '_' ) -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://libtorrent.org"; -SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${MY_P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc examples python ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/boost-1.53:=[threads] - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl:0= ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.2-python.patch - "${FILESDIR}"/${P}-fix-debug-build.patch - "${FILESDIR}"/${P}-remove-parse-hash-fails.patch -) - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_configure() { - local myeconfargs=( - --disable-silent-rules # bug 441842 - --with-boost-libdir=/usr/$(get_libdir) - $(use_enable debug) - $(use_enable test tests) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable python python-binding) - $(usex debug "--enable-logging=verbose" "") - ) - - use python && python_setup - - autotools-utils_src_configure - use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure -} - -src_compile() { - autotools-utils_src_compile - use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS=( "${S}"/docs/. ) - - autotools-utils_src_install - use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install -}
