13 files changed, 130 insertions, 547 deletions

diff --git a/net-p2p/deluge/files/deluged.in b/net-p2p/deluge/files/deluged.in
new file mode 100644
index 000000000000..f336f54735b0
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.in
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: deluged
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# MANDATORY:
+#
+# deluged_enable (bool):	Set to NO by default.
+#				Set it to YES to enable deluged.
+#
+# deluged_user (str):		The UNPRIVILEGED user to run as
+#
+# OPTIONAL:
+#
+# deluged_flags (str):		Set as needed
+#				See deluged(1) for more information
+#
+# deluged_loglevel (str):	Set to "error" by default
+
+. /etc/rc.subr
+
+name="deluged"
+rcvar=${name}_enable
+
+command=%%PREFIX%%/bin/${name}
+command_interpreter="%%PYTHON_CMD%%"
+
+pidfile=/var/tmp/${name}.pid
+
+start_precmd=${name}_prestart
+
+deluged_prestart()
+{
+	if [ "$deluged_user" = 'asjklasdfjklasdf' ]; then
+		err 1 "You must set deluged_user to a real, unprivileged user"
+	fi
+}
+
+load_rc_config $name
+
+: ${deluged_enable="NO"}
+: ${deluged_user="asjklasdfjklasdf"}
+: ${deluged_loglevel="error"}
+
+required_dirs="/home/${deluged_user}/.config/deluge"
+command_args="-c $required_dirs -L $deluged_loglevel -l /var/tmp/${name}.log -P $pidfile"
+
+run_rc_command "$1"
diff --git a/net-p2p/deluge/files/extra-patch-deluge__main.py b/net-p2p/deluge/files/extra-psyco-patch-deluge__main.py
index 11d20ee229d9..9083ba71af4a 100644
--- a/net-p2p/deluge/files/extra-patch-deluge__main.py
+++ b/net-p2p/deluge/files/extra-psyco-patch-deluge__main.py
@@ -1,7 +1,7 @@
---- deluge/main.py.orig	2010-02-17 00:17:31.000000000 -0200
-+++ deluge/main.py	2010-02-17 00:18:56.000000000 -0200
-@@ -34,6 +34,13 @@
- 
+--- deluge/main.py.orig	2010-02-17 01:16:05.000000000 -0200
++++ deluge/main.py	2010-02-17 01:16:40.000000000 -0200
+@@ -33,6 +33,13 @@
+ #
  #
  
 +try:
