old

(Portage version: 2.2_rc60/cvs/Linux x86_64)

11 files changed, 0 insertions, 614 deletions

diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 6985e461247d..a95dd44bbeea 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,20 +1,8 @@
-AUX rtorrent-0.8.0+gcc-4.3.patch 1902 RMD160 36665695d0bfe42d3e90ebb2c803291cab28bd8c SHA1 aad5dec2a373b81bb0a72872c83c243dc1b680b3 SHA256 876478262f4d60263bb29f4ba1059570363b92615dac96093a49c966d166cb94
-AUX rtorrent-0.8.2-fix-configure-execinfo.patch 505 RMD160 4c6d475f02ceb90fde5aa57cb5c661c15340f45e SHA1 8d1865c2d6588571a027955895cbc16837b53531 SHA256 76b9f89404a140bbe54ef49becc8b6eb4e1c6b8b8c95eded31320ac78173b191
-AUX rtorrent-0.8.2-fix_conn_type_seed.patch 872 RMD160 6d459a60e57702d83801c03a756db2adebbc25f3 SHA1 640231a849def797f07278aa1fc71a6f1164044d SHA256 0974025e834799c0d145673d14df4aa7cb1d7421f1a194304ca728d21abedd5b
-AUX rtorrent-0.8.2-fix_load_cache.patch 580 RMD160 a9c9804e37f4e242a68b60fa01eed52e981a6a2c SHA1 e3301560b70be479bbacb3f27e3d992d60dc8bb4 SHA256 7f7dac70d8e5f04248108f558959b49361d9f3598250fec2eadcf45cf0bce49b
-AUX rtorrent-0.8.2-fix_scgi_crash.patch 656 RMD160 24447e6dac267fb5f7a3d8837744a900effefede SHA1 77142a8b3ce9d423eab3f6445e3041216ee1dae1 SHA256 f102facf32a8be73a9a85e443e8db24044f4913d5a08446b502b5d5984177ac7
-AUX rtorrent-0.8.2-fix_start_stop_filter.patch 701 RMD160 6b109e050cc1e66d2d9874bce0fdf599188978c9 SHA1 3289506a9c76d080edbeb3ef1a42694a64da6c4d SHA256 d422c5d9a82a0d799f3b949e4b0d2fd293d98baab1fb293642544895ece75926
-AUX rtorrent-0.8.2-fix_utf8_filenames.patch 8196 RMD160 80af83b87f3794a3e6d9c1216df3559c38f12df0 SHA1 d1e4615aaefab05731010dc05167e912974581bc SHA256 84df9c827d63b81387e7720bbc9436765a940c18f972e655ecc8bc562039c532
 AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
-AUX rtorrent-0.8.4-gcc44.patch 3147 RMD160 39e39fab5e4d847c049bc44e2254dec941af61fc SHA1 b877e02cb0b7f486a432d3eee0073fbeb69b9abe SHA256 7f449b47580a5162204ec0fad039e15950995f00e75ea944b02c2c926390e4aa
 AUX rtorrentd.conf 13 RMD160 aafd4d8440f40ae380b482876968f80267dff3bd SHA1 8b50885e27a2ff85cd28fccb56c11ead26d0ba49 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b
 AUX rtorrentd.init 672 RMD160 a39dd240678ba95329b542762265730351cb5ea5 SHA1 55d2cefcca466052143d475590e8bb46d0ef3563 SHA256 8f807eba0033cfa436d0c7a2493268902c5b5cfa49366cc67f3f5f50125a5d44
