Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-p2p
diff options
context:
space:
mode:
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/rtorrent/ChangeLog11
-rw-r--r--net-p2p/rtorrent/Manifest30
-rw-r--r--net-p2p/rtorrent/files/rtorrent-0.9.0-canvas-fix.patch281
-rw-r--r--net-p2p/rtorrent/files/rtorrent-0.9.0-clang.patch136
-rw-r--r--net-p2p/rtorrent/files/rtorrent-0.9.0-gold.patch32
-rw-r--r--net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch10
-rw-r--r--net-p2p/rtorrent/rtorrent-0.9.1.ebuild (renamed from net-p2p/rtorrent/rtorrent-0.9.0.ebuild)18
7 files changed, 46 insertions, 472 deletions
diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index 1c5144ca18d4..e6f92c42d9de 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-p2p/rtorrent
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.173 2012/03/09 00:15:08 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.174 2012/04/08 18:21:45 sochotnicky Exp $
+
+*rtorrent-0.9.1 (08 Apr 2012)
+
+ 08 Apr 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+ -rtorrent-0.9.0.ebuild, -files/rtorrent-0.9.0-canvas-fix.patch,
+ -files/rtorrent-0.9.0-clang.patch, -files/rtorrent-0.9.0-gold.patch,
+ +rtorrent-0.9.1.ebuild, +files/rtorrent-0.9.1-ncurses.patch:
+ Version bump (#411041), drop upstreamed patches and support for color. Too
+ much work to keep working and delays updates.
09 Mar 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org>
rtorrent-0.9.0.ebuild, +files/rtorrent-0.9.0-clang.patch:
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 54f20ebe59d7..4513de9c64d9 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,23 +1,41 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
AUX rtorrent-0.8.6-canvas-fix.patch 11607 RMD160 01f3be5ecf0769a44e31f9852eb3da5454e85c75 SHA1 4d60d95845df05c9864ca50d3f84726d2b93ab14 SHA256 a843dcd8c3b7fe0179c24d53cb485d2f11156a189e58911bbd14e5e30db71925
AUX rtorrent-0.8.6-ncurses.patch 572 RMD160 c0e390c444e50d69d8dbe4727c76b5962651a570 SHA1 2267dce2ddfb1ea865ba50c95e4a5beaf24da533 SHA256 4bcc6f33fad67d14f44cfdc63409fc94ef917dc120c46e60ce175d36af3fcb02
AUX rtorrent-0.8.7-canvas-fix.patch 10095 RMD160 67315e412a1d071c32366ff0920ae2fe69ac4c6f SHA1 ead1c7099cd42fc48b3194c3e53a9b2d4e2d4311 SHA256 a40a88d17e3090d3a7244ae701b049687b3646f8cbecfe40a1456306b6b56fd7
AUX rtorrent-0.8.9-canvas-fix.patch 9995 RMD160 e9d7c870b8a77e46fa8556544de6a5b39c3accb1 SHA1 952b4bb18e5001c8257a6dcecda66a5d0817d781 SHA256 f53eca85da4800f123f1f482dd49e07d40fcc4055e84f9450f3894cc51259415
AUX rtorrent-0.8.9-ncurses.patch 618 RMD160 61969665a70c02d7a5e810c40c33d190191b0abf SHA1 cf9e67d7d6a17f22e9c081307e14dfe0bca6345e SHA256 67002221b79bb5e43e8ed05ae0ebb22130c10eaf5739acbb1fb424050f2e2a05
-AUX rtorrent-0.9.0-canvas-fix.patch 8483 RMD160 d5343f52e791d4ae1af5540c65ac6ea0cc0a7d1a SHA1 2e37f09ecced53683c7c1f6cf292aac6aa3de691 SHA256 400a25e462e19dc1785b24c9c4343b11de17900b1cd572047a82751a73da0e63
-AUX rtorrent-0.9.0-clang.patch 5834 RMD160 1cda73fbc814291e53b0c68f474b32ada2665fae SHA1 5a436c15965f4e6ea6621d7817647e605e806d17 SHA256 5ea0ce8640d6a0590d03fa43780255ff88eb255685c34063f5b895ecdb159df4
-AUX rtorrent-0.9.0-gold.patch 773 RMD160 99c5fcc9551374b21823d7639b8173b7940edc17 SHA1 8e01c946be798009939cadfd40266c08b7f53e03 SHA256 98de8de9c1537bd2b726416e3cc41b959de6f14be853f3c2574b100552d1c706
AUX rtorrent-0.9.0-ncurses.patch 416 RMD160 002eab97d40734a65f9042eb3055255f674177eb SHA1 bb437cc90ed09e4e2226c9eeceb2c0a8133ecb4e SHA256 043f85f5e77de132f5a8aeccc894f11fad961f237a5c092dd38e163620f6e40e
+AUX rtorrent-0.9.1-ncurses.patch 416 RMD160 002eab97d40734a65f9042eb3055255f674177eb SHA1 bb437cc90ed09e4e2226c9eeceb2c0a8133ecb4e SHA256 043f85f5e77de132f5a8aeccc894f11fad961f237a5c092dd38e163620f6e40e
AUX rtorrentd.conf 13 RMD160 aafd4d8440f40ae380b482876968f80267dff3bd SHA1 8b50885e27a2ff85cd28fccb56c11ead26d0ba49 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b
AUX rtorrentd.init 815 RMD160 7f16a07cb8278219aba5554bc0c7eda358e63cca SHA1 7243be5bc5b6dd5066758018dfab76ef6a98def4 SHA256 f05e05330276de79ddb8e37effd3acd6060c10a30d8fb3e6bb1e6768ed942d56
DIST rtorrent-0.8.6.tar.gz 521045 RMD160 3d5109d4ee26c663b376e0b9f610ab6055c57ba9 SHA1 ffce3959ba91738bb444d689db3db1e2375b14ce SHA256 8c96c68e1524162abd1fc4b612d0c3d924fccc25159c0b3f208e69281f0b32db
DIST rtorrent-0.8.7.tar.gz 547435 RMD160 52564096341088087c7a316c8e7637df77b672b6 SHA1 691c95e948d02927edc05321e52cd1c63513fabc SHA256 1fd0c9b2b3fe81b035209417c4dd4514473411f16b15ffe7fefe87eaff1a58d2
DIST rtorrent-0.8.9.tar.gz 570904 RMD160 d79eacf6d63d13514c07c1c35a662fea5f35aef1 SHA1 0ac51c185e98b5a386e5f1a07bca9a9963e2d6ce SHA256 cca70eb36a0c176bbd6fdb3afe2bc9f163fa4c9377fc33bc29689dec60cf6d84
-DIST rtorrent-0.9.0.tar.gz 584769 RMD160 0b276a946947274223c60a912c1e0b918958baec SHA1 66fb3e851f8fc961a7dd98ebde8369cc71eea861 SHA256 005445c40374e90478374542d441bf8c95dbc1ecd6e1f6585ca4966b2f708a97
+DIST rtorrent-0.9.1.tar.gz 591114 RMD160 3cc6db652ca0147fed9b223ecf4e27849a9d3523 SHA1 e18dadae77c74113cbd6b910352b54dd5ef25465 SHA256 466c529a5d69e4cf8267029821dc5811fffa5fad354d80ec64c88b12c1a4c5f1
EBUILD rtorrent-0.8.6-r1.ebuild 1596 RMD160 c4558712e434a91bd49bb99049badd7e8c1e975f SHA1 e2c47673cea00308d5dc63dcce21dfa4229ff8f3 SHA256 1c177f4f112c0e21611f404f1c15d98ec1be13f92fdc0e54bb587bd3c9677ce5
EBUILD rtorrent-0.8.6-r4.ebuild 1666 RMD160 15b8466b39eb46d3fedd8978cf8e5641219ba32c SHA1 b56cb4f72c7e1a3f790340dc62e8cd3d3d09acd8 SHA256 eb8746d33eeb701043483be7d6d0105870a416ee93172454bebb2a11b8a83b83
EBUILD rtorrent-0.8.7-r4.ebuild 1789 RMD160 5285fa692756cad50bda9882873e1f4fcf45a92d SHA1 7e44800220f1f2d174859c2a5d74cede264a1e1e SHA256 d3fd7a7b3bb531e1f00539ad7a629d4444d5a082597a308b39cc4b0ab27d3522
EBUILD rtorrent-0.8.9.ebuild 1828 RMD160 bffd5e1db1147315fe442bf554ff09d46c6546b8 SHA1 432ce0555ce50ad727fdb393971165a2ce7ee60a SHA256 90e97541e66bbdcd2b162e521fbbf686d8f47f8187bbba3cb3596c07480e1064
-EBUILD rtorrent-0.9.0.ebuild 1834 RMD160 dea53ee19a43eb4664f7dafbbf987fc87d777da4 SHA1 7f71b8cf87d2ca9eabf76558fb1bc1c8019f8390 SHA256 5c0a04e9b263b53ed6700b804f0d4e4bffb34d47c4226c0ee5eb13f56744a263
-MISC ChangeLog 25862 RMD160 483c3aba6149db721254267c7f130e2409c9aa7d SHA1 b03e607d64b62c3262b75feae311d06eb1a4a0c7 SHA256 afeceeb5d71c3fa4c3e00d6b04e2866f8bab311887b4bb747cd668aac032a44b
+EBUILD rtorrent-0.9.1.ebuild 1308 RMD160 e7fdb83aa3750941bfc892b0f2a33536d6b45af9 SHA1 c033209ce76e086b04cb413db0fde4b7c0a0ac68 SHA256 620556ad2b78f53a49e8ae0776aa0b63d124a70cfb0a915801670adf23b629ec
+MISC ChangeLog 26280 RMD160 0e24ae858d15333e09f96792e4e4fa126144146d SHA1 44c7ddb848118106b25fabc659bbe5d96faa0309 SHA256 aaece788600460cf745d2853d2b321b28563d5af30e6eeee303360f34bbb0d3a
MISC metadata.xml 461 RMD160 20828b74a80b51c1df06f6dba3aa63fbe7eec437 SHA1 7d50936803d36c9e88d2030bcf6647d4cede9d09 SHA256 db7942b39f614d72ff07b2ca64acbddd975cc016761d0037eb9edf786a4b295d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPgdc+AAoJELy9dS57CHJBUTwQAJtkZM3FN5Nm1sOe+62RwJnu
+ifhseR2gnlH/hGQUFvTsiPGJyIjn93KzQM2jsM32xNH5ZZf42ArDfF/+7yqOON78
++qchaO65hmDzGJfYhowq5Qqov+U+ZmGFjiiG2uokGk+Dh14ceTK4AUuDuwmibwFD
++bF+jZMCjo1TarK+9OHTqN4yaRdkHf8CrVziU0QW0ISjFAQnurzvaf3SV2+1kV4+
+pwN/KBFRw81+3VdI/Zp0d8JJ30CKNEIncjLg/Chysqfeb/EOQsA3NEIHWW8+yAYP
+S/Nf1citmR3/4jAVZMkNwI77Zbc1Y4dWfd5PwAOIivxGChQppAc5HHmjbXB7O1id
+0yDkxE88OGnDq45wv8gRFMo5cDTeACYmY/5kQnx+yr1h5wioIqLH26lisu1ACyjP
+S5UyzEuVG9A+qG9Cagk+e+HoQt/96oTI+AVrUqzzLLpdE7auruGlCCUpvOUQ7t62
+Y2o0LG/n8pR2sQPin55XMruaXQLbkF8kRX2KC4+36liKtKUB6RiILQigncMzgTKE
+E3rBzjLyjpzHvhafU3vUJd2OuSiy7aJusj4G69gkM896sgb13v6LEf6llceviAGf
+bQcyWPObtY4hIms9AyLOlfN656w3p+wKqliliI4vVg6uG9MBHp7l8oPICZrf0Fvd
+6hxlQWVgONf91mU9rUTM
+=COZ5
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.0-canvas-fix.patch b/net-p2p/rtorrent/files/rtorrent-0.9.0-canvas-fix.patch
deleted file mode 100644
index 073bacce3dda..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.9.0-canvas-fix.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-Index: rtorrent/src/display/window_download_list.h
-===================================================================
---- rtorrent/src/display/window_download_list.h (revision 1163)
-+++ rtorrent/src/display/window_download_list.h (working copy)
-@@ -59,6 +59,10 @@
- virtual void redraw();
-
- void set_view(core::View* l);
-+ void set_done_fg_color(int64_t color);
-+ void set_done_bg_color(int64_t color);
-+ void set_active_fg_color(int64_t color);
-+ void set_active_bg_color(int64_t color);
-
- private:
- core::View* m_view;
-Index: rtorrent/src/display/canvas.cc
-===================================================================
---- rtorrent/src/display/canvas.cc (revision 1163)
-+++ rtorrent/src/display/canvas.cc (working copy)
-@@ -92,6 +92,10 @@
- m_isInitialized = true;
-
- initscr();
-+ start_color();
-+ use_default_colors();
-+ init_pair(2, -1, -1);
-+ init_pair(1, -1, -1);
- raw();
- noecho();
- nodelay(stdscr, TRUE);
-Index: rtorrent/src/display/window_download_list.cc
-===================================================================
---- rtorrent/src/display/window_download_list.cc (revision 1163)
-+++ rtorrent/src/display/window_download_list.cc (working copy)
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <rak/algorithm.h>
-+#include <torrent/rate.h>
-
- #include "core/download.h"
- #include "core/view.h"
-@@ -96,12 +97,30 @@
- char* position;
- char* last = buffer + m_canvas->width() - 2 + 1;
-
-+ if( pos >= m_canvas->height() ) break;
- position = print_download_title(buffer, last, *range.first);
-- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+ m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+ if( (*range.first)->is_done() ) {
-+ if( (*range.first)->info()->up_rate()->rate() != 0 ) {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 2);
-+ } else {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 2);
-+ }
-+ } else if( (*range.first)->info()->is_active() ) {
-+ if( (*range.first)->info()->down_rate()->rate() != 0 ) {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 1);
-+ } else {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 1);
-+ }
-+ }
-+ pos++;
-+
-+ if( pos >= m_canvas->height() ) break;
-
- position = print_download_info(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
-+ if( pos >= m_canvas->height() ) break;
- position = print_download_status(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
-@@ -109,4 +128,41 @@
- }
- }
-
-+void
-+WindowDownloadList::set_done_fg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(2, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(2, (short)color, bg);
- }
-+
-+void
-+WindowDownloadList::set_done_bg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(2, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(2, fg, (short)color);
-+}
-+
-+void
-+WindowDownloadList::set_active_fg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(1, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(1, (short)color, bg);
-+}
-+
-+void
-+WindowDownloadList::set_active_bg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(1, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(1, fg, (short)color);
-+}
-+
-+}
-+
-Index: rtorrent/src/ui/download_list.cc
-===================================================================
---- rtorrent/src/ui/download_list.cc (revision 1163)
-+++ rtorrent/src/ui/download_list.cc (working copy)
-@@ -137,6 +137,11 @@
- current_view()->next_focus();
- }
-
-+display::WindowDownloadList*
-+DownloadList::current_window_list() {
-+ return dynamic_cast<ElementDownloadList*>(m_uiArray[DISPLAY_DOWNLOAD_LIST])->window();
-+}
-+
- void
- DownloadList::activate_display(Display displayType) {
- if (!is_active())
-Index: rtorrent/src/ui/download_list.h
-===================================================================
---- rtorrent/src/ui/download_list.h (revision 1163)
-+++ rtorrent/src/ui/download_list.h (working copy)
-@@ -101,6 +101,7 @@
- void activate_display(Display d);
-
- core::View* current_view();
-+ display::WindowDownloadList* current_window_list();
- void set_current_view(const std::string& name);
-
- void slot_open_uri(SlotOpenUri s) { m_slotOpenUri = s; }
-Index: rtorrent/src/ui/element_download_list.h
-===================================================================
---- rtorrent/src/ui/element_download_list.h (revision 1163)
-+++ rtorrent/src/ui/element_download_list.h (working copy)
-@@ -60,6 +60,7 @@
- void disable();
-
- core::View* view() { return m_view; }
-+ WDownloadList* window() { return m_window; }
- void set_view(core::View* l);
-
- void receive_command(const char* cmd);
-Index: rtorrent/src/ui/root.cc
-===================================================================
---- rtorrent/src/ui/root.cc (revision 1163)
-+++ rtorrent/src/ui/root.cc (working copy)
-@@ -44,6 +44,7 @@
-
- #include "core/manager.h"
- #include "display/frame.h"
-+#include "display/window_download_list.h"
- #include "display/window_http_queue.h"
- #include "display/window_title.h"
- #include "display/window_input.h"
-@@ -65,7 +66,11 @@
- m_windowTitle(NULL),
- m_windowHttpQueue(NULL),
- m_windowInput(NULL),
-- m_windowStatusbar(NULL) {
-+ m_windowStatusbar(NULL),
-+ done_fg_color(-1),
-+ done_bg_color(-1),
-+ active_fg_color(-1),
-+ active_bg_color(-1) {
- }
-
- void
-@@ -97,6 +102,10 @@
- setup_keys();
-
- m_downloadList->activate(rootFrame->frame(1));
-+ m_downloadList->current_window_list()->set_done_fg_color(done_fg_color);
-+ m_downloadList->current_window_list()->set_done_bg_color(done_bg_color);
-+ m_downloadList->current_window_list()->set_active_fg_color(active_fg_color);
-+ m_downloadList->current_window_list()->set_active_bg_color(active_bg_color);
- }
-
- void
-@@ -219,7 +228,47 @@
- torrent::set_max_unchoked(maxUnchoked);
- }
-
-+int
-+Root::get_done_fg_color() {
-+ return done_fg_color;
-+}
-+
- void
-+Root::set_done_fg_color(int64_t color) {
-+ done_fg_color = color;
-+}
-+
-+int
-+Root::get_done_bg_color() {
-+ return done_bg_color;
-+}
-+
-+void
-+Root::set_done_bg_color(int64_t color) {
-+ done_bg_color = color;
-+}
-+
-+int
-+Root::get_active_fg_color() {
-+ return active_fg_color;
-+}
-+
-+void
-+Root::set_active_fg_color(int64_t color) {
-+ active_fg_color = color;
-+}
-+
-+int
-+Root::get_active_bg_color() {
-+ return active_bg_color;
-+}
-+
-+void
-+Root::set_active_bg_color(int64_t color) {
-+ active_bg_color = color;
-+}
-+
-+void
- Root::adjust_down_throttle(int throttle) {
- set_down_throttle(std::max<int>(torrent::down_throttle_global()->max_rate() / 1024 + throttle, 0));
- }
-Index: rtorrent/src/ui/root.h
-===================================================================
---- rtorrent/src/ui/root.h (revision 1163)
-+++ rtorrent/src/ui/root.h (working copy)
-@@ -82,7 +82,16 @@
- // Rename to raw or something, make base function.
- void set_down_throttle_i64(int64_t throttle) { set_down_throttle(throttle >> 10); }
- void set_up_throttle_i64(int64_t throttle) { set_up_throttle(throttle >> 10); }
-+ int get_done_fg_color();
-+ void set_done_fg_color(int64_t color);
-+ int get_done_bg_color();
-+ void set_done_bg_color(int64_t color);
-+ int get_active_fg_color();
-+ void set_active_fg_color(int64_t color);
-+ int get_active_bg_color();
-+ void set_active_bg_color(int64_t color);
-
-+
- void adjust_down_throttle(int throttle);
- void adjust_up_throttle(int throttle);
-
-@@ -93,6 +102,11 @@
-
- input::TextInput* current_input();
-
-+ int64_t done_fg_color;
-+ int64_t done_bg_color;
-+ int64_t active_fg_color;
-+ int64_t active_bg_color;
-+
- private:
- void setup_keys();
-
-@@ -105,6 +119,7 @@
- WStatusbar* m_windowStatusbar;
-
- input::Bindings m_bindings;
-+
- };
-
- }
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.0-clang.patch b/net-p2p/rtorrent/files/rtorrent-0.9.0-clang.patch
deleted file mode 100644
index e3bed62ea03b..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.9.0-clang.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From e58f3975f128f68638843a11b40a239350bf88f4 Mon Sep 17 00:00:00 2001
-From: Jari Sundell <sundell.software@gmail.com>
-Date: Thu, 29 Dec 2011 18:58:12 +0900
-Subject: [PATCH] Fixed compiler issues with clang.
-
----
- src/command_download.cc | 9 ++++-----
- src/command_dynamic.cc | 6 +++---
- src/command_helpers.h | 11 +++++++++--
- src/display/window_file_list.cc | 2 +-
- src/thread_base.h | 4 +---
- 5 files changed, 18 insertions(+), 14 deletions(-)
-
-diff --git a/src/command_download.cc b/src/command_download.cc
-index 30abb4d..bc58b9a 100644
---- a/src/command_download.cc
-+++ b/src/command_download.cc
-@@ -138,10 +138,9 @@ apply_d_change_link(core::Download* download, const torrent::Object::list_type&
-
- switch (changeType) {
- case 0:
-- if (symlink(target.c_str(), link.c_str()) == -1)
-+ // if (symlink(target.c_str(), link.c_str()) == -1)
- // control->core()->push_log("create_link failed: " + std::string(rak::error_number::current().c_str()));
- // control->core()->push_log("create_link failed: " + std::string(rak::error_number::current().c_str()) + " to " + target);
-- ; // Disabled.
- break;
-
- case 1:
-@@ -150,9 +149,9 @@ apply_d_change_link(core::Download* download, const torrent::Object::list_type&
- rak::error_number::clear_global();
-
- if (!fileStat.update_link(link) || !fileStat.is_link() ||
-- unlink(link.c_str()) == -1)
-- ; // control->core()->push_log("delete_link failed: " + std::string(rak::error_number::current().c_str()));
--
-+ unlink(link.c_str()) == -1) {
-+ // control->core()->push_log("delete_link failed: " + std::string(rak::error_number::current().c_str()));
-+ }
- break;
- }
- default:
-diff --git a/src/command_dynamic.cc b/src/command_dynamic.cc
-index 6e83454..013f855 100644
---- a/src/command_dynamic.cc
-+++ b/src/command_dynamic.cc
-@@ -156,7 +156,7 @@ system_method_insert_object(const torrent::Object::list_type& args, int flags) {
- (flags & rpc::object_storage::mask_type) == rpc::object_storage::flag_multi_type) {
-
- rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call<rpc::target_type> >::type>
-- (create_new_key<0>(rawKey, ""),
-+ (create_new_key(rawKey),
- std::bind(&rpc::object_storage::call_function_str, control->object_storage(),
- rawKey, std::placeholders::_1, std::placeholders::_2),
- &rpc::command_base_call<rpc::target_type>,
-@@ -164,7 +164,7 @@ system_method_insert_object(const torrent::Object::list_type& args, int flags) {
-
- } else {
- rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call<rpc::target_type> >::type>
-- (create_new_key<0>(rawKey, ""),
-+ (create_new_key(rawKey),
- std::bind(&rpc::object_storage::get_str, control->object_storage(), rawKey),
- &rpc::command_base_call<rpc::target_type>,
- cmd_flags, NULL, NULL);
-@@ -354,7 +354,7 @@ system_method_redirect(const torrent::Object::list_type& args) {
- std::string new_key = torrent::object_create_string(args.front());
- std::string dest_key = torrent::object_create_string(args.back());
-
-- rpc::commands.create_redirect(create_new_key<0>(new_key, ""), create_new_key<0>(dest_key, ""),
-+ rpc::commands.create_redirect(create_new_key(new_key), create_new_key(dest_key),
- rpc::CommandMap::flag_public_xmlrpc | rpc::CommandMap::flag_delete_key | rpc::CommandMap::flag_modifiable);
-
- return torrent::Object();
-diff --git a/src/command_helpers.h b/src/command_helpers.h
-index 8b290ce..b215ec2 100644
---- a/src/command_helpers.h
-+++ b/src/command_helpers.h
-@@ -152,11 +152,11 @@ void initialize_commands();
- rpc::commands.create_redirect(from_key, to_key, rpc::CommandMap::flag_public_xmlrpc | rpc::CommandMap::flag_tracker_target | rpc::CommandMap::flag_dont_delete);
-
- #define CMD2_REDIRECT_GENERIC_STR(from_key, to_key) \
-- rpc::commands.create_redirect(create_new_key<0>(from_key, ""), create_new_key<0>(to_key, ""), \
-+ rpc::commands.create_redirect(create_new_key(from_key), create_new_key(to_key), \
- rpc::CommandMap::flag_public_xmlrpc | rpc::CommandMap::flag_no_target | rpc::CommandMap::flag_delete_key);
-
- #define CMD2_REDIRECT_GENERIC_STR_NO_EXPORT(from_key, to_key) \
-- rpc::commands.create_redirect(create_new_key<0>(from_key, ""), create_new_key<0>(to_key, ""), \
-+ rpc::commands.create_redirect(create_new_key(from_key), create_new_key(to_key), \
- rpc::CommandMap::flag_no_target | rpc::CommandMap::flag_delete_key);
-
- //
-@@ -205,4 +205,11 @@ create_new_key(const std::string& key, const char postfix[postfix_size]) {
- return buffer;
- }
-
-+inline const char*
-+create_new_key(const std::string& key) {
-+ char *buffer = new char[key.size() + 1];
-+ std::memcpy(buffer, key.c_str(), key.size() + 1);
-+ return buffer;
-+}
-+
- #endif
-diff --git a/src/display/window_file_list.cc b/src/display/window_file_list.cc
-index 6a923dc..7c9f692 100644
---- a/src/display/window_file_list.cc
-+++ b/src/display/window_file_list.cc
-@@ -123,7 +123,7 @@ WindowFileList::redraw() {
- if (fl->size_files() == 0 || m_canvas->height() < 2)
- return;
-
-- iterator entries[m_canvas->height() - 1];
-+ std::vector<iterator> entries(m_canvas->height() - 1);
-
- unsigned int last = 0;
-
-diff --git a/src/thread_base.h b/src/thread_base.h
-index 4cd38de..479e3cd 100644
---- a/src/thread_base.h
-+++ b/src/thread_base.h
-@@ -44,11 +44,9 @@
- #include "rak/priority_queue_default.h"
- #include "core/poll_manager.h"
-
--struct thread_queue_hack;
--
- // Move this class to libtorrent.
-
--struct thread_queue_hack;
-+class thread_queue_hack;
-
- class ThreadBase : public torrent::thread_base {
- public:
---
-1.7.3.4
-
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.0-gold.patch b/net-p2p/rtorrent/files/rtorrent-0.9.0-gold.patch
deleted file mode 100644
index aeec1941519f..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.9.0-gold.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- src/Makefile.am | 3 ++-
- src/Makefile.in | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 33ab889..ee9340e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -48,7 +48,8 @@ rtorrent_LDADD = \
- display/libsub_display.a \
- input/libsub_input.a \
- rpc/libsub_rpc.a \
-- utils/libsub_utils.a
-+ utils/libsub_utils.a \
-+ @PTHREAD_LIBS@
-
- rtorrent_SOURCES = \
- main.cc
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 0eecb06..cf52bf5 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -324,7 +324,8 @@ rtorrent_LDADD = \
- display/libsub_display.a \
- input/libsub_input.a \
- rpc/libsub_rpc.a \
-- utils/libsub_utils.a
-+ utils/libsub_utils.a \
-+ @PTHREAD_LIBS@
-
- rtorrent_SOURCES = \
- main.cc
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch
new file mode 100644
index 000000000000..260cd9a38425
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch
@@ -0,0 +1,10 @@
+--- src/display/canvas.h
++++ src/display/canvas.h
+@@ -48,5 +48,5 @@ class Canvas {
+ public:
+ typedef std::vector<Attributes> attributes_list;
+
+- Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
++ Canvas(int x = 0, int y = 0, int width = 1, int height = 1);
+ ~Canvas() { delwin(m_window); }
+ void refresh() { wnoutrefresh(m_window); }
diff --git a/net-p2p/rtorrent/rtorrent-0.9.0.ebuild b/net-p2p/rtorrent/rtorrent-0.9.1.ebuild
index 97bab101dbcd..68367332ec56 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.0.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.9.0.ebuild,v 1.4 2012/03/09 00:15:08 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.9.1.ebuild,v 1.1 2012/04/08 18:21:45 sochotnicky Exp $
EAPI=2
@@ -13,7 +13,7 @@ SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="color daemon debug ipv6 test xmlrpc"
+IUSE="daemon debug ipv6 test xmlrpc"
COMMON_DEPEND=">=net-libs/libtorrent-0.13.${PV##*.}
>=dev-libs/libsigc++-2.2.2:2
@@ -29,9 +29,6 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# bug #358271
epatch "${FILESDIR}"/${P}-ncurses.patch
- epatch "${FILESDIR}"/${P}-gold.patch
- epatch "${FILESDIR}"/${P}-clang.patch
- use color && EPATCH_OPTS="-p1" epatch "${FILESDIR}"/${P}-canvas-fix.patch
}
src_configure() {
@@ -51,14 +48,3 @@ src_install() {
newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd || die "newconfd failed"
fi
}
-
-pkg_postinst() {
- if use color; then
- elog "rtorrent colors patch"
- elog "Set colors using the options below in .rtorrent.rc:"
- elog "Options: done_fg_color, done_bg_color, active_fg_color, active_bg_color"
- elog "Colors: 0 = black, 1 = red, 2 = green, 3 = yellow, 4 = blue,"
- elog "5 = magenta, 6 = cyan and 7 = white"
- elog "Example: done_fg_color = 1"
- fi
-}