diff --git a/net-p2p/deluge/files/extra-psyco-patch-deluge__ui__console__main.py b/net-p2p/deluge/files/extra-psyco-patch-deluge__ui__console__main.py
new file mode 100644
index 000000000000..d5199d584a22
--- /dev/null
+++ b/net-p2p/deluge/files/extra-psyco-patch-deluge__ui__console__main.py
@@ -0,0 +1,17 @@
+--- deluge/ui/console/main.py.orig	2010-02-17 03:37:21.000000000 -0200
++++ deluge/ui/console/main.py	2010-02-17 03:38:06.000000000 -0200
+@@ -34,6 +34,14 @@
+ #
+ #
+ 
++try:
++    import psyco
++    import re
++    psyco.cannotcompile(re.compile)
++    psyco.profile()
++except ImportError:
++    pass
++
+ import os, sys
+ import optparse
+ import shlex
diff --git a/net-p2p/deluge/files/extra-psyco-patch-deluge__ui__gtkui__gtkui.py b/net-p2p/deluge/files/extra-psyco-patch-deluge__ui__gtkui__gtkui.py
new file mode 100644
index 000000000000..96dec7896f66
--- /dev/null
+++ b/net-p2p/deluge/files/extra-psyco-patch-deluge__ui__gtkui__gtkui.py
@@ -0,0 +1,16 @@
+--- deluge/ui/gtkui/gtkui.py.orig	2010-02-17 03:39:33.000000000 -0200
++++ deluge/ui/gtkui/gtkui.py	2010-02-17 03:39:45.000000000 -0200
+@@ -33,6 +33,13 @@
+ #
+ #
+ 
++try:
++    import psyco
++    import re
++    psyco.cannotcompile(re.compile)
++    psyco.profile()
++except ImportError:
++    pass
+ 
+ from deluge.log import LOG as log
+ 
diff --git a/net-p2p/deluge/files/extra-psyco-patch-deluge__ui__web__web.py b/net-p2p/deluge/files/extra-psyco-patch-deluge__ui__web__web.py
new file mode 100644
index 000000000000..5990a90013fa
--- /dev/null
+++ b/net-p2p/deluge/files/extra-psyco-patch-deluge__ui__web__web.py
@@ -0,0 +1,17 @@
+--- deluge/ui/web/web.py.orig	2010-02-17 03:40:21.000000000 -0200
++++ deluge/ui/web/web.py	2010-02-17 03:40:33.000000000 -0200
+@@ -33,6 +33,14 @@
+ #
+ #
+ 
++try:
++    import psyco
++    import re
++    psyco.cannotcompile(re.compile)
++    psyco.profile()
++except ImportError:
++    pass
++
+ import os
+ 
+ from deluge.ui.ui import _UI, UI
diff --git a/net-p2p/deluge/files/patch-deluge__core__preferencesmanager.py b/net-p2p/deluge/files/patch-deluge__core__preferencesmanager.py
deleted file mode 100644
index 46f12e8802c8..000000000000
--- a/net-p2p/deluge/files/patch-deluge__core__preferencesmanager.py
+++ /dev/null
@@ -1,40 +0,0 @@
---- deluge/core/preferencesmanager.py.orig	2009-05-16 03:09:59.000000000 +0900
-+++ deluge/core/preferencesmanager.py	2009-05-28 02:24:21.000000000 +0900
-@@ -105,7 +105,6 @@
-     "auto_managed": True,
-     "move_completed": False,
-     "move_completed_path": deluge.common.get_default_download_dir(),
--    "new_release_check": True,
-     "proxies": {
-         "peer": {
-             "type": 0,
-@@ -215,9 +214,6 @@
-             self._on_send_info)
-         self.config.register_set_function("proxies",
-             self._on_set_proxies)
--        self.new_release_timer = None
--        self.config.register_set_function("new_release_check",
--            self._on_new_release_check)
-         self.config.register_set_function("rate_limit_ip_overhead",
-             self._on_rate_limit_ip_overhead)
- 
-@@ -457,19 +453,6 @@
-         if value:
-             Send_Info_Thread(self.config).start()
- 
--    def _on_new_release_check(self, key, value):
--        if value:
--            log.debug("Checking for new release..")
--            threading.Thread(target=self.core.get_new_release).start()
--            if self.new_release_timer:
--                gobject.source_remove(self.new_release_timer)
--            # Set a timer to check for a new release every 3 days
--            self.new_release_timer = gobject.timeout_add(
--                72 * 60 * 60 * 1000, self._on_new_release_check, "new_release_check", True)
--        else:
--            if self.new_release_timer:
--                gobject.source_remove(self.new_release_timer)
--
-     def _on_set_proxies(self, key, value):
-         for k, v in value.items():
-             if v["type"]:
diff --git a/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__main_window.glade b/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__main_window.glade
deleted file mode 100644
index 797e67246040..000000000000
--- a/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__main_window.glade
+++ /dev/null
@@ -1,199 +0,0 @@
---- deluge/ui/gtkui/glade/main_window.glade.orig	2009-05-16 14:47:35.000000000 +0900
-+++ deluge/ui/gtkui/glade/main_window.glade	2009-05-28 02:25:00.000000000 +0900
-@@ -2403,196 +2403,6 @@
-       </widget>
-     </child>
-   </widget>
--  <widget class="GtkDialog" id="new_release_dialog">
--    <property name="border_width">5</property>
--    <property name="title" translatable="yes">New Release</property>
--    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
--    <property name="icon_name">deluge</property>
--    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
--    <property name="has_separator">False</property>
--    <child internal-child="vbox">
--      <widget class="GtkVBox" id="dialog-vbox2">
--        <property name="visible">True</property>
--        <property name="spacing">2</property>
--        <child>
--          <widget class="GtkVBox" id="vbox7">
--            <property name="visible">True</property>
--            <property name="border_width">10</property>
--            <property name="spacing">5</property>
--            <child>
--              <widget class="GtkHBox" id="hbox3">
--                <property name="visible">True</property>
--                <property name="spacing">5</property>
--                <child>
--                  <widget class="GtkImage" id="image_new_release">
--                    <property name="visible">True</property>
--                    <property name="stock">gtk-missing-image</property>
--                  </widget>
--                  <packing>
--                    <property name="expand">False</property>
--                    <property name="fill">False</property>
--                  </packing>
--                </child>
--                <child>
--                  <widget class="GtkLabel" id="label23">
--                    <property name="visible">True</property>
--                    <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;New Release Available!&lt;/big&gt;&lt;/b&gt;</property>
--                    <property name="use_markup">True</property>
--                  </widget>
--                  <packing>
--                    <property name="expand">False</property>
--                    <property name="fill">False</property>
--                    <property name="position">1</property>
--                  </packing>
--                </child>
--              </widget>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--              </packing>
--            </child>
--            <child>
--              <widget class="GtkHSeparator" id="hseparator2">
--                <property name="visible">True</property>
--              </widget>
--              <packing>
--                <property name="expand">False</property>
--                <property name="position">1</property>
--              </packing>
--            </child>
--            <child>
--              <widget class="GtkAlignment" id="alignment11">
--                <property name="visible">True</property>
--                <property name="left_padding">5</property>
--                <child>
--                  <widget class="GtkTable" id="table2">
--                    <property name="visible">True</property>
--                    <property name="n_rows">2</property>
--                    <property name="n_columns">2</property>
--                    <property name="column_spacing">10</property>
--                    <property name="row_spacing">2</property>
--                    <child>
--                      <widget class="GtkLabel" id="label24">
--                        <property name="visible">True</property>
--                        <property name="xalign">0</property>
--                        <property name="label" translatable="yes">&lt;i&gt;Current Version:&lt;/i&gt;</property>
--                        <property name="use_markup">True</property>
--                      </widget>
--                      <packing>
--                        <property name="x_options">GTK_FILL</property>
--                      </packing>
--                    </child>
--                    <child>
--                      <widget class="GtkLabel" id="label_current_version">
--                        <property name="visible">True</property>
--                      </widget>
--                      <packing>
--                        <property name="left_attach">1</property>
--                        <property name="right_attach">2</property>
--                        <property name="x_options"></property>
--                      </packing>
--                    </child>
--                    <child>
--                      <widget class="GtkLabel" id="label25">
--                        <property name="visible">True</property>
--                        <property name="xalign">0</property>
--                        <property name="label" translatable="yes">&lt;i&gt;Available Version:&lt;/i&gt;</property>
--                        <property name="use_markup">True</property>
--                      </widget>
--                      <packing>
--                        <property name="top_attach">1</property>
--                        <property name="bottom_attach">2</property>
--                        <property name="x_options">GTK_FILL</property>
--                      </packing>
--                    </child>
--                    <child>
--                      <widget class="GtkLabel" id="label_available_version">
--                        <property name="visible">True</property>
--                      </widget>
--                      <packing>
--                        <property name="left_attach">1</property>
--                        <property name="right_attach">2</property>
--                        <property name="top_attach">1</property>
--                        <property name="bottom_attach">2</property>
--                        <property name="x_options"></property>
--                      </packing>
--                    </child>
--                  </widget>
--                </child>
--              </widget>
--              <packing>
--                <property name="position">2</property>
--              </packing>
--            </child>
--            <child>
--              <widget class="GtkAlignment" id="alignment10">
--                <property name="visible">True</property>
--                <property name="top_padding">5</property>
--                <child>
--                  <widget class="GtkCheckButton" id="chk_do_not_show_new_release">
--                    <property name="visible">True</property>
--                    <property name="can_focus">True</property>
--                    <property name="label" translatable="yes">Do not show this dialog in the future</property>
--                    <property name="response_id">0</property>
--                    <property name="draw_indicator">True</property>
--                  </widget>
--                </child>
--              </widget>
--              <packing>
--                <property name="position">3</property>
--              </packing>
--            </child>
--          </widget>
--          <packing>
--            <property name="expand">False</property>
--            <property name="fill">False</property>
--            <property name="position">1</property>
--          </packing>
--        </child>
--        <child internal-child="action_area">
--          <widget class="GtkHButtonBox" id="dialog-action_area2">
--            <property name="visible">True</property>
--            <property name="layout_style">GTK_BUTTONBOX_END</property>
--            <child>
--              <widget class="GtkButton" id="button_close_new_release">
--                <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="receives_default">True</property>
--                <property name="label">gtk-close</property>
--                <property name="use_stock">True</property>
--                <property name="response_id">0</property>
--              </widget>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--              </packing>
--            </child>
--            <child>
--              <widget class="GtkButton" id="button_goto_downloads">
--                <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="receives_default">True</property>
--                <property name="label" translatable="yes">_Goto Website</property>
--                <property name="use_underline">True</property>
--                <property name="response_id">0</property>
--                <signal name="clicked" handler="on_button1_clicked"/>
--              </widget>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--                <property name="position">1</property>
--              </packing>
--            </child>
--          </widget>
--          <packing>
--            <property name="expand">False</property>
--            <property name="fill">False</property>
--            <property name="pack_type">GTK_PACK_END</property>
--          </packing>
--        </child>
--      </widget>
--    </child>
--  </widget>
-   <widget class="GtkMenu" id="menu_peer_tab">
-     <property name="visible">True</property>
-     <child>
diff --git a/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__preferences_dialog.glade b/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__preferences_dialog.glade
deleted file mode 100644
index 185d664b069a..000000000000
--- a/net-p2p/deluge/files/patch-deluge__ui__gtkui__glade__preferences_dialog.glade
+++ /dev/null
@@ -1,119 +0,0 @@
---- deluge/ui/gtkui/glade/preferences_dialog.glade.orig	2009-03-16 03:38:08.000000000 +0900
-+++ deluge/ui/gtkui/glade/preferences_dialog.glade	2009-05-28 02:38:57.000000000 +0900
-@@ -2070,66 +2070,6 @@
-                               </packing>
-                             </child>
-                             <child>
--                              <widget class="GtkFrame" id="frame19">
--                                <property name="visible">True</property>
--                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                <property name="label_xalign">0</property>
--                                <property name="shadow_type">GTK_SHADOW_NONE</property>
--                                <child>
--                                  <widget class="GtkAlignment" id="alignment35">
--                                    <property name="visible">True</property>
--                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                    <property name="top_padding">2</property>
--                                    <property name="left_padding">12</property>
--                                    <child>
--                                      <widget class="GtkVBox" id="vbox18">
--                                        <property name="visible">True</property>
--                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                        <child>
--                                          <widget class="GtkAlignment" id="alignment36">
--                                            <property name="visible">True</property>
--                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                            <child>
--                                              <widget class="GtkCheckButton" id="chk_show_new_releases">
--                                                <property name="visible">True</property>
--                                                <property name="can_focus">True</property>
--                                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                                <property name="tooltip" translatable="yes">Deluge will check our servers and will tell you if a newer version has been released</property>
--                                                <property name="label" translatable="yes">Be alerted about new releases</property>
--                                                <property name="response_id">0</property>
--                                                <property name="draw_indicator">True</property>
--                                              </widget>
--                                            </child>
--                                          </widget>
--                                          <packing>
--                                            <property name="expand">False</property>
--                                            <property name="fill">False</property>
--                                          </packing>
--                                        </child>
--                                      </widget>
--                                    </child>
--                                  </widget>
--                                </child>
--                                <child>
--                                  <widget class="GtkLabel" id="label43">
--                                    <property name="visible">True</property>
--                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                    <property name="label" translatable="yes">&lt;b&gt;Updates&lt;/b&gt;</property>
--                                    <property name="use_markup">True</property>
--                                  </widget>
--                                  <packing>
--                                    <property name="type">label_item</property>
--                                  </packing>
--                                </child>
--                              </widget>
--                              <packing>
--                                <property name="expand">False</property>
--                                <property name="fill">False</property>
--                                <property name="padding">5</property>
--                                <property name="position">2</property>
--                              </packing>
--                            </child>
--                            <child>
-                               <widget class="GtkFrame" id="frame20">
-                                 <property name="visible">True</property>
-                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-@@ -2381,49 +2321,6 @@
-                                 <property name="position">3</property>
-                               </packing>
-                             </child>
--                            <child>
--                              <widget class="GtkFrame" id="frame22">
--                                <property name="visible">True</property>
--                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                <property name="label_xalign">0</property>
--                                <property name="shadow_type">GTK_SHADOW_NONE</property>
--                                <child>
--                                  <widget class="GtkAlignment" id="alignment27">
--                                    <property name="visible">True</property>
--                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                    <property name="top_padding">5</property>
--                                    <property name="left_padding">10</property>
--                                    <child>
--                                      <widget class="GtkCheckButton" id="chk_new_releases">
--                                        <property name="visible">True</property>
--                                        <property name="can_focus">True</property>
--                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                        <property name="label" translatable="yes">Periodically check the website for new releases</property>
--                                        <property name="response_id">0</property>
--                                        <property name="draw_indicator">True</property>
--                                      </widget>
--                                    </child>
--                                  </widget>
--                                </child>
--                                <child>
--                                  <widget class="GtkLabel" id="label56">
--                                    <property name="visible">True</property>
--                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                    <property name="label" translatable="yes">&lt;b&gt;Other&lt;/b&gt;</property>
--                                    <property name="use_markup">True</property>
--                                  </widget>
--                                  <packing>
--                                    <property name="type">label_item</property>
--                                  </packing>
--                                </child>
--                              </widget>
--                              <packing>
--                                <property name="expand">False</property>
--                                <property name="fill">False</property>
--                                <property name="padding">5</property>
--                                <property name="position">4</property>
--                              </packing>
--                            </child>
-                           </widget>
-                         </child>
-                       </widget>
diff --git a/net-p2p/deluge/files/patch-deluge__ui__gtkui__preferences.py b/net-p2p/deluge/files/patch-deluge__ui__gtkui__preferences.py
deleted file mode 100644
index a4ba8325a2fc..000000000000
--- a/net-p2p/deluge/files/patch-deluge__ui__gtkui__preferences.py
+++ /dev/null
@@ -1,47 +0,0 @@
---- deluge/ui/gtkui/preferences.py.orig	2009-04-07 05:24:02.000000000 +0900
-+++ deluge/ui/gtkui/preferences.py	2009-05-28 02:39:06.000000000 +0900
-@@ -231,7 +231,6 @@
-                 "chk_natpmp": ("active", self.core_config["natpmp"]),
-                 "chk_utpex": ("active", self.core_config["utpex"]),
-                 "chk_lsd": ("active", self.core_config["lsd"]),
--                "chk_new_releases": ("active", self.core_config["new_release_check"]),
-                 "chk_send_info": ("active", self.core_config["send_info"]),
-                 "combo_encin": ("active", self.core_config["enc_in_policy"]),
-                 "combo_encout": ("active", self.core_config["enc_out_policy"]),
-@@ -372,7 +371,6 @@
-                 "chk_utpex",
-                 "chk_lsd",
-                 "chk_send_info",
--                "chk_new_releases",
-                 "combo_encin",
-                 "combo_encout",
-                 "combo_enclevel",
-@@ -438,10 +436,6 @@
-         self.glade.get_widget("chk_show_rate_in_title").set_active(
-             self.gtkui_config["show_rate_in_title"])
- 
--        ## Other tab ##
--        self.glade.get_widget("chk_show_new_releases").set_active(
--            self.gtkui_config["show_new_releases"])
--
-         ## Notification tab ##
-         self.glade.get_widget("chk_ntf_tray_blink").set_active(
-             self.gtkui_config["ntf_tray_blink"])
-@@ -654,8 +648,6 @@
-             new_gtkui_config["ntf_security"] = 'TLS'
- 
-         ## Other tab ##
--        new_gtkui_config["show_new_releases"] = \
--            self.glade.get_widget("chk_show_new_releases").get_active()
-         new_core_config["send_info"] = \
-             self.glade.get_widget("chk_send_info").get_active()
- 
-@@ -664,8 +656,6 @@
-             self.glade.get_widget("spin_daemon_port").get_value_as_int()
-         new_core_config["allow_remote"] = \
-             self.glade.get_widget("chk_allow_remote_connections").get_active()
--        new_core_config["new_release_check"] = \
--            self.glade.get_widget("chk_new_releases").get_active()
- 
-         ## Proxy tab ##
-         new_core_config["proxies"] = {}
diff --git a/net-p2p/deluge/files/patch-deluge__ui__gtkui__signals.py b/net-p2p/deluge/files/patch-deluge__ui__gtkui__signals.py
deleted file mode 100644
index 3a75a2b2f1e8..000000000000
--- a/net-p2p/deluge/files/patch-deluge__ui__gtkui__signals.py
+++ /dev/null
@@ -1,24 +0,0 @@
---- deluge/ui/gtkui/signals.py.orig	2009-04-07 05:24:02.000000000 +0900
-+++ deluge/ui/gtkui/signals.py	2009-05-28 02:39:16.000000000 +0900
-@@ -72,8 +72,6 @@
-             self.torrent_queue_changed)
-         self.receiver.connect_to_signal("torrent_resume_at_stop_ratio",
-             self.torrent_resume_at_stop_ratio)
--        self.receiver.connect_to_signal("new_version_available",
--            self.new_version_available)
-         self.receiver.connect_to_signal("args_from_external",
-             self.args_from_external)
-         self.receiver.connect_to_signal("torrent_state_changed",
-@@ -152,12 +150,6 @@
-         component.get("StatusBar").display_warning(
-             text=_("Torrent is past stop ratio."))
- 
--    def new_version_available(self, value):
--        log.debug("new_version_available: %s", value)
--        if self.config["show_new_releases"]:
--            from deluge.ui.gtkui.new_release_dialog import NewReleaseDialog
--            NewReleaseDialog().show(value)
--
-     def args_from_external(self, value):
-         log.debug("args_from_external: %s", value)
-         import ipcinterface
diff --git a/net-p2p/deluge/files/patch-deluge_core_core.py b/net-p2p/deluge/files/patch-deluge_core_core.py
deleted file mode 100644
index 38f64b35de55..000000000000
--- a/net-p2p/deluge/files/patch-deluge_core_core.py
+++ /dev/null
@@ -1,76 +0,0 @@
---- deluge/core/core.py.orig	2009-05-16 03:09:59.000000000 +0900
-+++ deluge/core/core.py	2009-05-28 02:42:12.000000000 +0900
-@@ -232,9 +227,6 @@
-         # Start the AuthManager
-         self.authmanager = AuthManager()
- 
--        # New release check information
--        self.new_release = None
--
-         component.start("PreferencesManager")
-         component.start()
- 
-@@ -319,54 +311,6 @@
-         except Exception, e:
-             log.warning("Failed to save dht state: %s", e)
- 
--    def get_new_release(self):
--        log.debug("get_new_release")
--        from urllib2 import urlopen
--        try:
--            self.new_release = urlopen(
--                "http://download.deluge-torrent.org/version-1.0").read().strip()
--        except Exception, e:
--            log.debug("Unable to get release info from website: %s", e)
--            return
--        self.check_new_release()
--
--    def check_new_release(self):
--        if self.new_release:
--            log.debug("new_release: %s", self.new_release)
--            class VersionSplit(object):
--                def __init__(self, ver):
--                    ver = ver.lower()
--                    vs = ver.split("_") if "_" in ver else ver.split("-")
--                    self.version = vs[0]
--                    self.suffix = None
--                    if len(vs) > 1:
--                        for s in ("rc", "alpha", "beta", "dev"):
--                            if s in vs[1][:len(s)]:
--                                self.suffix = vs[1]
--
--                def __cmp__(self, ver):
--                    if self.version > ver.version or (self.suffix and self.suffix[:3] == "dev"):
--                        return 1
--                    if self.version < ver.version:
--                        return -1
--
--                    if self.version == ver.version:
--                        if self.suffix == ver.suffix:
--                            return 0
--                        if self.suffix is None:
--                            return 1
--                        if ver.suffix is None:
--                            return -1
--                        if self.suffix < ver.suffix:
--                            return -1
--                        if self.suffix > ver.suffix:
--                            return 1
--
--            if VersionSplit(self.new_release) > VersionSplit(deluge.common.get_version()):
--                self.signals.emit("new_version_available", self.new_release)
--                return self.new_release
--        return False
--
-     # Exported Methods
-     def export_ping(self):
-         """A method to see if the core is running"""
-@@ -381,8 +325,6 @@
-         """Registers a client with the signal manager so that signals are
-             sent to it."""
-         self.signals.register_client(self.client_address, port)
--        if self.config["new_release_check"]:
--            self.check_new_release()
- 
-     def export_deregister_client(self):
-         """De-registers a client with the signal manager."""
diff --git a/net-p2p/deluge/files/patch-deluge_ui_gtkui_gtkui.py b/net-p2p/deluge/files/patch-deluge_ui_gtkui_gtkui.py
deleted file mode 100644
index f351f99b3e05..000000000000
--- a/net-p2p/deluge/files/patch-deluge_ui_gtkui_gtkui.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- deluge/ui/gtkui/gtkui.py.orig	2009-04-10 01:40:52.000000000 +0900
-+++ deluge/ui/gtkui/gtkui.py	2009-05-27 04:37:04.000000000 +0900
-@@ -81,7 +81,6 @@
-     "start_in_tray": False,
-     "lock_tray": False,
-     "tray_password": "",
--    "check_new_releases": True,
-     "default_load_path": None,
-     "window_maximized": False,
-     "window_x_pos": 0,
-@@ -101,7 +100,6 @@
-     "autoadd_enable": False,
-     "autoadd_location": "",
-     "choose_directory_dialog_path": deluge.common.get_default_download_dir(),
--    "show_new_releases": True,
-     "signal_port": 40000,
-     "ntf_tray_blink": True,
-     "ntf_sound": False,
diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py
index 7f1b9645d435..e865b7a6f230 100644
--- a/net-p2p/deluge/files/patch-setup.py
+++ b/net-p2p/deluge/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2009-01-10 20:24:16.000000000 -0600
-+++ setup.py	2009-01-17 15:02:02.000000000 -0600
-@@ -56,7 +56,6 @@
+--- setup.py.orig	2010-01-10 06:16:08.000000000 +0900
++++ setup.py	2010-01-13 16:48:06.000000000 +0900
+@@ -67,7 +67,6 @@
      "-D_FILE_OFFSET_BITS=64",
      "-DNDEBUG",
      "-DTORRENT_USE_OPENSSL=1",
@@ -8,7 +8,7 @@
      ]
  
  if windows_check():