-DIST rtorrent-0.8.3.tar.gz 512961 RMD160 bbb51aa44b72ed34c53bfd20dd15fa4aafe302d5 SHA1 c6233de4b4b8d3901472696581ed88a0cd07d11d SHA256 554456550ca6e792297d6d39367120af5b2bd6181d514a43faf4e2f565721908
-DIST rtorrent-0.8.4.tar.gz 518306 RMD160 a7a65a136161dc89e93479cee776cc084dce4ee0 SHA1 83a7c0dbeb46bb074ae075d9faf5d05f0df17571 SHA256 257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee
 DIST rtorrent-0.8.5.tar.gz 512889 RMD160 ebf5bc3a39ec8b9905513a706a480452498ca991 SHA1 ebab4af5c3c5f31803e0880fadd303ecbc6adba8 SHA256 0ec6991772e9318fa5e687b5c2c8b5e0166d8def8d729373e8ae20b815984665
 DIST rtorrent-0.8.6.tar.gz 521045 RMD160 3d5109d4ee26c663b376e0b9f610ab6055c57ba9 SHA1 ffce3959ba91738bb444d689db3db1e2375b14ce SHA256 8c96c68e1524162abd1fc4b612d0c3d924fccc25159c0b3f208e69281f0b32db
-EBUILD rtorrent-0.8.3.ebuild 1751 RMD160 64f0f649ce0fd9ae7f929acd93baa18c06abb7c2 SHA1 278a30c989a47df74e514ff78337ac87640031d1 SHA256 d48fac483a6a2d9f87c677ee7671feb284eb4f361156db12d8beadc25ebb43c7
-EBUILD rtorrent-0.8.4-r1.ebuild 2033 RMD160 9946b39f21c2f1c38982b18d565401e53069a265 SHA1 04d66964ff70bffe322800e6d7844972930d8f42 SHA256 a1868245c1cfab612a8687844cfbd9dbea8d568ccf1191e7c2e99c6b2d09e2d2
 EBUILD rtorrent-0.8.5.ebuild 1994 RMD160 ddb62c5a22c58ce9f5555942ba4a62554ec065b9 SHA1 1071bf68d4dcc3bc0d500c51c2ca57fb5fb9d618 SHA256 98090753a293b3f6dac58b598cb068b97f356a48d4e195206bcbe5d1714cf696
 EBUILD rtorrent-0.8.6.ebuild 1182 RMD160 0608de49f97c5501c200297b623351c9da53a026 SHA1 eae109d073671464e6e3ab31cf7e5a5460dba7c0 SHA256 7e19ce841545527c2b005e64a1e12cfb070704b025dd7fa9436b16d00214ba22
 MISC ChangeLog 21288 RMD160 6149f7b1b58d04483ad3c10716dc75af1ace2125 SHA1 514a390fbcd7139dfc7c5e7e3f141418f4ae84f5 SHA256 be6c420fbf3cdb3c83c1c85cd57a6ef966b2be42933f34724b636e2c5fae6fc8
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.0+gcc-4.3.patch b/net-p2p/rtorrent/files/rtorrent-0.8.0+gcc-4.3.patch
deleted file mode 100644
index d95e6d3e414c..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.0+gcc-4.3.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nurp rtorrent-0.8.0.old/rak/functional.h rtorrent-0.8.0/rak/functional.h
---- rtorrent-0.8.0.old/rak/functional.h	2008-03-09 15:56:18.000000000 +0100
-+++ rtorrent-0.8.0/rak/functional.h	2008-03-09 16:04:47.000000000 +0100
-@@ -37,6 +37,7 @@
- #ifndef RAK_FUNCTIONAL_H
- #define RAK_FUNCTIONAL_H
- 
-+#include <cstddef>
- #include <functional>
- 
- namespace rak {
-diff -Nurp rtorrent-0.8.0.old/src/command_ui.cc rtorrent-0.8.0/src/command_ui.cc
---- rtorrent-0.8.0.old/src/command_ui.cc	2008-03-09 15:56:18.000000000 +0100
-+++ rtorrent-0.8.0/src/command_ui.cc	2008-03-09 16:05:36.000000000 +0100
-@@ -36,6 +36,8 @@
- 
- #include "config.h"
- 
-+#include <ctime>
-+
- #include <rak/functional.h>
- #include <rak/functional_fun.h>
- #include <sigc++/adaptors/bind.h>
-
-diff -Nurp rtorrent-0.8.0.old/src/display/text_element_value.cc rtorrent-0.8.0/src/display/text_element_value.cc
---- rtorrent-0.8.0.old/src/display/text_element_value.cc	2008-03-09 15:56:18.000000000 +0100
-+++ rtorrent-0.8.0/src/display/text_element_value.cc	2008-03-09 16:07:39.000000000 +0100
-@@ -36,6 +36,8 @@
- 
- #include "config.h"
- 
-+#include <ctime>
-+
- #include "globals.h"
- #include "text_element_value.h"
- 
-diff -Nurp rtorrent-0.8.0.old/src/rpc/exec_file.cc rtorrent-0.8.0/src/rpc/exec_file.cc
---- rtorrent-0.8.0.old/src/rpc/exec_file.cc	2008-03-09 15:56:18.000000000 +0100
-+++ rtorrent-0.8.0/src/rpc/exec_file.cc	2008-03-09 16:04:14.000000000 +0100
-@@ -36,6 +36,7 @@
- 
- #include "config.h"
- 
-+#include <cstring>
- #include <string>
- #include <unistd.h>
- #include <rak/path.h>
-diff -Nurp rtorrent-0.8.0.old/src/rpc/parse.cc rtorrent-0.8.0/src/rpc/parse.cc
---- rtorrent-0.8.0.old/src/rpc/parse.cc	2008-03-09 15:56:18.000000000 +0100
-+++ rtorrent-0.8.0/src/rpc/parse.cc	2008-03-09 16:04:29.000000000 +0100
-@@ -36,6 +36,7 @@
- 
- #include "config.h"
- 
-+#include <cstring>
- #include <locale>
- #include <rak/path.h>
- #include <torrent/exceptions.h>
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix-configure-execinfo.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix-configure-execinfo.patch
deleted file mode 100644
index 4df674759d02..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix-configure-execinfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fixes a segfault when configure finds execinfo.h
-Index: rtorrent/scripts/common.m4
-===================================================================
---- rtorrent/scripts/common.m4	(revision 1062)
-+++ rtorrent/scripts/common.m4	(working copy)
-@@ -183,7 +183,7 @@
- AC_DEFUN([TORRENT_CHECK_EXECINFO], [
-   AC_MSG_CHECKING(for execinfo.h)
- 
--  AC_RUN_IFELSE(
-+  AC_LINK_IFELSE(
-     [[#include <execinfo.h>
-       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
-     ]],
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_conn_type_seed.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_conn_type_seed.patch
deleted file mode 100644
index 6b050f8b5766..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_conn_type_seed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rtorrent/src/core/download_list.cc
-===================================================================
---- rtorrent/src/core/download_list.cc	(revision 1060)
-+++ rtorrent/src/core/download_list.cc	(working copy)
-@@ -399,7 +399,7 @@
-     rpc::call_command("d.set_state_counter", rpc::call_command_value("d.get_state_counter", rpc::make_target(download)), rpc::make_target(download));
- 
-     // If initial seeding is complete, don't try it again when restarting.
--    if (download->is_done())
-+    if (download->is_done() && rpc::call_command_void("d.get_connection_current", rpc::make_target(download)).as_string() == "initial_seed")
-       rpc::call_command("d.set_connection_seed", rpc::call_command_void("d.get_connection_current", rpc::make_target(download)), rpc::make_target(download));
- 
-     // Save the state after all the slots, etc have been called so we
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_load_cache.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_load_cache.patch
deleted file mode 100644
index 3d37ca47e5e8..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_load_cache.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: rtorrent/src/core/manager.cc
-===================================================================
---- rtorrent/src/core/manager.cc	(revision 1060)
-+++ rtorrent/src/core/manager.cc	(working copy)
-@@ -383,7 +383,8 @@
- void
- Manager::try_create_download(const std::string& uri, int flags, const command_list_type& commands) {
-   // If the path was attempted loaded before, skip it.
--  if (!(flags & create_raw_data) &&
-+  if ((flags & create_tied) &&
-+      !(flags & create_raw_data) &&
-       !is_network_uri(uri) &&
-       !file_status_cache()->insert(uri, 0))
-     return;
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_scgi_crash.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_scgi_crash.patch
deleted file mode 100644
index acc80ae10d05..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_scgi_crash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# Fix a crash in scgi_local or scgi_port when calling
-# freeaddrinfo with a NULL pointer.
-Index: rtorrent/src/command_network.cc
-===================================================================
---- rtorrent/src/command_network.cc	(revision 1063)
-+++ rtorrent/src/command_network.cc	(working copy)
-@@ -261,10 +261,10 @@
-       break;
-     }
- 
--    rak::address_info::free_address_info(ai);
-+    if (ai != NULL) rak::address_info::free_address_info(ai);
- 
-   } catch (torrent::local_error& e) {
--    rak::address_info::free_address_info(ai);
-+    if (ai != NULL) rak::address_info::free_address_info(ai);
- 
-     throw torrent::input_error(e.what());
-   }
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_start_stop_filter.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_start_stop_filter.patch
deleted file mode 100644
index 2f9267821104..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_start_stop_filter.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: rtorrent/src/main.cc
-===================================================================
---- rtorrent/src/main.cc	(revision 1060)
-+++ rtorrent/src/main.cc	(working copy)
-@@ -187,12 +187,12 @@
-        "view_filter = active,false=\n"
- 
-        "view_add = started\n"
--       "view_filter = started,false=\n"
-+       "view_filter = started,d.get_state=\n"
-        "view.event_added = started,scheduler.simple.added=\n"
-        "view.event_removed = started,scheduler.simple.removed=\n"
- 
-        "view_add = stopped\n"
--       "view_filter = stopped,false=\n"
-+       "view_filter = stopped,not=$d.get_state=\n"
- 
-        "view_add = complete\n"
-        "view_filter = complete,d.get_complete=\n"
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_utf8_filenames.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_utf8_filenames.patch
deleted file mode 100644
index bf73527c79ed..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_utf8_filenames.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-# Fix display of multi-byte characters with attributes
-# (i.e. utf-8 filenames in the file list), and make the
-# list aware of characters occupying two screen positions.
-Index: rtorrent/src/display/window_file_list.cc
-===================================================================
---- rtorrent/src/display/window_file_list.cc	(revision 1063)
-+++ rtorrent/src/display/window_file_list.cc	(working copy)
-@@ -57,22 +57,61 @@
-   m_element(element) {
- }
- 
--/*
-+// Convert std::string to std::wstring of given width (in screen positions),
-+// taking into account that some characters may be occupying two screen positions.
- std::wstring
--hack_wstring(const std::string& src) {
--  size_t length = ::mbstowcs(NULL, src.c_str(), src.size());
-+wstring_width(const std::string& i_str, int width) {
-+  wchar_t result[width + 1];
-+  size_t length = std::mbstowcs(result, i_str.c_str(), width);
- 
--  if (length == (size_t)-1)
--    return std::wstring(L"<invalid>");
-+  // If not valid UTF-8 encoding, at least copy the printable characters.
-+  if (length == (size_t)-1) {
-+    wchar_t* out = result;
- 
--  std::wstring dest;
--  dest.resize(length);
--  
--  ::mbstowcs(&*dest.begin(), src.c_str(), src.size());
-+    for (std::string::const_iterator itr = i_str.begin(); itr != i_str.end(); ++itr)
-+      if (!std::isprint(*itr, std::locale::classic()))
-+        *out++ = '?';
-+      else
-+        *out++ = *itr;
- 
--  return dest;
-+     *out = 0;
-+  }
-+
-+  int swidth = wcswidth(result, width);
-+
-+  // Limit to width if it's too wide already.
-+  if (swidth == -1 || swidth > width) {
-+    length = swidth = 0;
-+    
-+    while (result[length]) {
-+      int next = ::wcwidth(result[length]);
-+
-+      // Unprintable character?
-+      if (next == -1) {
-+        result[length] = '?';
-+        next = 1;
-+      }
-+
-+      if (swidth + next > width) {
-+        result[length] = 0;
-+        break;
-+      }
-+
-+      length++;
-+      swidth += next;
-+    }
-+  }
-+
-+  // Pad with spaces to given width.
-+  while (swidth < width && length <= (unsigned int)width) {
-+    result[length++] = ' ';
-+    swidth++;
-+  }
-+
-+  result[length] = 0;
-+
-+  return result;
- }
--*/
- 
- void
- WindowFileList::redraw() {
-@@ -115,6 +154,8 @@
-   }
- 
-   unsigned int pos = 0;
-+  int filenameWidth = m_canvas->width() - 16;
-+
-   m_canvas->print(0, pos++, "Cmp Pri  Size   Filename");
- 
-   while (pos != m_canvas->height()) {
-@@ -123,20 +164,19 @@
-     if (itr == iterator(fl->end()))
-       break;
- 
-+    m_canvas->set_default_attributes(itr == m_element->selected() ? is_focused() ? A_REVERSE : A_BOLD : A_NORMAL);
-+
-     if (itr.is_empty()) {
--      m_canvas->print(16, pos, "EMPTY");
-+      m_canvas->print(0, pos, "%*c%-*s", 16, ' ', filenameWidth, "EMPTY");
- 
-     } else if (itr.is_entering()) {
--      m_canvas->print(16 + itr.depth(), pos, "\\ %s", 
--                      itr.depth() < (*itr)->path()->size() ? (*itr)->path()->at(itr.depth()).c_str() : "UNKNOWN");
-+      m_canvas->print(0, pos, "%*c %ls", 16 + itr.depth(), '\\',
-+                      itr.depth() < (*itr)->path()->size() ? wstring_width((*itr)->path()->at(itr.depth()), filenameWidth - itr.depth() - 1).c_str() : L"UNKNOWN");
- 
-     } else if (itr.is_leaving()) {
--      m_canvas->print(16 + itr.depth() - 1, pos, "/");
-+      m_canvas->print(0, pos, "%*c %-*s", 16 + (itr.depth() - 1), '/', filenameWidth - (itr.depth() - 1), "");
- 
-     } else if (itr.is_file()) {
--      char buffer[std::max<unsigned int>(m_canvas->width() + 1, 256)];
--      Canvas::attributes_list attributes;
--
-       torrent::File* e = *itr;
- 
-       const char* priority;
-@@ -148,34 +188,27 @@
-       default: priority = "BUG"; break;
-       };
- 
--      sprintf(buffer, "%3d %s ", done_percentage(e), priority);
-+      m_canvas->print(0, pos, "%3d %s ", done_percentage(e), priority);
- 
-       int64_t val = e->size_bytes();
- 
--      if (val < (int64_t(1000) << 20))
--        sprintf(buffer + 8, "%5.1f M", (double)val / (int64_t(1) << 20));
-+      if (val < (int64_t(1000) << 10))
-+        m_canvas->print(8, pos, "%5.1f K", (double)val / (int64_t(1) << 10));
-+      else if (val < (int64_t(1000) << 20))
-+        m_canvas->print(8, pos, "%5.1f M", (double)val / (int64_t(1) << 20));
-       else if (val < (int64_t(1000) << 30))
--        sprintf(buffer + 8, "%5.1f G", (double)val / (int64_t(1) << 30));
-+        m_canvas->print(8, pos, "%5.1f G", (double)val / (int64_t(1) << 30));
-       else
--        sprintf(buffer + 8, "%5.1f T", (double)val / (int64_t(1) << 40));
-+        m_canvas->print(8, pos, "%5.1f T", (double)val / (int64_t(1) << 40));
- 
--      std::fill_n(buffer + 15, 64, ' ');
-+      m_canvas->print(15, pos, "%*c %ls", 1 + itr.depth(), '|',
-+                      itr.depth() < (*itr)->path()->size() ? wstring_width((*itr)->path()->at(itr.depth()), filenameWidth - itr.depth() - 1).c_str() : L"UNKNOWN");
- 
--      int first = 16 + std::min<unsigned int>(itr.depth(), 8);
--      int last = std::max<unsigned int>(m_canvas->width() + 1, 16 + 12);
--
--      snprintf(buffer + first, last - first, "| %s",
--               itr.depth() < (*itr)->path()->size() ? (*itr)->path()->at(itr.depth()).c_str() : "UNKNOWN");
--
--      m_canvas->print_attributes(0, pos, buffer, buffer + std::strlen(buffer), &attributes);
--
-     } else {
-       m_canvas->print(0, pos, "BORK BORK");
-     }
-+    m_canvas->set_default_attributes(A_NORMAL);
- 
--    if (itr == m_element->selected())
--      m_canvas->set_attr(0, pos, m_canvas->width(), is_focused() ? A_REVERSE : A_BOLD, COLOR_PAIR(0));
--
-     pos++;
-     first = (first + 1) % (m_canvas->height() - 1);
-   }
-Index: rtorrent/src/display/canvas.cc
-===================================================================
---- rtorrent/src/display/canvas.cc	(revision 1063)
-+++ rtorrent/src/display/canvas.cc	(working copy)
-@@ -57,17 +57,31 @@
- Canvas::print_attributes(unsigned int x, unsigned int y, const char* first, const char* last, const attributes_list* attributes) {
-   move(x, y);
- 
-+  attr_t org_attr;
-+  short org_pair;
-+  wattr_get(m_window, &org_attr, &org_pair, NULL);
-+
-   attributes_list::const_iterator attrItr = attributes->begin();
--  Attributes current = Attributes(first, Attributes::a_normal, Attributes::color_default);
-+  wattr_set(m_window, Attributes::a_normal, Attributes::color_default, NULL);
- 
-   while (first != last) {
--    if (attrItr != attributes->end() && first >= attrItr->position())
--      current = *attrItr++;
-+    const char* next = last;
- 
--    waddch(m_window, *first++ | current.attributes());
-+    if (attrItr != attributes->end()) {
-+      next = attrItr->position();
-+
-+      if (first >= next) {
-+        wattr_set(m_window, attrItr->attributes(), attrItr->colors(), NULL);
-+        ++attrItr;
-+      }
-+    }
-+
-+    print("%.*s", next - first, first);
-+    first = next;
-   }
- 
-   // Reset the color.
-+  wattr_set(m_window, org_attr, org_pair, NULL);
- }
- 
- void
-Index: rtorrent/src/display/canvas.h
-===================================================================
---- rtorrent/src/display/canvas.h	(revision 1063)
-+++ rtorrent/src/display/canvas.h	(working copy)
-@@ -86,6 +86,7 @@
-   // since the string shall always be a C string choosen at
-   // compiletime. Might cause extra copying of the string?
- 
-+  void                print(const char* str, ...);
-   void                print(unsigned int x, unsigned int y, const char* str, ...);
- 
-   void                print_attributes(unsigned int x, unsigned int y, const char* first, const char* last, const attributes_list* attributes);
-@@ -95,6 +96,8 @@
- 
-   void                set_attr(unsigned int x, unsigned int y, unsigned int n, int attr, int color) { mvwchgat(m_window, y, x, n, attr, color, NULL); }
- 
-+  void                set_default_attributes(int attr)                            { wattrset(m_window, attr); }
-+
-   // Initialize stdscr.
-   static void         initialize();
-   static void         cleanup();
-@@ -116,6 +119,15 @@
- };
- 
- inline void
-+Canvas::print(const char* str, ...) {
-+  va_list arglist;
-+
-+  va_start(arglist, str);
-+  vw_printw(m_window, const_cast<char*>(str), arglist);
-+  va_end(arglist);
-+}
-+
-+inline void
- Canvas::print(unsigned int x, unsigned int y, const char* str, ...) {
-   va_list arglist;
- 
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch b/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch
deleted file mode 100644
index 10dad5f608d1..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Nurp rtorrent-0.8.4.old/src/rpc/scgi_task.cc rtorrent-0.8.4/src/rpc/scgi_task.cc
---- rtorrent-0.8.4.old/src/rpc/scgi_task.cc     2008-05-07 07:19:10.000000000 -0500
-+++ rtorrent-0.8.4/src/rpc/scgi_task.cc 2009-02-04 10:23:31.000000000 -0600
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <cstdio>
-+
- #include <rak/error_number.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-
-
-diff -Nurp rtorrent-0.8.4.old/src/command_peer.cc rtorrent-0.8.4/src/command_peer.cc
---- rtorrent-0.8.4.old/src/command_peer.cc      2008-05-07 07:19:11.000000000 -0500
-+++ rtorrent-0.8.4/src/command_peer.cc  2009-02-04 10:26:53.000000000 -0600
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <cstdio>
-+
- #include <rak/error_number.h>
- #include <rak/path.h>
- #include <rak/socket_address.h>
-
-
-
-diff -Nurp rtorrent-0.8.4.old/src/display/utils.cc rtorrent-0.8.4/src/display/utils.cc
---- rtorrent-0.8.4.old/src/display/utils.cc     2008-08-27 03:25:01.000000000 -0500
-+++ rtorrent-0.8.4/src/display/utils.cc 2009-02-04 10:20:34.000000000 -0600
-@@ -36,6 +36,7 @@
-
- #include "config.h"
-
-+#include <cstdio>
- #include <cstring>
- #include <sstream>
- #include <iomanip>
-
-
-diff -Nurp rtorrent-0.8.4.old/src/rpc/parse.cc rtorrent-0.8.4/src/rpc/parse.cc
---- rtorrent-0.8.4.old/src/rpc/parse.cc 2008-08-26 15:14:33.000000000 -0500
-+++ rtorrent-0.8.4/src/rpc/parse.cc     2009-02-04 10:23:06.000000000 -0600
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <cstring>
-+#include <cstdio>
- #include <locale>
- #include <rak/path.h>
- #include <torrent/exceptions.h>
-
- diff -Nurp rtorrent-0.8.4.old/src/utils/lockfile.cc rtorrent-0.8.4/src/utils/lockfile.cc
---- rtorrent-0.8.4.old/src/utils/lockfile.cc    2008-05-07 07:19:11.000000000 -0500
-+++ rtorrent-0.8.4/src/utils/lockfile.cc        2009-02-04 10:25:10.000000000 -0600
-@@ -40,6 +40,7 @@
- #include <cctype>
- #include <cerrno>
- #include <cstring>
-+#include <cstdio>
- #include <sstream>
- #include <fcntl.h>
- #include <signal.h>
-
-diff -Nurp rtorrent-0.8.4.old/src/command_download.cc rtorrent-0.8.4/src/command_download.cc
---- rtorrent-0.8.4.old/src/command_download.cc  2008-11-19 11:01:20.000000000 -0600
-+++ rtorrent-0.8.4/src/command_download.cc      2009-02-04 10:25:32.000000000 -0600
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <cstdio>
-+
- #include <functional>
- #include <unistd.h>
- #include <rak/file_stat.h>
-
-
-diff -Nurp rtorrent-0.8.4.old/src/command_events.cc rtorrent-0.8.4/src/command_events.cc
---- rtorrent-0.8.4.old/src/command_events.cc    2008-11-11 04:37:20.000000000 -0600
-+++ rtorrent-0.8.4/src/command_events.cc        2009-02-04 10:25:58.000000000 -0600
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <cstdio>
-+
- #include <functional>
- #include <rak/file_stat.h>
- #include <rak/path.h>
-
-diff -Nurp rtorrent-0.8.4.old/src/command_network.cc rtorrent-0.8.4/src/command_network.cc
---- rtorrent-0.8.4.old/src/command_network.cc   2008-08-27 03:25:01.000000000 -0500
-+++ rtorrent-0.8.4/src/command_network.cc       2009-02-04 10:26:22.000000000 -0600
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <cstdio>
-+
- #include <functional>
- #include <rak/address_info.h>
- #include <rak/path.h>
diff --git a/net-p2p/rtorrent/rtorrent-0.8.3.ebuild b/net-p2p/rtorrent/rtorrent-0.8.3.ebuild
deleted file mode 100644
index ef6569b52dec..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.8.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.3.ebuild,v 1.4 2009/03/01 19:52:19 loki_val Exp $
-
-inherit base eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="BitTorrent Client using libtorrent"
-HOMEPAGE="http://libtorrent.rakshasa.no/"
-SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug ipv6 xmlrpc"
-
-RDEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
-	>=dev-libs/libsigc++-2
-	>=net-misc/curl-7.18
-	sys-libs/ncurses
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-DEPEND="${RDEPEND}
-        dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.2-gcc34.patch" )
-
-src_compile() {
-	replace-flags -Os -O2
-	append-flags -fno-strict-aliasing
-
-	if [[ $(tc-arch) = "x86" ]]; then
-		filter-flags -fomit-frame-pointer -fforce-addr
-	fi
-
-	econf	$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c) \
-		--disable-dependency-tracking \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README TODO doc/rtorrent.rc
-}
-
-pkg_postinst() {
-	elog "rtorrent now supports a configuration file."
-	elog "A sample configuration file for rtorrent can be found"
-	elog "in rtorrent.rc in ${ROOT}usr/share/doc/${PF}/"
-	elog ""
-	ewarn "If you're upgrading from rtorrent <0.8.0, you will have to delete your"
-	ewarn "session directory or run the fixSession080-c.py script from this address:"
-	ewarn "http://rssdler.googlecode.com/files/fixSession080-c.py"
-	ewarn "See http://libtorrent.rakshasa.no/wiki/LibTorrentKnownIssues for more info."
-}
diff --git a/net-p2p/rtorrent/rtorrent-0.8.4-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.8.4-r1.ebuild
deleted file mode 100644
index 618c68e8dcb5..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.4-r1.ebuild,v 1.7 2009/03/06 00:13:27 jer Exp $
-
-inherit base eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="BitTorrent Client using libtorrent"
-HOMEPAGE="http://libtorrent.rakshasa.no/"
-SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="daemon debug ipv6 xmlrpc"
-
-COMMON_DEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
-	>=dev-libs/libsigc++-2.2.2
-	>=net-misc/curl-7.19.1
-	sys-libs/ncurses
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-RDEPEND="${COMMON_DEPEND}
-	daemon? ( app-misc/screen )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.2-gcc34.patch"
-	"${FILESDIR}/${PN}-0.8.4-gcc44.patch" )
-
-src_compile() {
-	replace-flags -Os -O2
-	append-flags -fno-strict-aliasing
-
-	if [[ $(tc-arch) = "x86" ]]; then
-		filter-flags -fomit-frame-pointer -fforce-addr
-	fi
-
-	econf	$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c) \
-		--disable-dependency-tracking \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README TODO doc/rtorrent.rc
-
-	if use daemon; then
-		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd || die "newinitd failed"
-		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "rtorrent now supports a configuration file."
-	elog "A sample configuration file for rtorrent can be found"
-	elog "in rtorrent.rc in ${ROOT}usr/share/doc/${PF}/"
-	elog ""
-	ewarn "If you're upgrading from rtorrent <0.8.0, you will have to delete your"
-	ewarn "session directory or run the fixSession080-c.py script from this address:"
-	ewarn "http://rssdler.googlecode.com/files/fixSession080-c.py"
-	ewarn "See http://libtorrent.rakshasa.no/wiki/LibTorrentKnownIssues for more info."
-}