commit: bc9ea9e85015d67899da49050f1f669b87e1e923 parent: 658b4704352acd246f80d7d7fa3113eb6e897786 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Wed, 24 Oct 2018 03:21:53 +0200 net-libs/libtorrent: removeDiffstat:
18 files changed, 0 insertions(+), 553 deletions(-)
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest @@ -1 +0,0 @@ -DIST libtorrent-0.13.6.tar.gz 781253 BLAKE2B f5293309b0e6b64a3659ea839528f94b346e1698f6892383b11f30b6d10d161d88582159ac9f4b1864d47e5f8c84cb3830376dde531d84c47327e7c342c75bbb SHA512 b8aea4060357a8a40d15d42f1f698ef6f3ebdc885000bfbfa5bf9c81af8c88b5503a107e05c214e3e8489126928d336356c5e7e0eaf836b6b84a3cf74633b050 diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-462f358f_fixed_c++11_issues.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-462f358f_fixed_c++11_issues.patch @@ -1,142 +0,0 @@ -commit 462f358f8fb3f842c2086b96d396c7d27736add9 -Author: rakshasa <sundell.software@gmail.com> -Date: Tue May 13 21:40:48 2014 +0900 - - Fixed C++11 issues. - - Note: Backported to librtorrent-0.13.5-r1 by Haelwenn (lanodan) Monnier - -diff --git a/src/data/memory_chunk.cc b/src/data/memory_chunk.cc -index 1c31fb08..b30a4035 100644 ---- a/src/data/memory_chunk.cc -+++ b/src/data/memory_chunk.cc -@@ -56,6 +56,22 @@ namespace torrent { - - uint32_t MemoryChunk::m_pagesize = getpagesize(); - -+const int MemoryChunk::sync_sync; -+const int MemoryChunk::sync_async; -+const int MemoryChunk::sync_invalidate; -+ -+const int MemoryChunk::prot_exec; -+const int MemoryChunk::prot_read; -+const int MemoryChunk::prot_write; -+const int MemoryChunk::prot_none; -+const int MemoryChunk::map_shared; -+ -+const int MemoryChunk::advice_normal; -+const int MemoryChunk::advice_random; -+const int MemoryChunk::advice_sequential; -+const int MemoryChunk::advice_willneed; -+const int MemoryChunk::advice_dontneed; -+ - inline void - MemoryChunk::align_pair(uint32_t* offset, uint32_t* length) const { - *offset += page_align(); -diff --git a/src/protocol/request_list.cc b/src/protocol/request_list.cc -index e963f9f2..a4338bcb 100644 ---- a/src/protocol/request_list.cc -+++ b/src/protocol/request_list.cc -@@ -52,6 +52,8 @@ - - namespace torrent { - -+const int request_list_constants::bucket_count; -+ - const instrumentation_enum request_list_constants::instrumentation_added[bucket_count] = { - INSTRUMENTATION_TRANSFER_REQUESTS_QUEUED_ADDED, - INSTRUMENTATION_TRANSFER_REQUESTS_UNORDERED_ADDED, -diff --git a/src/torrent/utils/signal_bitfield.cc b/src/torrent/utils/signal_bitfield.cc -index 44029496..82f81e7c 100644 ---- a/src/torrent/utils/signal_bitfield.cc -+++ b/src/torrent/utils/signal_bitfield.cc -@@ -42,6 +42,8 @@ - - namespace torrent { - -+const unsigned int signal_bitfield::max_size; -+ - // Only the thread owning this signal bitfield should add signals. - unsigned int - signal_bitfield::add_signal(slot_type slot) { -diff --git a/test/torrent/tracker_list_test.cc b/test/torrent/tracker_list_test.cc -index a23bbde6..55e141af 100644 ---- a/test/torrent/tracker_list_test.cc -+++ b/test/torrent/tracker_list_test.cc -@@ -101,8 +101,8 @@ tracker_list_test::test_enable() { - int enabled_counter = 0; - int disabled_counter = 0; - -- tracker_list.slot_tracker_enabled() = std::bind(&increment_value, &enabled_counter); -- tracker_list.slot_tracker_disabled() = std::bind(&increment_value, &disabled_counter); -+ tracker_list.slot_tracker_enabled() = std::bind(&increment_value, &enabled_counter); -+ tracker_list.slot_tracker_disabled() = std::bind(&increment_value, &disabled_counter); - - TRACKER_INSERT(0, tracker_0); - TRACKER_INSERT(1, tracker_1); -diff --git a/test/torrent/tracker_list_test.h b/test/torrent/tracker_list_test.h -index cd5bda88..39fc7c19 100644 ---- a/test/torrent/tracker_list_test.h -+++ b/test/torrent/tracker_list_test.h -@@ -110,10 +110,10 @@ bool check_has_active_in_group(const torrent::TrackerList* tracker_list, const c - int failure_counter = 0; \ - int scrape_success_counter = 0; \ - int scrape_failure_counter = 0; \ -- tracker_list.slot_success() = std::bind(&increment_value, &success_counter); \ -- tracker_list.slot_failure() = std::bind(&increment_value, &failure_counter); \ -- tracker_list.slot_scrape_success() = std::bind(&increment_value, &scrape_success_counter); \ -- tracker_list.slot_scrape_failure() = std::bind(&increment_value, &scrape_failure_counter); -+ tracker_list.slot_success() = std::bind(&increment_value, &success_counter); \ -+ tracker_list.slot_failure() = std::bind(&increment_value, &failure_counter); \ -+ tracker_list.slot_scrape_success() = std::bind(&increment_value, &scrape_success_counter); \ -+ tracker_list.slot_scrape_failure() = std::bind(&increment_value, &scrape_failure_counter); - - #define TRACKER_INSERT(group, name) \ - TrackerTest* name = new TrackerTest(&tracker_list, ""); \ -diff --git a/test/torrent/utils/signal_bitfield_test.cc b/test/torrent/utils/signal_bitfield_test.cc -index f91d8640..32e2caaa 100644 ---- a/test/torrent/utils/signal_bitfield_test.cc -+++ b/test/torrent/utils/signal_bitfield_test.cc -@@ -32,7 +32,7 @@ utils_signal_bitfield_test::tearDown() { - } - - static bool --verify_did_internal_error(tr1::function<void ()> func, bool should_throw) { -+verify_did_internal_error(std::function<unsigned int ()> func, bool should_throw) { - bool did_throw = false; - - try { -diff --git a/test/torrent/utils/test_queue_buckets.cc b/test/torrent/utils/test_queue_buckets.cc -index 0f5da728..a32d17e7 100644 ---- a/test/torrent/utils/test_queue_buckets.cc -+++ b/test/torrent/utils/test_queue_buckets.cc -@@ -19,6 +19,8 @@ struct test_constants { - static void destroy(Type& obj); - }; - -+const int test_constants::bucket_count; -+ - const torrent::instrumentation_enum test_constants::instrumentation_added[bucket_count] = { - torrent::INSTRUMENTATION_TRANSFER_REQUESTS_QUEUED_ADDED, - torrent::INSTRUMENTATION_TRANSFER_REQUESTS_UNORDERED_ADDED -diff --git a/test/torrent/utils/thread_base_test.cc b/test/torrent/utils/thread_base_test.cc -index b731c2dc..5cb7553f 100644 ---- a/test/torrent/utils/thread_base_test.cc -+++ b/test/torrent/utils/thread_base_test.cc -@@ -10,7 +10,15 @@ - - CPPUNIT_TEST_SUITE_REGISTRATION(utils_thread_base_test); - --namespace tr1 { using namespace std; } -+const int thread_test::test_flag_pre_stop; -+const int thread_test::test_flag_long_timeout; -+ -+const int thread_test::test_flag_acquire_global; -+const int thread_test::test_flag_has_global; -+ -+const int thread_test::test_flag_do_work; -+const int thread_test::test_flag_pre_poke; -+const int thread_test::test_flag_post_poke; - - void throw_shutdown_exception() { throw torrent::shutdown_exception(); } - diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-clangpatch-src_torrent_utils_log_cc.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-clangpatch-src_torrent_utils_log_cc.patch @@ -1,38 +0,0 @@ -diff --git a/src/torrent/utils/log.cc b/src/torrent/utils/log.cc -index a97b6064..0549e3ca 100644 ---- a/src/torrent/utils/log.cc -+++ b/src/torrent/utils/log.cc -@@ -187,17 +187,14 @@ log_group::internal_print(const HashString* hash, cons - return; - - pthread_mutex_lock(&log_mutex); -- std::for_each(m_first, m_last, std::bind(&log_slot::operator(), -- std::placeholders::_1, -- buffer, -- std::distance(buffer, first), -- std::distance(log_groups.begin(), this))); -+ -+ for (log_slot *it = m_first; it != m_last; ++it) -+ (*it)(buffer, std::distance(buffer, first), -+ std::distance(log_groups.begin(), this)); -+ - if (dump_data != NULL) -- std::for_each(m_first, m_last, std::bind(&log_slot::operator(), -- std::placeholders::_1, -- (const char*)dump_data, -- dump_size, -- -1)); -+ for (log_slot *it = m_first; it != m_last; ++it) -+ (*it)((const char*)dump_data, dump_size, -1); - pthread_mutex_unlock(&log_mutex); - } - -@@ -250,7 +246,7 @@ void - log_cleanup() { - pthread_mutex_lock(&log_mutex); - -- log_groups.assign(log_group()); -+ std::fill(log_groups.begin(), log_groups.end(), log_group()); - log_outputs.clear(); - log_children.clear(); - diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-clangpatch-src_utils_queue_buckets_h.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-clangpatch-src_utils_queue_buckets_h.patch @@ -1,15 +0,0 @@ -$OpenBSD: clangpatch-src_utils_queue_buckets_h,v 1.1 2017/05/19 12:26:43 espie Exp $ -proper typing, from FreeBSD - -Index: src/utils/queue_buckets.h ---- src/utils/queue_buckets.h.orig -+++ src/utils/queue_buckets.h -@@ -251,7 +251,7 @@ queue_buckets<Type, Constants>::destroy(int idx, itera - instrumentation_update(constants::instrumentation_total[idx], -difference); - - // Consider moving these to a temporary dequeue before releasing: -- std::for_each(begin, end, std::function<void (value_type)>(&constants::template destroy<value_type>)); -+ std::for_each(begin, end, std::function<void (value_type&)>(&constants::template destroy<value_type>)); - queue_at(idx).erase(begin, end); - } - diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-configure.ac_cppunit_use_pkg-config.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-configure.ac_cppunit_use_pkg-config.patch @@ -1,27 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ba994ee..9920186 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO) - - AM_INIT_AUTOMAKE - AC_CONFIG_HEADERS(config.h) --AM_PATH_CPPUNIT(1.9.6) - - AC_PROG_CXX - -@@ -58,9 +57,11 @@ CC_ATTRIBUTE_VISIBILITY - AX_PTHREAD - AX_CHECK_ZLIB - --CFLAGS="$PTHREAD_CFLAGS $CFLAGS" --CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS" --LIBS="$PTHREAD_LIBS $LIBS" -+PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"]) -+ -+CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS" -+CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS" -+LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS" - - AC_ARG_ENABLE(openssl, - [ --disable-openssl Don't use OpenSSL's SHA1 implementation.], diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_net_socket_set_h.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_net_socket_set_h.patch @@ -1,20 +0,0 @@ -diff --git a/var/tmp/portage/net-libs/libtorrent-0.13.6-r1/work/libtorrent-0.13.6/./src/net/socket_set.h b/./src/net/socket_set.h -index 6581f26d..9264edf7 100644 ---- a/var/tmp/portage/net-libs/libtorrent-0.13.6-r1/work/libtorrent-0.13.6/./src/net/socket_set.h -+++ b/./src/net/socket_set.h -@@ -53,12 +53,12 @@ namespace torrent { - - // Propably should rename to EventSet... - --class SocketSet : private std::vector<Event*, rak::cacheline_allocator<> > { -+class SocketSet : private std::vector<Event*, rak::cacheline_allocator<Event*> > { - public: - typedef uint32_t size_type; - -- typedef std::vector<Event*, rak::cacheline_allocator<> > base_type; -- typedef std::vector<size_type, rak::cacheline_allocator<> > Table; -+ typedef std::vector<Event*, rak::cacheline_allocator<Event*> > base_type; -+ typedef std::vector<size_type, rak::cacheline_allocator<size_type> > Table; - - static const size_type npos = static_cast<size_type>(-1); - diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_common_h.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_common_h.patch @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_torrent_common_h,v 1.2 2017/05/19 22:25:53 espie Exp $ -comment says it all - -Index: src/torrent/common.h ---- src/torrent/common.h.orig -+++ src/torrent/common.h -@@ -109,4 +109,15 @@ class TransferList; - - } - -+// XXX tr1/array differs from array -+template<typename T, typename U> -+inline void fill_with_value(T& a, const U& v) -+{ -+#if __cplusplus >= 201103L -+ a.fill(v); -+#else -+ a.assign(v); -+#endif -+} -+ - #endif diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_data_block_failed_h.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_data_block_failed_h.patch @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_torrent_data_block_failed_h,v 1.2 2017/05/19 22:25:53 espie Exp $ -const reference has no useful semantics, shut up clang warning - -Index: src/torrent/data/block_failed.h ---- src/torrent/data/block_failed.h.orig -+++ src/torrent/data/block_failed.h -@@ -85,8 +85,8 @@ class BlockFailed : public std::vector<std::pair<char* - BlockFailed(const BlockFailed&); - void operator = (const BlockFailed&); - -- static void delete_entry(const reference e) { delete [] e.first; } -- static bool compare_entries(const reference e1, const reference e2) { return e1.second < e2.second; } -+ static void delete_entry(reference e) { delete [] e.first; } -+ static bool compare_entries(reference e1, reference e2) { return e1.second < e2.second; } - - size_type m_current; - }; diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_data_file_cc.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_data_file_cc.patch @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_torrent_data_file_cc,v 1.1 2017/05/19 22:25:53 espie Exp $ - -Index: src/torrent/data/file.cc ---- src/torrent/data/file.cc.orig -+++ src/torrent/data/file.cc -@@ -50,6 +50,15 @@ - - namespace torrent { - -+const int File::flag_active; -+const int File::flag_create_queued; -+const int File::flag_resize_queued; -+const int File::flag_fallocate; -+const int File::flag_previously_created; -+ -+const int File::flag_prioritize_first; -+const int File::flag_prioritize_last; -+ - File::File() : - m_fd(-1), - m_protection(0), diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_data_transfer_list_cc.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_data_transfer_list_cc.patch @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_torrent_data_transfer_list_cc,v 1.2 2017/05/19 22:25:53 espie Exp $ - -Index: src/torrent/data/transfer_list.cc ---- src/torrent/data/transfer_list.cc.orig -+++ src/torrent/data/transfer_list.cc -@@ -159,7 +159,7 @@ TransferList::hash_succeeded(uint32_t index, Chunk* ch - struct transfer_list_compare_data { - transfer_list_compare_data(Chunk* chunk, const Piece& p) : m_chunk(chunk), m_piece(p) { } - -- bool operator () (const BlockFailed::reference failed) { -+ bool operator () (BlockFailed::reference failed) { - return m_chunk->compare_buffer(failed.first, m_piece.offset(), m_piece.length()); - } - diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_download_cc.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_download_cc.patch @@ -1,26 +0,0 @@ -$OpenBSD: patch-src_torrent_download_cc,v 1.1 2017/05/19 22:25:53 espie Exp $ - -Index: src/torrent/download.cc ---- src/torrent/download.cc.orig -+++ src/torrent/download.cc -@@ -72,6 +72,20 @@ - - namespace torrent { - -+const int DownloadInfo::flag_open LIBTORRENT_EXPORT; -+const int DownloadInfo::flag_active LIBTORRENT_EXPORT; -+const int DownloadInfo::flag_compact LIBTORRENT_EXPORT; -+const int DownloadInfo::flag_accepting_new_peers LIBTORRENT_EXPORT; -+const int DownloadInfo::flag_accepting_seeders LIBTORRENT_EXPORT; -+const int DownloadInfo::flag_private LIBTORRENT_EXPORT; -+const int DownloadInfo::flag_meta_download LIBTORRENT_EXPORT; -+const int DownloadInfo::flag_pex_enabled LIBTORRENT_EXPORT; -+const int DownloadInfo::flag_pex_active LIBTORRENT_EXPORT; -+ -+const int DownloadInfo::public_flags; -+ -+const uint32_t DownloadInfo::unlimited; -+ - const DownloadInfo* Download::info() const { return m_ptr->info(); } - const download_data* Download::data() const { return m_ptr->data(); } - diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_peer_connection_list_cc.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_peer_connection_list_cc.patch @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_torrent_peer_connection_list_cc,v 1.1 2017/05/19 22:25:53 espie Exp $ - -Index: src/torrent/peer/connection_list.cc ---- src/torrent/peer/connection_list.cc.orig -+++ src/torrent/peer/connection_list.cc -@@ -60,6 +60,11 @@ - - namespace torrent { - -+const int ConnectionList::disconnect_available; -+const int ConnectionList::disconnect_quick; -+const int ConnectionList::disconnect_unwanted; -+const int ConnectionList::disconnect_delayed; -+ - ConnectionList::ConnectionList(DownloadMain* download) : - m_download(download), m_minSize(50), m_maxSize(100) { - } diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_utils_extents_h.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_utils_extents_h.patch @@ -1,45 +0,0 @@ -diff --git a/var/tmp/portage/net-libs/libtorrent-0.13.6-r1/work/libtorrent-0.13.6/src/torrent/utils/extents.h b/src/torrent/utils/extents.h -index 9fe8b0c2..8ec1e600 100644 ---- a/var/tmp/portage/net-libs/libtorrent-0.13.6-r1/work/libtorrent-0.13.6/src/torrent/utils/extents.h -+++ b/src/torrent/utils/extents.h -@@ -37,7 +37,8 @@ - #ifndef LIBTORRENT_UTILS_EXTENTS_H - #define LIBTORRENT_UTILS_EXTENTS_H - - #include <array> -+#include <algorithm> - - namespace torrent { - -@@ -50,10 +52,8 @@ struct extents_base { - - typedef std::array<mapped_type, TableSize> table_type; - -- extents_base(key_type pos, unsigned int mb, mapped_value_type val) : -- mask_bits(mb), position(pos) { table.assign(mapped_type(NULL, mapped_value_type())); } -- extents_base(extents_base* parent, typename table_type::const_iterator itr) : -- mask_bits(parent->mask_bits - TableBits), position(parent->partition_pos(itr)) { table.assign(mapped_type(NULL, itr->second)); } -+ extents_base(key_type pos, unsigned int mb, mapped_value_type val); -+ extents_base(extents_base* parent, typename table_type::const_iterator itr); - ~extents_base(); - - bool is_divisible(key_type key) const { return key % mask_bits == 0; } -@@ -106,6 +106,18 @@ public: - base_type* data() { return this; } - }; - -+template <typename Key, typename Tp, unsigned int TableSize, unsigned int TableBits> -+extents_base<Key, Tp, TableSize, TableBits>::extents_base(key_type pos, unsigned int mb, mapped_value_type val) : -+ mask_bits(mb), position(pos) { -+ std::fill(table.begin(), table.end(), mapped_type(NULL, mapped_value_type())); -+} -+ -+template <typename Key, typename Tp, unsigned int TableSize, unsigned int TableBits> -+extents_base<Key, Tp, TableSize, TableBits>::extents_base(extents_base* parent, typename table_type::const_iterator itr) : -+ mask_bits(parent->mask_bits - TableBits), position(parent->partition_pos(itr)) { -+ std::fill(table.begin(), table.end(), mapped_type(NULL, itr->second)); -+} -+ - template <typename Key, typename Tp, unsigned int MaskBits, unsigned int TableSize, unsigned int TableBits> - extents<Key, Tp, MaskBits, TableSize, TableBits>::extents() : - base_type(key_type(), mask_bits - table_bits, mapped_value_type()) diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_utils_net_h.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_torrent_utils_net_h.patch @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_torrent_utils_net_h,v 1.3 2017/05/19 22:25:53 espie Exp $ - -Add missing include. - -Index: src/torrent/utils/net.h ---- src/torrent/utils/net.h.orig -+++ src/torrent/utils/net.h -@@ -37,6 +37,7 @@ - #ifndef LIBTORRENT_UTILS_NET_H - #define LIBTORRENT_UTILS_NET_H - -+#include <sys/socket.h> - #include <netdb.h> - #include <functional> - diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_utils_instrumentation_h.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-patch-src_utils_instrumentation_h.patch @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_utils_instrumentation_h,v 1.2 2017/05/19 22:25:53 espie Exp $ -tr1/std difference, see header - -Index: src/utils/instrumentation.h ---- src/utils/instrumentation.h.orig -+++ src/utils/instrumentation.h -@@ -118,7 +118,7 @@ void instrumentation_reset(); - - inline void - instrumentation_initialize() { -- instrumentation_values.assign(int64_t()); -+ std::fill(instrumentation_values.begin(), instrumentation_values.end(), int64_t()); - } - - inline void diff --git a/net-libs/libtorrent/files/libtorrent-0.13.6-src_dht_dht_transaction_cc.patch b/net-libs/libtorrent/files/libtorrent-0.13.6-src_dht_dht_transaction_cc.patch @@ -1,28 +0,0 @@ -commit 620a70311df192d52957d635a9f2753b265ff61e -Author: rakshasa <sundell.software@gmail.com> -Date: Thu Mar 10 02:44:24 2016 +0900 - - Fixed minor C++ standard compliance issue. - -diff --git a/src/dht/dht_transaction.cc b/src/dht/dht_transaction.cc -index f876e70d..84ffc175 100644 ---- a/src/dht/dht_transaction.cc -+++ b/src/dht/dht_transaction.cc -@@ -46,14 +46,15 @@ - namespace torrent { - - DhtSearch::DhtSearch(const HashString& target, const DhtBucket& contacts) -- : base_type(dht_compare_closer(m_target = target)), -+ : base_type(dht_compare_closer(target)), - m_pending(0), - m_contacted(0), - m_replied(0), - m_concurrency(3), - m_restart(false), - m_started(false), -- m_next(end()) { -+ m_next(end()), -+ m_target(target) { - - add_contacts(contacts); - } diff --git a/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild @@ -1,82 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils libtool toolchain-funcs autotools flag-o-matic - -DESCRIPTION="BitTorrent library written in C++ for *nix" -HOMEPAGE="https://rakshasa.github.io/rtorrent/" -SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz" - -# OpenBSD patches may be under the ISC -LICENSE="GPL-2 ISC" - -# The README says that the library ABI is not yet stable and dependencies on -# the library should be an explicit, syncronized version until the library -# has had more time to mature. Until it matures we should not include a soname -# subslot. -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="debug ipv6 libressl ssl test" - -RDEPEND=" - sys-libs/zlib - >=dev-libs/libsigc++-2.2.2:2 - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-util/cppunit )" - -src_prepare() { - # I should probably move it to a PATCHES variable - - # Fix compiling with Clang by being C++11 - append-cxxflags "-std=c++11" - find "${WORKDIR}" -type f|xargs fgrep -lw tr1|xargs sed -i -e 's,<tr1/,<,' -e 's/std::tr1/std/g' -e 's/tr1::bind/std::bind/g' - epatch "${FILESDIR}/libtorrent-0.13.6-clangpatch-src_utils_queue_buckets_h.patch" - epatch "${FILESDIR}/libtorrent-0.13.6-clangpatch-src_torrent_utils_log_cc.patch" - epatch "${FILESDIR}/libtorrent-0.13.6-configure.ac_cppunit_use_pkg-config.patch" - epatch "${FILESDIR}/libtorrent-0.13.6-patch-src_utils_instrumentation_h.patch" - epatch "${FILESDIR}/libtorrent-0.13.6-patch-src_torrent_utils_extents_h.patch" - epatch "${FILESDIR}/libtorrent-0.13.6-patch-src_net_socket_set_h.patch" - - epatch "${FILESDIR}/libtorrent-0.13.6-462f358f_fixed_c++11_issues.patch" - - # static members must exist, even have external linkage for some, so that rtorrent can work - epatch \ - "${FILESDIR}/libtorrent-0.13.6-patch-src_torrent_common_h.patch" \ - "${FILESDIR}/libtorrent-0.13.6-patch-src_torrent_data_block_failed_h.patch" \ - "${FILESDIR}/libtorrent-0.13.6-patch-src_torrent_data_file_cc.patch" \ - "${FILESDIR}/libtorrent-0.13.6-patch-src_torrent_data_transfer_list_cc.patch" \ - "${FILESDIR}/libtorrent-0.13.6-patch-src_torrent_download_cc.patch" \ - "${FILESDIR}/libtorrent-0.13.6-patch-src_torrent_peer_connection_list_cc.patch" \ - "${FILESDIR}/libtorrent-0.13.6-patch-src_torrent_utils_net_h.patch" - - # Fixes a unassigned warning for a happy QA - epatch "${FILESDIR}/libtorrent-0.13.6-src_dht_dht_transaction_cc.patch" - - eautoreconf - default -} - -src_configure() { - # configure needs bash or script bombs out on some null shift, bug #291229 - CONFIG_SHELL=${BASH} econf \ - --enable-aligned \ - $(use_enable debug) \ - $(use_enable ipv6) \ - $(use_enable ssl openssl) \ - --disable-instrumentation \ - --with-posix-fallocate -} - -src_install() { - default - - prune_libtool_files --all -} diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>contact@hacktivis.me</email> - <name>Haelwenn (lanodan) Monnier</name> -</maintainer> -</pkgmetadata>