Cleaning up old ebuild, version bump for bug #509932

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xE25EE336)

8 files changed, 67 insertions, 537 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index 71227bf63384..f521050ef7ff 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.184 2014/05/18 19:58:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.185 2014/06/29 16:06:24 vostorga Exp $
+
+*rtorrent-0.9.4 (29 Jun 2014)
+
+  29 Jun 2014; Victor Ostorga <vostorga@gentoo.org>
+  -files/rtorrent-0.8.2-gcc34.patch, -rtorrent-0.8.6-r1.ebuild,
+  -rtorrent-0.8.6-r4.ebuild, -files/rtorrent-0.8.6-canvas-fix.patch,
+  -files/rtorrent-0.8.6-ncurses.patch, -rtorrent-0.8.7-r4.ebuild,
+  +rtorrent-0.9.4.ebuild:
+  Cleaning up old ebuild, version bump for bug #509932
 
   18 May 2014; Sven Vermeulen <swift@gentoo.org> rtorrent-0.8.6-r1.ebuild,
   rtorrent-0.8.6-r4.ebuild, rtorrent-0.8.7-r4.ebuild, rtorrent-0.8.9.ebuild,
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-gcc34.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-gcc34.patch
deleted file mode 100644
index 1e761b2a6272..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.2-gcc34.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -rwud rtorrent-0.8.2/src/rpc/command.h rtorrent-0.8.2-my/src/rpc/command.h
---- rtorrent-0.8.2/src/rpc/command.h	2008-05-07 14:19:10.000000000 +0200
-+++ rtorrent-0.8.2-my/src/rpc/command.h	2008-06-09 02:23:34.000000000 +0200
-@@ -73,10 +73,8 @@
-   rt_triple(const T1& a, const T2& b, const T3& c) :
-     base_type(a, b), third(c) {}
- 
--  template <typename U1, typename U2>
--  rt_triple(const std::pair<U1, U2>& b) : base_type(b), third() {}
-+  rt_triple(const base_type& b) : base_type(b), third() {}
- 
--  template <typename U1, typename U2, typename U3>
-   rt_triple(const rt_triple& src) :
-     base_type(src.first, src.second), third(src.third) {}
- };
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.6-canvas-fix.patch b/net-p2p/rtorrent/files/rtorrent-0.8.6-canvas-fix.patch
deleted file mode 100644
index 02b8a186d9a6..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.6-canvas-fix.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/command_network.cc ./src/command_network.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/command_network.cc	2009-11-12 09:19:40.000000000 +0100
---- ./src/command_network.cc	2009-12-17 19:27:05.783955715 +0100
-***************
-*** 495,498 ****
---- 495,502 ----
-    // Not really network stuff:
-    ADD_VARIABLE_BOOL  ("handshake_log", false);
-    ADD_VARIABLE_STRING("log.tracker", "");
-+   ADD_COMMAND_VALUE_TRI("done_fg_color",     rak::make_mem_fun(control->ui(), &ui::Root::set_done_fg_color), rak::make_mem_fun(control->ui(), &ui::Root::get_done_fg_color));
-+   ADD_COMMAND_VALUE_TRI("done_bg_color",     rak::make_mem_fun(control->ui(), &ui::Root::set_done_bg_color), rak::make_mem_fun(control->ui(), &ui::Root::get_done_bg_color));
-+   ADD_COMMAND_VALUE_TRI("active_fg_color",     rak::make_mem_fun(control->ui(), &ui::Root::set_active_fg_color), rak::make_mem_fun(control->ui(), &ui::Root::get_active_fg_color));
-+   ADD_COMMAND_VALUE_TRI("active_bg_color",     rak::make_mem_fun(control->ui(), &ui::Root::set_active_bg_color), rak::make_mem_fun(control->ui(), &ui::Root::get_active_bg_color));
-  }
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/canvas.cc ./src/display/canvas.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/canvas.cc	2009-11-12 09:03:47.000000000 +0100
---- ./src/display/canvas.cc	2009-12-17 19:27:05.783955715 +0100
-***************
-*** 92,97 ****
---- 92,101 ----
-    m_isInitialized = true;
-  
-    initscr();
-+   start_color();
-+   use_default_colors();
-+   init_pair(2, -1, -1);
-+   init_pair(1, -1, -1);
-    raw();
-    noecho();
-    nodelay(stdscr, TRUE);
-Only in ./src/display: canvas.cc.orig
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/window_download_list.cc ./src/display/window_download_list.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/window_download_list.cc	2009-11-12 09:03:47.000000000 +0100
---- ./src/display/window_download_list.cc	2009-12-17 19:27:05.783955715 +0100
-***************
-*** 37,42 ****
---- 37,43 ----
-  #include "config.h"
-  
-  #include <rak/algorithm.h>
-+ #include <torrent/rate.h>
-  
-  #include "core/download.h"
-  #include "core/view.h"
-***************
-*** 96,107 ****
-      char* position;
-      char* last = buffer + m_canvas->width() - 2 + 1;
-  
-      position = print_download_title(buffer, last, *range.first);
-!     m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-      
-      position = print_download_info(buffer, last, *range.first);
-      m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-  
-      position = print_download_status(buffer, last, *range.first);
-      m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-  
---- 97,126 ----
-      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);
-!     if( (*range.first)->is_done() ) {
-!       if( (*range.first)->download()->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)->download()->is_active() ) {
-!       if( (*range.first)->download()->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,112 ****
---- 128,167 ----
-    }    
-  }
-  
-+ 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);
-+ }
-+ 
-  }
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/window_download_list.h ./src/display/window_download_list.h
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/window_download_list.h	2009-11-12 09:03:47.000000000 +0100
---- ./src/display/window_download_list.h	2009-12-17 19:27:05.783955715 +0100
-***************
-*** 59,64 ****
---- 59,68 ----
-    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;
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/download_list.cc ./src/ui/download_list.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/download_list.cc	2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/download_list.cc	2009-12-17 19:27:05.783955715 +0100
-***************
-*** 137,142 ****
---- 137,147 ----
-    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())
-Only in ./src/ui: download_list.cc.orig
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/download_list.h ./src/ui/download_list.h
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/download_list.h	2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/download_list.h	2009-12-17 19:27:05.783955715 +0100
-***************
-*** 101,106 ****
---- 101,107 ----
-    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; }
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/element_download_list.h ./src/ui/element_download_list.h
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/element_download_list.h	2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/element_download_list.h	2009-12-17 19:27:05.783955715 +0100
-***************
-*** 60,65 ****
---- 60,66 ----
-    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);
-Only in ./src/ui: element_download_list.h.orig
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/root.cc ./src/ui/root.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/root.cc	2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/root.cc	2009-12-17 19:27:05.783955715 +0100
-***************
-*** 44,49 ****
---- 44,50 ----
-  
-  #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,71 ****
-    m_windowTitle(NULL),
-    m_windowHttpQueue(NULL),
-    m_windowInput(NULL),
-!   m_windowStatusbar(NULL) {
-  }
-  
-  void
---- 66,76 ----
-    m_windowTitle(NULL),
-    m_windowHttpQueue(NULL),
-    m_windowInput(NULL),
-!   m_windowStatusbar(NULL),
-!   done_fg_color(-1),
-!   done_bg_color(-1),
-!   active_fg_color(-1),
-!   active_bg_color(-1) {
-  }
-  
-  void
-***************
-*** 97,102 ****
---- 102,111 ----
-    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,224 ****
---- 228,273 ----
-      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));
-Only in ./src/ui: root.cc.orig
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/root.h ./src/ui/root.h
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/root.h	2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/root.h	2009-12-17 19:27:05.783955715 +0100
-***************
-*** 82,87 ****
---- 82,95 ----
-    // 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);
-***************
-*** 105,110 ****
---- 113,122 ----
-    WStatusbar*         m_windowStatusbar;
-  
-    input::Bindings     m_bindings;
-+   int64_t                done_fg_color;
-+   int64_t                done_bg_color;
-+   int64_t                active_fg_color;
-+   int64_t                active_bg_color;
-  };
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.6-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.8.6-ncurses.patch
deleted file mode 100644
index 0dabca3c88b8..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.6-ncurses.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-rtorrent segfaults with latest ncurses (5.8).
-this patch fixes the issue.
-
-https://bugs.gentoo.org/show_bug.cgi?id=358271
-https://bugzilla.redhat.com/show_bug.cgi?id=682454
-http://libtorrent.rakshasa.no/ticket/2518
---- src/display/canvas.h
-+++ src/display/canvas.h
-@@ -48,7 +48,7 @@ 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) :
-     m_window(newwin(height, width, y, x)) {}
-   ~Canvas() { delwin(m_window); }
diff --git a/net-p2p/rtorrent/rtorrent-0.8.6-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.8.6-r1.ebuild
deleted file mode 100644
index b1e9382d9d83..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6-r1.ebuild,v 1.9 2014/05/18 19:58:08 swift Exp $
-
-EAPI=2
-
-inherit eutils
-
-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 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="daemon debug ipv6 selinux xmlrpc"
-
-COMMON_DEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
-	>=dev-libs/libsigc++-2.2.2:2
-	>=net-misc/curl-7.19.1
-	sys-libs/ncurses
-	selinux? ( sec-policy/selinux-rtorrent )
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-RDEPEND="${COMMON_DEPEND}
-	daemon? ( app-misc/screen )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-canvas-fix.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	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 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"
-}
diff --git a/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild b/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild
deleted file mode 100644
index b738ac39b4d1..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild,v 1.3 2014/05/18 19:58:08 swift Exp $
-
-EAPI=2
-
-inherit eutils
-
-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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="daemon debug ipv6 selinux xmlrpc"
-
-COMMON_DEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
-	>=dev-libs/libsigc++-2.2.2:2
-	>=net-misc/curl-7.19.1
-	sys-libs/ncurses
-	selinux? ( sec-policy/selinux-rtorrent )
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-RDEPEND="${COMMON_DEPEND}
-	daemon? ( app-misc/screen )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-canvas-fix.patch
-
-	# bug #358271
-	epatch "${FILESDIR}"/${P}-ncurses.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	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 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"
-}
diff --git a/net-p2p/rtorrent/rtorrent-0.8.7-r4.ebuild b/net-p2p/rtorrent/rtorrent-0.8.7-r4.ebuild
deleted file mode 100644
index 175403088eab..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.8.7-r4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.7-r4.ebuild,v 1.4 2014/05/18 19:58:08 swift Exp $
-
-EAPI=2
-
-inherit eutils
-
-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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="color daemon debug ipv6 selinux test xmlrpc"
-
-COMMON_DEPEND="~net-libs/libtorrent-0.12.${PV##*.}
-	>=dev-libs/libsigc++-2.2.2:2
-	>=net-misc/curl-7.19.1
-	sys-libs/ncurses
-	selinux? ( sec-policy/selinux-rtorrent )
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-RDEPEND="${COMMON_DEPEND}
-	daemon? ( app-misc/screen )"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-util/cppunit )
-	virtual/pkgconfig"
-
-src_prepare() {
-	# bug #358271
-	epatch "${FILESDIR}"/${PN}-0.8.6-ncurses.patch
-
-	use color && EPATCH_OPTS="-p1" epatch "${FILESDIR}"/${P}-canvas-fix.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README TODO doc/rtorrent.rc
-	doman doc/rtorrent.1
-
-	if use daemon; then
-		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd || die "newinitd failed"
-		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
-}
diff --git a/net-p2p/rtorrent/rtorrent-0.9.4.ebuild b/net-p2p/rtorrent/rtorrent-0.9.4.ebuild
new file mode 100644
index 000000000000..e19eb080cd4b
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.9.4.ebuild,v 1.1 2014/06/29 16:06:24 vostorga Exp $
+
+EAPI=4
+
+inherit eutils
+
+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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="daemon debug ipv6 selinux test xmlrpc"
+
+COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
+	>=dev-libs/libsigc++-2.2.2:2
+	>=net-misc/curl-7.19.1
+	sys-libs/ncurses
+	selinux? ( sec-policy/selinux-rtorrent )
+	xmlrpc? ( dev-libs/xmlrpc-c )"
+RDEPEND="${COMMON_DEPEND}
+	daemon? ( app-misc/screen )"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/cppunit )
+	virtual/pkgconfig"
+
+DOCS=( doc/rtorrent.rc )
+
+src_prepare() {
+	# bug #358271
+	epatch "${FILESDIR}"/${PN}-0.9.1-ncurses.patch
+
+	# upstream forgot to include
+	cp "${FILESDIR}"/rtorrent.1 "${S}"/doc/ || die
+}
+
+src_configure() {
+	# configure needs bash or script bombs out on some null shift, bug #291229
+	CONFIG_SHELL=${BASH} econf \
+		--disable-dependency-tracking \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_with xmlrpc xmlrpc-c)
+}
+
+src_install() {
+	default
+	doman doc/rtorrent.1
+
+	if use daemon; then
+		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd
+		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd
+	fi
+}