diff options
author | Mikle Kolyada <zlogene@gentoo.org> | 2019-12-20 13:43:25 +0300 |
---|---|---|
committer | Mikle Kolyada <zlogene@gentoo.org> | 2019-12-20 13:43:25 +0300 |
commit | 7c0e633d611f109f006f68912afd07fc39882d87 (patch) | |
tree | 3a5c8463570e099e22e6c079af54079b972884b6 /net-libs/libtorrent-rasterbar | |
parent | net-libs/libtorrent-rasterbar: Drop old 1.1.x (diff) | |
download | gentoo-7c0e633d611f109f006f68912afd07fc39882d87.tar.gz gentoo-7c0e633d611f109f006f68912afd07fc39882d87.tar.bz2 gentoo-7c0e633d611f109f006f68912afd07fc39882d87.zip |
net-libs/libtorrent-rasterbar: Drop old 1.2.x
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Diffstat (limited to 'net-libs/libtorrent-rasterbar')
4 files changed, 0 insertions, 522 deletions
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest index d97b33ad66f8..4fd372278fac 100644 --- a/net-libs/libtorrent-rasterbar/Manifest +++ b/net-libs/libtorrent-rasterbar/Manifest @@ -1,5 +1,3 @@ DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19d0b416f909daf15078b1461ab6724ee086d3194f6c378c305174676a3399fc3e6cb23133faaa334ac5dfc9457fb597c65dad7d36 SHA512 021fc54353fdf5063d55ccdc2057dada292bb0008fb92e93e8d94dd89f529630f290fcdc4f4d095e3192522c57fe0f0da260b5ef8e8e15a8c6ac05728f5f7160 -DIST libtorrent-rasterbar-1.2.0.tar.gz 3546062 BLAKE2B a02ef8f273d8e6ec3b6f6a42d518f7cbba669f109f907e243bb90cd674009894b9edce2f355b52d77275f3fcd9537e9c26280f7b78dfbb1792f52d6c7f50f7da SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518 -DIST libtorrent-rasterbar-1.2.1.tar.gz 3562762 BLAKE2B 1978356ba00c07c4b89657ebe190b2aa4a938d22e5ab63844fb664312d60f761a07c42b9353f2f500fdf9a08afcb294a39bfb447d255d93b1a45ecc2be629ffe SHA512 a60e38c4c951756786ede69af1a5d56bf6293bcb7d235f0b7feda72f731bc163ea6a7401c4b5f5400b8ce236decff0ae3a1d5fe39c7f8f775e65031677f02074 DIST libtorrent-rasterbar-1.2.2.tar.gz 3584187 BLAKE2B 93c77544d4641122f0bd2b5c5f0577629fb7bdfc9e81bd54f7a849f5a477255adc699676516865c93610d24a830a26a0de45f10e50ce64ad6f0214c116f7754c SHA512 34dcf5421dfccbba78bdd30890b9c18b92fdee1a2e1693ada9b55b79a167730093862017581b9251a654b5517011dbe4c46b520b03b78aa86a909457f7edcf2c DIST libtorrent-rasterbar-1.2.3.tar.gz 3591081 BLAKE2B 9766a21c948997b35c6d209940a2d2cfd76b130f1a9d1f611e07d3eeb27f634a3c5eca12c92261139200084b9678913d85f6a56f98ab6894e5def761615c39ad SHA512 11a81c9f4b968ed360740553f8d856a2fad4eb2f6962f6403394e0a4a6b198ef6f04ce92d11fc6bed9aa979c84efd03fb396027dfe6603f394104b4302e04d82 diff --git a/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch b/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch deleted file mode 100644 index 25adcdedcea7..000000000000 --- a/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch +++ /dev/null @@ -1,295 +0,0 @@ -From 76c2794923c4c101ff715be11d794f7fefc6c524 Mon Sep 17 00:00:00 2001 -From: Arvid Norberg <arvid.norberg@gmail.com> -Date: Fri, 19 Apr 2019 20:56:19 +0200 -Subject: [PATCH] fix build with boost-1.70 (#3788) - -fix build with boost 1.70.0 Fix #3683 -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - include/libtorrent/io_service.hpp | 3 +++ - include/libtorrent/io_service_fwd.hpp | 13 +++++++++++-- - include/libtorrent/proxy_base.hpp | 2 +- - include/libtorrent/tracker_manager.hpp | 2 +- - include/libtorrent/udp_socket.hpp | 2 +- - src/disk_io_thread_pool.cpp | 2 +- - src/http_connection.cpp | 18 +++++++++--------- - src/kademlia/dht_tracker.cpp | 2 +- - src/lsd.cpp | 4 ++-- - src/natpmp.cpp | 6 +++--- - src/udp_socket.cpp | 2 +- - src/upnp.cpp | 2 +- - test/test_fast_extension.cpp | 2 +- - 13 files changed, 36 insertions(+), 24 deletions(-) - -diff --git a/include/libtorrent/io_service.hpp b/include/libtorrent/io_service.hpp -index 123274019b..5f6be1a2ca 100644 ---- a/include/libtorrent/io_service.hpp -+++ b/include/libtorrent/io_service.hpp -@@ -38,9 +38,12 @@ POSSIBILITY OF SUCH DAMAGE. - #else - #include "libtorrent/aux_/disable_warnings_push.hpp" - #include <boost/asio/io_service.hpp> -+#include <boost/version.hpp> - #include "libtorrent/aux_/disable_warnings_pop.hpp" - #endif // SIMULATOR - -+#include "libtorrent/io_service_fwd.hpp" -+ - namespace libtorrent { - - #if defined TORRENT_BUILD_SIMULATOR -diff --git a/include/libtorrent/io_service_fwd.hpp b/include/libtorrent/io_service_fwd.hpp -index 1b22c3e58f..71b845d3f3 100644 ---- a/include/libtorrent/io_service_fwd.hpp -+++ b/include/libtorrent/io_service_fwd.hpp -@@ -55,10 +55,19 @@ namespace boost { namespace asio { - namespace libtorrent { - - #if defined TORRENT_BUILD_SIMULATOR -- typedef sim::asio::io_service io_service; -+ using io_service = sim::asio::io_service; - #else -- typedef boost::asio::io_service io_service; -+ using io_service = boost::asio::io_service; - #endif -+ -+#if BOOST_VERSION >= 107000 -+template <typename T> -+io_service& get_io_service(T& o) { return static_cast<io_service&>(o.get_executor().context()); } -+#else -+template <typename T> -+io_service& get_io_service(T& o) { return o.get_io_service(); } -+#endif -+ - } - - #endif -diff --git a/include/libtorrent/proxy_base.hpp b/include/libtorrent/proxy_base.hpp -index 344c230977..d7666545c6 100644 ---- a/include/libtorrent/proxy_base.hpp -+++ b/include/libtorrent/proxy_base.hpp -@@ -246,7 +246,7 @@ class proxy_base - - io_service& get_io_service() - { -- return m_sock.get_io_service(); -+ return lt::get_io_service(m_sock); - } - - lowest_layer_type& lowest_layer() -diff --git a/include/libtorrent/tracker_manager.hpp b/include/libtorrent/tracker_manager.hpp -index 86331adbca..1fc28e89ff 100644 ---- a/include/libtorrent/tracker_manager.hpp -+++ b/include/libtorrent/tracker_manager.hpp -@@ -259,7 +259,7 @@ namespace libtorrent { - virtual void on_timeout(error_code const& ec) = 0; - virtual ~timeout_handler(); - -- io_service& get_io_service() { return m_timeout.get_io_service(); } -+ io_service& get_io_service() { return lt::get_io_service(m_timeout); } - - private: - -diff --git a/include/libtorrent/udp_socket.hpp b/include/libtorrent/udp_socket.hpp -index f4dcbeb248..c5c9aeba66 100644 ---- a/include/libtorrent/udp_socket.hpp -+++ b/include/libtorrent/udp_socket.hpp -@@ -61,7 +61,7 @@ namespace libtorrent { - static constexpr udp_send_flags_t dont_fragment = 3_bit; - - bool is_open() const { return m_abort == false; } -- io_service& get_io_service() { return m_socket.get_io_service(); } -+ io_service& get_io_service() { return lt::get_io_service(m_socket); } - - template <typename Handler> - void async_read(Handler&& h) -diff --git a/src/disk_io_thread_pool.cpp b/src/disk_io_thread_pool.cpp -index 4d4b5ee678..123159a45d 100644 ---- a/src/disk_io_thread_pool.cpp -+++ b/src/disk_io_thread_pool.cpp -@@ -173,7 +173,7 @@ namespace libtorrent { - // buffer pool won't exist anymore, and crash. This prevents that. - m_threads.emplace_back(&pool_thread_interface::thread_fun - , &m_thread_iface, std::ref(*this) -- , io_service::work(m_idle_timer.get_io_service())); -+ , io_service::work(get_io_service(m_idle_timer))); - } - } - -diff --git a/src/http_connection.cpp b/src/http_connection.cpp -index e01e9ea1d5..81e5368a55 100644 ---- a/src/http_connection.cpp -+++ b/src/http_connection.cpp -@@ -148,7 +148,7 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri - - if (ec) - { -- m_timer.get_io_service().post(std::bind(&http_connection::callback -+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback - , me, ec, span<char>{})); - return; - } -@@ -160,7 +160,7 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri - ) - { - error_code err(errors::unsupported_url_protocol); -- m_timer.get_io_service().post(std::bind(&http_connection::callback -+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback - , me, err, span<char>{})); - return; - } -@@ -258,7 +258,7 @@ void http_connection::start(std::string const& hostname, int port - - if (ec) - { -- m_timer.get_io_service().post(std::bind(&http_connection::callback -+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback - , me, ec, span<char>{})); - return; - } -@@ -297,7 +297,7 @@ void http_connection::start(std::string const& hostname, int port - #if TORRENT_USE_I2P - if (i2p_conn->proxy().type != settings_pack::i2p_proxy) - { -- m_timer.get_io_service().post(std::bind(&http_connection::callback -+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback - , me, error_code(errors::no_i2p_router), span<char>{})); - return; - } -@@ -332,8 +332,8 @@ void http_connection::start(std::string const& hostname, int port - m_ssl_ctx->set_verify_mode(ssl::context::verify_none, ec); - if (ec) - { -- m_timer.get_io_service().post(std::bind(&http_connection::callback -- , me, ec, span<char>{})); -+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback -+ , me, ec, span<char>{})); - return; - } - } -@@ -344,7 +344,7 @@ void http_connection::start(std::string const& hostname, int port - // assume this is not a tracker connection. Tracker connections that - // shouldn't be subject to the proxy should pass in nullptr as the proxy - // pointer. -- instantiate_connection(m_timer.get_io_service() -+ instantiate_connection(lt::get_io_service(m_timer) - , proxy ? *proxy : null_proxy, m_sock, userdata, nullptr, false, false); - - if (m_bind_addr) -@@ -353,7 +353,7 @@ void http_connection::start(std::string const& hostname, int port - m_sock.bind(tcp::endpoint(*m_bind_addr, 0), ec); - if (ec) - { -- m_timer.get_io_service().post(std::bind(&http_connection::callback -+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback - , me, ec, span<char>{})); - return; - } -@@ -362,7 +362,7 @@ void http_connection::start(std::string const& hostname, int port - setup_ssl_hostname(m_sock, hostname, ec); - if (ec) - { -- m_timer.get_io_service().post(std::bind(&http_connection::callback -+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback - , me, ec, span<char>{})); - return; - } -diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp -index a840bcf991..f2b2b9e2a1 100644 ---- a/src/kademlia/dht_tracker.cpp -+++ b/src/kademlia/dht_tracker.cpp -@@ -130,7 +130,7 @@ namespace libtorrent { namespace dht { - // must use piecewise construction because tracker_node::connection_timer - // is neither copyable nor movable - auto n = m_nodes.emplace(std::piecewise_construct_t(), std::forward_as_tuple(s) -- , std::forward_as_tuple(m_key_refresh_timer.get_io_service() -+ , std::forward_as_tuple(get_io_service(m_key_refresh_timer) - , s, this, m_settings, nid, m_log, m_counters - , std::bind(&dht_tracker::get_node, this, _1, _2) - , m_storage)); -diff --git a/src/lsd.cpp b/src/lsd.cpp -index 99e21ead44..562f374c62 100644 ---- a/src/lsd.cpp -+++ b/src/lsd.cpp -@@ -100,11 +100,11 @@ void lsd::debug_log(char const* fmt, ...) const - void lsd::start(error_code& ec) - { - m_socket.open(std::bind(&lsd::on_announce, self(), _1, _2) -- , m_broadcast_timer.get_io_service(), ec); -+ , lt::get_io_service(m_broadcast_timer), ec); - if (ec) return; - - m_socket6.open(std::bind(&lsd::on_announce, self(), _1, _2) -- , m_broadcast_timer.get_io_service(), ec); -+ , lt::get_io_service(m_broadcast_timer), ec); - } - - lsd::~lsd() = default; -diff --git a/src/natpmp.cpp b/src/natpmp.cpp -index 1226bcebac..5876683ea9 100644 ---- a/src/natpmp.cpp -+++ b/src/natpmp.cpp -@@ -160,13 +160,13 @@ void natpmp::start(address local_address, std::string device) - // try to find one even if the listen socket isn't bound to a device - if (device.empty()) - { -- device = device_for_address(local_address, m_socket.get_io_service(), ec); -+ device = device_for_address(local_address, get_io_service(m_socket), ec); - // if this fails fall back to using the first default gateway in the - // routing table - ec.clear(); - } - -- auto const route = get_default_route(m_socket.get_io_service() -+ auto const route = get_default_route(get_io_service(m_socket) - , device, local_address.is_v6(), ec); - - if (!route) -@@ -194,7 +194,7 @@ void natpmp::start(address local_address, std::string device) - if (local_address.is_unspecified()) - { - std::vector<ip_interface> const net = enum_net_interfaces( -- m_socket.get_io_service(), ec); -+ get_io_service(m_socket), ec); - - auto const it = std::find_if(net.begin(), net.end(), [&](ip_interface const& i) - { -diff --git a/src/udp_socket.cpp b/src/udp_socket.cpp -index 9ca38e5486..2459e4f1ca 100644 ---- a/src/udp_socket.cpp -+++ b/src/udp_socket.cpp -@@ -492,7 +492,7 @@ void udp_socket::set_proxy_settings(aux::proxy_settings const& ps) - { - // connect to socks5 server and open up the UDP tunnel - -- m_socks5_connection = std::make_shared<socks5>(m_socket.get_io_service()); -+ m_socks5_connection = std::make_shared<socks5>(lt::get_io_service(m_socket)); - m_socks5_connection->start(ps); - } - } -diff --git a/src/upnp.cpp b/src/upnp.cpp -index a300571e47..b1e8a5bb19 100644 ---- a/src/upnp.cpp -+++ b/src/upnp.cpp -@@ -121,7 +121,7 @@ void upnp::start() - - error_code ec; - m_socket.open(std::bind(&upnp::on_reply, self(), _1, _2) -- , m_refresh_timer.get_io_service(), ec); -+ , lt::get_io_service(m_refresh_timer), ec); - - m_mappings.reserve(10); - } -diff --git a/test/test_fast_extension.cpp b/test/test_fast_extension.cpp -index 91256fa0c9..cddc508825 100644 ---- a/test/test_fast_extension.cpp -+++ b/test/test_fast_extension.cpp -@@ -462,7 +462,7 @@ std::shared_ptr<torrent_info> setup_peer(tcp::socket& s, sha1_hash& ih - } - else - { -- tcp::acceptor l(s.get_io_service()); -+ tcp::acceptor l(lt::get_io_service(s)); - l.open(tcp::v4()); - l.bind(tcp::endpoint(address_v4::from_string("127.0.0.1"), 0)); - l.listen(); diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild deleted file mode 100644 index 118eb5fdcc87..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) -PYTHON_REQ_USE="threads" -DISTUTILS_OPTIONAL=true -DISTUTILS_IN_SOURCE_BUILD=true - -inherit autotools distutils-r1 - -MY_PV=$(ver_rs 1-2 '_') -MY_P=${PN/-rasterbar}_${MY_PV} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org" -SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/9" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug +dht doc examples libressl python +ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/boost:=[threads] - virtual/libiconv - examples? ( !net-p2p/mldonkey ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) -" -DEPEND="${RDEPEND} - sys-devel/libtool -" - -S="${WORKDIR}/${PN/-rasterbar}-${MY_P}" - -PATCHES=( "${FILESDIR}"/fix-boost-1.70.patch ) - -src_prepare() { - mkdir "${S}"/build-aux/ || die - touch "${S}"/build-aux/config.rpath || die - eautoreconf - - default - - # bug 578026 - # prepend -L${S}/... to ensure bindings link against the lib we just built - sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die - - # prepend -I${S}/... to ensure bindings use the right headers - sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die - - use python && distutils-r1_src_prepare -} - -src_configure() { - - local myeconfargs=( - $(use_enable debug) - $(use_enable debug export-all) - $(use_enable dht dht $(usex debug logging $(usex ('yes' 'no')))) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable static-libs static) - $(use_enable test tests) - --with-libiconv - ) - econf "${myeconfargs[@]}" - - if use python; then - python_configure() { - econf "${myeconfargs[@]}" \ - --enable-python-binding \ - --with-boost-python="boost_${EPYTHON/./}" - } - distutils-r1_src_configure - fi -} - -src_compile() { - default - - python_compile() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_compile - } - use python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS+=( "${S}"/docs ) - - default - - python_install() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_install - } - use python && distutils-r1_src_install - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild deleted file mode 100644 index d77cbc4c8b34..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) -PYTHON_REQ_USE="threads" -DISTUTILS_OPTIONAL=true -DISTUTILS_IN_SOURCE_BUILD=true - -inherit autotools distutils-r1 - -MY_PV=$(ver_rs 1-2 '_') -MY_P=${PN/-rasterbar}-${MY_PV} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/9" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug +dht doc examples libressl python +ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/boost:=[threads] - virtual/libiconv - examples? ( !net-p2p/mldonkey ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) -" -DEPEND="${RDEPEND} - sys-devel/libtool -" - -S="${WORKDIR}/${PN/-rasterbar}-${MY_P}" - -src_prepare() { - mkdir "${S}"/build-aux/ || die - touch "${S}"/build-aux/config.rpath || die - eautoreconf - - default - - # bug 578026 - # prepend -L${S}/... to ensure bindings link against the lib we just built - sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die - - # prepend -I${S}/... to ensure bindings use the right headers - sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die - - use python && distutils-r1_src_prepare -} - -src_configure() { - - local myeconfargs=( - $(use_enable debug) - $(use_enable debug export-all) - $(use_enable debug logging) - $(use_enable dht) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable static-libs static) - $(use_enable test tests) - --with-libiconv - ) - econf "${myeconfargs[@]}" - - if use python; then - python_configure() { - econf "${myeconfargs[@]}" \ - --enable-python-binding \ - --with-boost-python="boost_${EPYTHON/./}" - } - distutils-r1_src_configure - fi -} - -src_compile() { - default - - python_compile() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_compile - } - use python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS+=( "${S}"/docs ) - - default - - python_install() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_install - } - use python && distutils-r1_src_install - - find "${D}" -name '*.la' -delete || die -} |