-@@ -95,12 +94,14 @@
+@@ -113,12 +112,14 @@
          sysconfig.get_config_vars()["OPT"] = " ".join(cv_opt.split())
  
  _library_dirs = [
@@ -24,7 +24,7 @@
  ]
  
  if windows_check():
-@@ -122,11 +123,6 @@
+@@ -140,14 +141,6 @@
          'zlib'
      ]
  else:
@@ -32,11 +32,14 @@
 -        '/usr/include/python' + python_version,
 -        sysconfig.get_config_var("INCLUDEDIR")
 -        ]
+-    for include in os.environ.get("INCLUDEDIR", "").split(":"):
+-        _include_dirs.append(include)
+-
 -    _library_dirs += [sysconfig.get_config_var("LIBDIR"), '/opt/local/lib']
      if osx_check():
          _include_dirs += [
              '/opt/local/include/boost-1_35',
-@@ -138,7 +134,6 @@
+@@ -161,7 +154,6 @@
          'boost_iostreams',
          'boost_python',
          'boost_thread',
@@ -44,21 +47,20 @@
          'ssl',
          'z'
          ]
-@@ -181,13 +176,6 @@
+@@ -204,12 +196,6 @@
  
  # Check for a system libtorrent and if found, then do not build the libtorrent extension
  build_libtorrent = True
 -try:
