1 |
commit: 7bf75899ab29cb7f927d6954b0969f5e3c73d3dc |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 4 17:10:25 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 4 17:38:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf75899 |
7 |
|
8 |
net-libs/libtorrent-rasterbar: Cleanup vulnerable |
9 |
|
10 |
Stabilisation timeout. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/623152 |
13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
14 |
|
15 |
net-libs/libtorrent-rasterbar/Manifest | 1 - |
16 |
...rent-rasterbar-1.0.11-boost-config-header.patch | 31 ---- |
17 |
...libtorrent-rasterbar-1.0.11-fix-abicompat.patch | 157 --------------------- |
18 |
.../libtorrent-rasterbar-1.0.11-fix-test_ssl.patch | 21 --- |
19 |
.../libtorrent-rasterbar-1.0.11-move-header.patch | 34 ----- |
20 |
...orrent-rasterbar-1.0.9-test_torrent_parse.patch | 41 ------ |
21 |
.../libtorrent-rasterbar-1.0.11-r1.ebuild | 117 --------------- |
22 |
7 files changed, 402 deletions(-) |
23 |
|
24 |
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest |
25 |
index 0bcb190e818..38db164ee52 100644 |
26 |
--- a/net-libs/libtorrent-rasterbar/Manifest |
27 |
+++ b/net-libs/libtorrent-rasterbar/Manifest |
28 |
@@ -1,2 +1 @@ |
29 |
-DIST libtorrent-rasterbar-1.0.11.tar.gz 3325786 BLAKE2B ef49c3242f520e222da2724385a41944fb752f09eab45fe60588df999d69832a82ed6b7b7494a0bf303cd6f05b28679f4d7776e6dd66e41cd22b1038f3391800 SHA512 770d16b241174ae4b121af9b2ac7bcde8b14c6ed99352b827b760a3cbdc2c0ebd0d505319762897720c5f72acdff506ee9948ac1140e6d4591805eca5439b184 |
30 |
DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 BLAKE2B 0a1102e1b74049c1f5d8980363a6b92a3378339349609d64d3b7a38a58baf6c2898a26f70e92b0de0d6a1f4b6725a576a850aacaa5764fe7d96fa0b541dfa2d7 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7 |
31 |
|
32 |
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-boost-config-header.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-boost-config-header.patch |
33 |
deleted file mode 100644 |
34 |
index f3a81c381d8..00000000000 |
35 |
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-boost-config-header.patch |
36 |
+++ /dev/null |
37 |
@@ -1,31 +0,0 @@ |
38 |
-commit 7eb3cf6bc6dbada3fa7bb7ff4d5981182813a0e2 |
39 |
-Author: arvidn <arvid@××××××.se> |
40 |
-Date: Tue Jul 11 23:16:50 2017 -0700 |
41 |
- |
42 |
- use the official boost.config header |
43 |
- |
44 |
-diff --git a/include/libtorrent/export.hpp b/include/libtorrent/export.hpp |
45 |
-index 87536af2a..503afe27a 100644 |
46 |
---- a/include/libtorrent/export.hpp |
47 |
-+++ b/include/libtorrent/export.hpp |
48 |
-@@ -33,19 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. |
49 |
- #ifndef TORRENT_EXPORT_HPP_INCLUDED |
50 |
- #define TORRENT_EXPORT_HPP_INCLUDED |
51 |
- |
52 |
--#if !defined(BOOST_COMPILER_CONFIG) && !defined(BOOST_NO_COMPILER_CONFIG) |
53 |
--# include <boost/config/select_compiler_config.hpp> |
54 |
--#endif |
55 |
--#ifdef BOOST_COMPILER_CONFIG |
56 |
--# include BOOST_COMPILER_CONFIG |
57 |
--#endif |
58 |
-- |
59 |
--#if !defined(BOOST_PLATFORM_CONFIG) && !defined(BOOST_NO_PLATFORM_CONFIG) |
60 |
--# include <boost/config/select_platform_config.hpp> |
61 |
--#endif |
62 |
--#ifdef BOOST_PLATFORM_CONFIG |
63 |
--# include BOOST_PLATFORM_CONFIG |
64 |
--#endif |
65 |
-+#include <boost/config.hpp> |
66 |
- |
67 |
- // backwards compatibility with older versions of boost |
68 |
- #if !defined BOOST_SYMBOL_EXPORT && !defined BOOST_SYMBOL_IMPORT |
69 |
|
70 |
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-abicompat.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-abicompat.patch |
71 |
deleted file mode 100644 |
72 |
index eebee122551..00000000000 |
73 |
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-abicompat.patch |
74 |
+++ /dev/null |
75 |
@@ -1,157 +0,0 @@ |
76 |
-From 76381835be19da2f8f1fc501445e31d32e6d83e4 Mon Sep 17 00:00:00 2001 |
77 |
-From: Arvid Norberg <arvid.norberg@×××××.com> |
78 |
-Date: Sun, 12 Feb 2017 21:05:22 -0500 |
79 |
-Subject: [PATCH] fix ABI compatibility issue introduced with preformatted |
80 |
- entry type (#1702) |
81 |
- |
82 |
-fix ABI compatibility issue introduced with preformatted entry type |
83 |
---- |
84 |
- ChangeLog | 2 ++ |
85 |
- bindings/python/src/create_torrent.cpp | 2 +- |
86 |
- include/libtorrent/create_torrent.hpp | 6 ++++++ |
87 |
- src/create_torrent.cpp | 31 ++++++++++++++++++++++++++++--- |
88 |
- src/torrent.cpp | 11 ++++++++--- |
89 |
- test/test_create_torrent.cpp | 2 +- |
90 |
- 6 files changed, 46 insertions(+), 8 deletions(-) |
91 |
- |
92 |
-diff --git a/ChangeLog b/ChangeLog |
93 |
-index 9b501ce..9defe7c 100644 |
94 |
---- a/ChangeLog |
95 |
-+++ b/ChangeLog |
96 |
-@@ -1,3 +1,5 @@ |
97 |
-+ * fix ABI compatibility issue introduced with preformatted entry type |
98 |
-+ |
99 |
- 1.0.11 release |
100 |
- |
101 |
- * updating super seeding would include the torrent in state_update_alert |
102 |
-diff --git a/bindings/python/src/create_torrent.cpp b/bindings/python/src/create_torrent.cpp |
103 |
-index 55b6b51..31abb07 100644 |
104 |
---- a/bindings/python/src/create_torrent.cpp |
105 |
-+++ b/bindings/python/src/create_torrent.cpp |
106 |
-@@ -127,7 +127,7 @@ void bind_create_torrent() |
107 |
- |
108 |
- class_<create_torrent>("create_torrent", no_init) |
109 |
- .def(init<file_storage&>()) |
110 |
-- .def(init<torrent_info const&>(arg("ti"))) |
111 |
-+ .def(init<torrent_info const&, int>((arg("ti"), arg("version") = LIBTORRENT_VERSION_NUM))) |
112 |
- .def(init<file_storage&, int, int, int>((arg("storage"), arg("piece_size") = 0 |
113 |
- , arg("pad_file_limit") = -1, arg("flags") = int(libtorrent::create_torrent::optimize)))) |
114 |
- |
115 |
-diff --git a/include/libtorrent/create_torrent.hpp b/include/libtorrent/create_torrent.hpp |
116 |
-index 05dc6ca..d55e86a 100644 |
117 |
---- a/include/libtorrent/create_torrent.hpp |
118 |
-+++ b/include/libtorrent/create_torrent.hpp |
119 |
-@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. |
120 |
- #include "libtorrent/utf8.hpp" |
121 |
- #include "libtorrent/allocator.hpp" |
122 |
- #include "libtorrent/file.hpp" // for combine_path etc. |
123 |
-+#include "libtorrent/version.hpp" |
124 |
- |
125 |
- #include <vector> |
126 |
- #include <string> |
127 |
-@@ -171,9 +172,12 @@ namespace libtorrent |
128 |
- // ``alignment`` is used when pad files are enabled. This is the size |
129 |
- // eligible files are aligned to. The default is -1, which means the |
130 |
- // piece size of the torrent. |
131 |
-+ // The ``use_preformatted`` parameter can be set to true to preserve |
132 |
-+ // invalid encoding of the .torrent file. |
133 |
- create_torrent(file_storage& fs, int piece_size = 0 |
134 |
- , int pad_file_limit = -1, int flags = optimize, int alignment = -1); |
135 |
- create_torrent(torrent_info const& ti); |
136 |
-+ create_torrent(torrent_info const& ti, bool use_preformatted); |
137 |
- |
138 |
- // internal |
139 |
- ~create_torrent(); |
140 |
-@@ -290,6 +294,8 @@ namespace libtorrent |
141 |
- |
142 |
- private: |
143 |
- |
144 |
-+ void load_from_torrent_info(torrent_info const& ti, bool const use_preformatted); |
145 |
-+ |
146 |
- file_storage& m_files; |
147 |
- // if m_info_dict is initialized, it is |
148 |
- // used instead of m_files to generate |
149 |
-diff --git a/src/create_torrent.cpp b/src/create_torrent.cpp |
150 |
-index df4c759..aab5574 100644 |
151 |
---- a/src/create_torrent.cpp |
152 |
-+++ b/src/create_torrent.cpp |
153 |
-@@ -330,6 +330,24 @@ namespace libtorrent |
154 |
- , m_include_symlinks(false) |
155 |
- , m_calculate_file_hashes(false) |
156 |
- { |
157 |
-+ load_from_torrent_info(ti, false); |
158 |
-+ } |
159 |
-+ |
160 |
-+ create_torrent::create_torrent(torrent_info const& ti, bool const use_preformatted) |
161 |
-+ : m_files(const_cast<file_storage&>(ti.files())) |
162 |
-+ , m_creation_date(time(0)) |
163 |
-+ , m_multifile(ti.num_files() > 1) |
164 |
-+ , m_private(ti.priv()) |
165 |
-+ , m_merkle_torrent(ti.is_merkle_torrent()) |
166 |
-+ , m_include_mtime(false) |
167 |
-+ , m_include_symlinks(false) |
168 |
-+ , m_calculate_file_hashes(false) |
169 |
-+ { |
170 |
-+ load_from_torrent_info(ti, use_preformatted); |
171 |
-+ } |
172 |
-+ |
173 |
-+ void create_torrent::load_from_torrent_info(torrent_info const& ti, bool const use_preformatted) |
174 |
-+ { |
175 |
- TORRENT_ASSERT(ti.is_valid()); |
176 |
- if (!ti.is_valid()) return; |
177 |
- |
178 |
-@@ -361,9 +379,16 @@ namespace libtorrent |
179 |
- m_piece_hash.resize(m_files.num_pieces()); |
180 |
- for (int i = 0; i < num_pieces(); ++i) set_hash(i, ti.hash_for_piece(i)); |
181 |
- |
182 |
-- boost::shared_array<char> const info = ti.metadata(); |
183 |
-- int const size = ti.metadata_size(); |
184 |
-- m_info_dict.preformatted().assign(&info[0], &info[0] + size); |
185 |
-+ if (use_preformatted) |
186 |
-+ { |
187 |
-+ boost::shared_array<char> const info = ti.metadata(); |
188 |
-+ int const size = ti.metadata_size(); |
189 |
-+ m_info_dict.preformatted().assign(&info[0], &info[0] + size); |
190 |
-+ } |
191 |
-+ else |
192 |
-+ { |
193 |
-+ m_info_dict = bdecode(&ti.metadata()[0], &ti.metadata()[0] + ti.metadata_size()); |
194 |
-+ } |
195 |
- m_info_hash = ti.info_hash(); |
196 |
- } |
197 |
- |
198 |
-diff --git a/src/torrent.cpp b/src/torrent.cpp |
199 |
-index 75f0cc7..ef05dfd 100644 |
200 |
---- a/src/torrent.cpp |
201 |
-+++ b/src/torrent.cpp |
202 |
-@@ -5601,9 +5601,14 @@ namespace libtorrent |
203 |
- { |
204 |
- if (m_magnet_link || (m_save_resume_flags & torrent_handle::save_info_dict)) |
205 |
- { |
206 |
-- boost::shared_array<char> const info = torrent_file().metadata(); |
207 |
-- int const size = torrent_file().metadata_size(); |
208 |
-- ret["info"].preformatted().assign(&info[0], &info[0] + size); |
209 |
-+ ret["info"] = bdecode(&torrent_file().metadata()[0] |
210 |
-+ , &torrent_file().metadata()[0] + torrent_file().metadata_size()); |
211 |
-+// TODO: re-enable this code once there's a non-inlined encoder function. Or |
212 |
-+// perhaps this should not be used until saving resume_data via |
213 |
-+// add_torrent_params and a free function, similar to read_resume_data |
214 |
-+// boost::shared_array<char> const info = torrent_file().metadata(); |
215 |
-+// int const size = torrent_file().metadata_size(); |
216 |
-+// ret["info"].preformatted().assign(&info[0], &info[0] + size); |
217 |
- } |
218 |
- } |
219 |
- |
220 |
-diff --git a/test/test_create_torrent.cpp b/test/test_create_torrent.cpp |
221 |
-index 0a87c08..33fd3e8 100644 |
222 |
---- a/test/test_create_torrent.cpp |
223 |
-+++ b/test/test_create_torrent.cpp |
224 |
-@@ -51,7 +51,7 @@ int test_main() |
225 |
- |
226 |
- lt::torrent_info info(test_torrent, sizeof(test_torrent) - 1); |
227 |
- |
228 |
-- lt::create_torrent t(info); |
229 |
-+ lt::create_torrent t(info, true); |
230 |
- |
231 |
- std::vector<char> buffer; |
232 |
- lt::bencode(std::back_inserter(buffer), t.generate()); |
233 |
|
234 |
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-test_ssl.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-test_ssl.patch |
235 |
deleted file mode 100644 |
236 |
index 2add42c7dd2..00000000000 |
237 |
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-test_ssl.patch |
238 |
+++ /dev/null |
239 |
@@ -1,21 +0,0 @@ |
240 |
-From 7f060e4a70b21974bcf154cf1a93c7b68c5a9aa8 Mon Sep 17 00:00:00 2001 |
241 |
-From: Alden Torres <aldenml@×××××.com> |
242 |
-Date: Sat, 8 Oct 2016 01:12:15 -0400 |
243 |
-Subject: [PATCH] fix openssl compilation with boost 1.62 (#1193) |
244 |
- |
245 |
---- |
246 |
- test/test_ssl.cpp | 1 - |
247 |
- 1 file changed, 1 deletion(-) |
248 |
- |
249 |
-diff --git a/test/test_ssl.cpp b/test/test_ssl.cpp |
250 |
-index 659973c..5aa6b15 100644 |
251 |
---- a/test/test_ssl.cpp |
252 |
-+++ b/test/test_ssl.cpp |
253 |
-@@ -47,7 +47,6 @@ POSSIBILITY OF SUCH DAMAGE. |
254 |
- #include <boost/asio/connect.hpp> |
255 |
- |
256 |
- #ifdef TORRENT_USE_OPENSSL |
257 |
--#include <boost/asio/ssl/error.hpp> // for asio::error::get_ssl_category() |
258 |
- #include <boost/asio/ssl.hpp> |
259 |
- |
260 |
- using namespace libtorrent; |
261 |
|
262 |
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-move-header.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-move-header.patch |
263 |
deleted file mode 100644 |
264 |
index 589998b7fb3..00000000000 |
265 |
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-move-header.patch |
266 |
+++ /dev/null |
267 |
@@ -1,34 +0,0 @@ |
268 |
-From ecd20f15cb3fa5a0ebabd647b1f57f3cd62cb4b7 Mon Sep 17 00:00:00 2001 |
269 |
-From: sledgehammer_999 <hammered999@×××××.com> |
270 |
-Date: Mon, 20 Feb 2017 01:22:27 +0200 |
271 |
-Subject: [PATCH] Move include into implementation instead(from #1702). |
272 |
- |
273 |
---- |
274 |
- bindings/python/src/create_torrent.cpp | 1 + |
275 |
- include/libtorrent/create_torrent.hpp | 1 - |
276 |
- 2 files changed, 1 insertion(+), 1 deletion(-) |
277 |
- |
278 |
-diff --git a/bindings/python/src/create_torrent.cpp b/bindings/python/src/create_torrent.cpp |
279 |
-index 31abb07..e856d85 100644 |
280 |
---- a/bindings/python/src/create_torrent.cpp |
281 |
-+++ b/bindings/python/src/create_torrent.cpp |
282 |
-@@ -6,6 +6,7 @@ |
283 |
- #include <libtorrent/create_torrent.hpp> |
284 |
- #include <libtorrent/file_storage.hpp> |
285 |
- #include "libtorrent/intrusive_ptr_base.hpp" |
286 |
-+#include <libtorrent/version.hpp> |
287 |
- #include "bytes.hpp" |
288 |
- |
289 |
- using namespace boost::python; |
290 |
-diff --git a/include/libtorrent/create_torrent.hpp b/include/libtorrent/create_torrent.hpp |
291 |
-index d55e86a..8d2c680 100644 |
292 |
---- a/include/libtorrent/create_torrent.hpp |
293 |
-+++ b/include/libtorrent/create_torrent.hpp |
294 |
-@@ -42,7 +42,6 @@ POSSIBILITY OF SUCH DAMAGE. |
295 |
- #include "libtorrent/utf8.hpp" |
296 |
- #include "libtorrent/allocator.hpp" |
297 |
- #include "libtorrent/file.hpp" // for combine_path etc. |
298 |
--#include "libtorrent/version.hpp" |
299 |
- |
300 |
- #include <vector> |
301 |
- #include <string> |
302 |
|
303 |
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.9-test_torrent_parse.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.9-test_torrent_parse.patch |
304 |
deleted file mode 100644 |
305 |
index 658c0aa5715..00000000000 |
306 |
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.9-test_torrent_parse.patch |
307 |
+++ /dev/null |
308 |
@@ -1,41 +0,0 @@ |
309 |
-From bdd91e29225b44a1a13e670dc4cecfb58f241d28 Mon Sep 17 00:00:00 2001 |
310 |
-From: Davide Pesavento <pesa@g.o> |
311 |
-Date: Sun, 7 Aug 2016 12:14:57 +0200 |
312 |
-Subject: [PATCH] Disable failing torrent_parse tests |
313 |
- |
314 |
-For unknown reasons, some test torrents are missing from the tarball. |
315 |
-Skip the corresponding test cases to avoid spurious failures. |
316 |
---- |
317 |
- test/test_torrent_parse.cpp | 5 ----- |
318 |
- 1 file changed, 5 deletions(-) |
319 |
- |
320 |
-diff --git a/test/test_torrent_parse.cpp b/test/test_torrent_parse.cpp |
321 |
-index 663f341..2de6fb5 100644 |
322 |
---- a/test/test_torrent_parse.cpp |
323 |
-+++ b/test/test_torrent_parse.cpp |
324 |
-@@ -49,13 +49,10 @@ using namespace libtorrent; |
325 |
- test_torrent_t test_torrents[] = |
326 |
- { |
327 |
- { "base.torrent" }, |
328 |
-- { "empty_path.torrent" }, |
329 |
- { "parent_path.torrent" }, |
330 |
- { "hidden_parent_path.torrent" }, |
331 |
- { "single_multi_file.torrent" }, |
332 |
- { "slash_path.torrent" }, |
333 |
-- { "slash_path2.torrent" }, |
334 |
-- { "slash_path3.torrent" }, |
335 |
- { "backslash_path.torrent" }, |
336 |
- { "url_list.torrent" }, |
337 |
- { "url_list2.torrent" }, |
338 |
-@@ -75,8 +72,6 @@ test_torrent_t test_torrents[] = |
339 |
- { "root_hash.torrent" }, |
340 |
- { "empty_path_multi.torrent" }, |
341 |
- { "duplicate_web_seeds.torrent" }, |
342 |
-- { "invalid_name3.torrent" }, |
343 |
-- { "symlink1.torrent" }, |
344 |
- }; |
345 |
- |
346 |
- struct test_failing_torrent_t |
347 |
--- |
348 |
-2.9.2 |
349 |
- |
350 |
|
351 |
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild |
352 |
deleted file mode 100644 |
353 |
index cc369c61d8e..00000000000 |
354 |
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild |
355 |
+++ /dev/null |
356 |
@@ -1,117 +0,0 @@ |
357 |
-# Copyright 1999-2017 Gentoo Foundation |
358 |
-# Distributed under the terms of the GNU General Public License v2 |
359 |
- |
360 |
-EAPI=6 |
361 |
- |
362 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
363 |
-PYTHON_REQ_USE="threads" |
364 |
-DISTUTILS_OPTIONAL=true |
365 |
-DISTUTILS_IN_SOURCE_BUILD=true |
366 |
- |
367 |
-inherit distutils-r1 versionator |
368 |
- |
369 |
-MY_PV=$(replace_all_version_separators _) |
370 |
- |
371 |
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" |
372 |
-HOMEPAGE="http://libtorrent.org" |
373 |
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz" |
374 |
- |
375 |
-LICENSE="BSD" |
376 |
-SLOT="0/8" |
377 |
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd" |
378 |
-IUSE="debug +dht doc examples +geoip libressl python +ssl static-libs test" |
379 |
- |
380 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
381 |
- |
382 |
-COMMON_DEPEND=" |
383 |
- dev-libs/boost:=[threads] |
384 |
- virtual/libiconv |
385 |
- geoip? ( dev-libs/geoip ) |
386 |
- python? ( |
387 |
- ${PYTHON_DEPS} |
388 |
- dev-libs/boost:=[python,${PYTHON_USEDEP}] |
389 |
- ) |
390 |
- ssl? ( |
391 |
- !libressl? ( dev-libs/openssl:0= ) |
392 |
- libressl? ( dev-libs/libressl:= ) |
393 |
- ) |
394 |
-" |
395 |
-DEPEND="${COMMON_DEPEND} |
396 |
- sys-devel/libtool |
397 |
-" |
398 |
-RDEPEND="${COMMON_DEPEND} |
399 |
- examples? ( !net-p2p/mldonkey ) |
400 |
-" |
401 |
- |
402 |
-PATCHES=( |
403 |
- "${FILESDIR}/${PN}-1.0.9-test_torrent_parse.patch" |
404 |
- # RC_1_0 branch |
405 |
- "${FILESDIR}/${P}-fix-abicompat.patch" |
406 |
- "${FILESDIR}/${P}-move-header.patch" |
407 |
- # master branch |
408 |
- "${FILESDIR}/${P}-fix-test_ssl.patch" |
409 |
- "${FILESDIR}/${P}-boost-config-header.patch" |
410 |
-) |
411 |
- |
412 |
-src_prepare() { |
413 |
- default |
414 |
- |
415 |
- # bug 578026 |
416 |
- # prepend -L${S}/... to ensure bindings link against the lib we just built |
417 |
- sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/compile_flags.in || die |
418 |
- |
419 |
- use python && distutils-r1_src_prepare |
420 |
-} |
421 |
- |
422 |
-src_configure() { |
423 |
- local myeconfargs=( |
424 |
- $(use_enable debug) |
425 |
- $(use_enable debug logging) |
426 |
- $(use_enable debug statistics) |
427 |
- $(use_enable debug disk-stats) |
428 |
- $(use_enable dht dht $(usex debug logging yes)) |
429 |
- $(use_enable examples) |
430 |
- $(use_enable geoip) |
431 |
- $(use_with geoip libgeoip) |
432 |
- $(use_enable ssl encryption) |
433 |
- $(use_enable static-libs static) |
434 |
- $(use_enable test tests) |
435 |
- --with-libiconv |
436 |
- ) |
437 |
- econf "${myeconfargs[@]}" |
438 |
- |
439 |
- if use python; then |
440 |
- myeconfargs+=( |
441 |
- --enable-python-binding |
442 |
- --with-boost-python |
443 |
- ) |
444 |
- python_configure() { |
445 |
- econf "${myeconfargs[@]}" |
446 |
- } |
447 |
- distutils-r1_src_configure |
448 |
- fi |
449 |
-} |
450 |
- |
451 |
-src_compile() { |
452 |
- default |
453 |
- |
454 |
- python_compile() { |
455 |
- cd "${BUILD_DIR}/../bindings/python" || die |
456 |
- distutils-r1_python_compile |
457 |
- } |
458 |
- use python && distutils-r1_src_compile |
459 |
-} |
460 |
- |
461 |
-src_install() { |
462 |
- use doc && HTML_DOCS+=( "${S}"/docs ) |
463 |
- |
464 |
- default |
465 |
- |
466 |
- python_install() { |
467 |
- cd "${BUILD_DIR}/../bindings/python" || die |
468 |
- distutils-r1_python_install |
469 |
- } |
470 |
- use python && distutils-r1_src_install |
471 |
- |
472 |
- find "${D}" -name '*.la' -delete || die |
473 |
-} |