--    import libtorrent
+-    from deluge._libtorrent import lt
 -except ImportError:
 -    build_libtorrent = True
 -else:
--    if libtorrent.version_major == 0 and libtorrent.version_minor == 14:
--        build_libtorrent = False
+-    build_libtorrent = False
  
- if build_libtorrent:
+ if build_libtorrent and os.path.exists("libtorrent"):
      # There isn't a system libtorrent library, so let's build the one included with deluge
-@@ -197,6 +185,7 @@
+@@ -219,6 +205,7 @@
          include_dirs = _include_dirs,
          libraries = _libraries,
          library_dirs = _library_dirs,
@@ -66,7 +68,7 @@
          sources = _sources
      )
  
-@@ -310,8 +299,8 @@
+@@ -356,8 +343,8 @@
          for cmd_name in self.get_sub_commands():
              self.run_command(cmd_name)
          _install.run(self)
@@ -77,7 +79,7 @@
  
  cmdclass = {
      'build': build,
-@@ -324,7 +313,7 @@
+@@ -371,7 +358,7 @@
  
  # Data files to be installed to the system
  _data_files = [
@@ -86,12 +88,12 @@
      ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
      ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
      ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
-@@ -339,7 +328,7 @@
+@@ -386,7 +373,7 @@
      ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
      ('share/applications', ['deluge/data/share/applications/deluge.desktop']),
      ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
--    ('share/man/man1', ['deluge/docs/man/deluge.1', 'deluge/docs/man/deluged.1'])
-+    ('man/man1', ['deluge/docs/man/deluge.1', 'deluge/docs/man/deluged.1'])
- ]
- 
- # Main setup
+-    ('share/man/man1', [
++    ('man/man1', [
+         'docs/man/deluge.1',
+         'docs/man/deluged.1',
+         'docs/man/deluge-gtk.1',