[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Kristian Fiskerstrand]

commit:     16ea539b0675ae3ed164236d7506f7e7df6af6ee
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Tue Feb 16 09:18:36 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 17:51:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ea539b

net-p2p/deluge: Use "/run" instead of "/var/run" for pidfiles

Fixes bug #468340

 net-p2p/deluge/files/deluged.init | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index 49138e0..f68e40d 100644
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -40,7 +40,7 @@ start() {
 	fi
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
-	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
+	--name deluged --pidfile /run/deluged.pid --background --make-pidfile \
 	${DELUGED_UMASK:+--umask ${DELUGED_UMASK}} \
 	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize ${DELUGED_OPTS}
 	eend $?
@@ -59,14 +59,14 @@ start() {
 stop() {
 	ebegin "Stopping Deluged"
 	start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
-	--name deluged --pidfile /var/run/deluged.pid
+	--name deluged --pidfile /run/deluged.pid
 	eend $?
 
 
 	if [ "${DELUGEUI_START}" = "true" ] ; then
 		ebegin "Stopping Deluge"
 		start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
-		--name deluge --pidfile /var/run/deluge.pid
+		--name deluge --pidfile /run/deluge.pid
 		eend $?
 	fi
 }

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Kristian Fiskerstrand]

commit:     f821754bbdeaf70e6b079d94d124b8f90978290c
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Tue Feb 16 09:44:01 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 17:51:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f821754b

net-p2p/deluge: fix bug #468340 for real, this time

 net-p2p/deluge/files/deluged.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index f68e40d..e2eb2d1 100644
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -49,7 +49,7 @@ start() {
 	if [ "${DELUGEUI_START}" = "true" ] ; then
 		ebegin "Starting Deluge"
 		start-stop-daemon --start --background --pidfile \
-		/var/run/deluge.pid  --make-pidfile \
+		/run/deluge.pid  --make-pidfile \
 		--exec /usr/bin/deluge --user "${DELUGED_USER%:*}" \
 		-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
 		eend $?

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Kristian Fiskerstrand]

commit:     f5049e856eb8a5811df3e7bcb6daf43875a88511
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Fri Feb 12 10:23:25 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 17:51:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5049e85

net-p2p/deluge: unquote ${DELUGED_OPTS} in openrc init file

Fixes bug #437350. Thanks to Alex Belykh <albel727 <AT> ngs.ru>

 net-p2p/deluge/files/deluged.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index 24f0a12..49138e0 100644
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -42,7 +42,7 @@ start() {
 	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
 	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
 	${DELUGED_UMASK:+--umask ${DELUGED_UMASK}} \
-	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize "${DELUGED_OPTS}"
+	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize ${DELUGED_OPTS}
 	eend $?
 
 	

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Kristian Fiskerstrand]

commit:     b9d41d1974b7f60a90c62e354c5a8e849a727c6e
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Fri Feb 12 10:19:33 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 17:51:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9d41d19

net-p2p/deluge: add umask values to openrc script (Fixes bug #566862)

Thanks to Scott Jones <morbidsvt <AT> gmail.com>

 net-p2p/deluge/files/deluged.conf | 1 +
 net-p2p/deluge/files/deluged.init | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-p2p/deluge/files/deluged.conf b/net-p2p/deluge/files/deluged.conf
index 0918f45..21b375d 100644
--- a/net-p2p/deluge/files/deluged.conf
+++ b/net-p2p/deluge/files/deluged.conf
@@ -2,6 +2,7 @@
 # Change this to the user you want to run deluged as.
 # You may specify a group too, after a colon
 DELUGED_USER=""
+# DELUGED_UMASK="0002"
 # DELUGED_OPTS="-p 58846"
 DELUGEUI_START="false"
 DELUGEUI_OPTS="-u web"

diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index e60945d..24f0a12 100644
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -41,6 +41,7 @@ start() {
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
 	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
+	${DELUGED_UMASK:+--umask ${DELUGED_UMASK}} \
 	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize "${DELUGED_OPTS}"
 	eend $?
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Kristian Fiskerstrand]

commit:     4ac506c9c23cee826923655b8b7d722d31559cd5
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Feb 17 10:51:15 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 20:38:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac506c9

net-p2p/deluge: Small fixes to configuration files

 net-p2p/deluge/files/deluge-web.conf | 2 +-
 net-p2p/deluge/files/deluged.conf-2  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-web.conf b/net-p2p/deluge/files/deluge-web.conf
index f0aad8f..f1e904a 100644
--- a/net-p2p/deluge/files/deluge-web.conf
+++ b/net-p2p/deluge/files/deluge-web.conf
@@ -3,4 +3,4 @@
 # You may specify a group too, after a colon
 DELUGE_WEB_USER=""
 #DELUGE_WEB_HOME=""
-DELUGE_WEB_OPTS=""
+#DELUGE_WEB_OPTS=""

diff --git a/net-p2p/deluge/files/deluged.conf-2 b/net-p2p/deluge/files/deluged.conf-2
index 5c507c6..8fe6ce4 100644
--- a/net-p2p/deluge/files/deluged.conf-2
+++ b/net-p2p/deluge/files/deluged.conf-2
@@ -4,4 +4,4 @@
 DELUGED_USER=""
 # DELUGED_UMASK="0002"
 # DELUGED_OPTS="-p 58846"
-
+# DELUGED_HOME=""

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Kristian Fiskerstrand]

commit:     96117d3b7fc98d99bd11a4bf135cfb85fab87024
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Feb 17 10:24:42 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 20:38:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96117d3b

net-p2p/deluge: unbundle startup scripts for deluge-web

Different startup scripts for daemon and web server. This fixes
bug #350213 (thanks to Cameron Tacklind <cameron <AT> tacklind.com> for
inspiration, even though implemented slightly differently)

 net-p2p/deluge/files/deluge-web.conf |  6 ++++
 net-p2p/deluge/files/deluge-web.init | 54 ++++++++++++++++++++++++++++++++++++
 net-p2p/deluge/files/deluged.conf-2  |  7 +++++
 net-p2p/deluge/files/deluged.init-2  | 54 ++++++++++++++++++++++++++++++++++++
 4 files changed, 121 insertions(+)

diff --git a/net-p2p/deluge/files/deluge-web.conf b/net-p2p/deluge/files/deluge-web.conf
new file mode 100644
index 0000000..f0aad8f
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.conf
@@ -0,0 +1,6 @@
+# /etc/conf.d/deluge-web
+# Change this to the user you want to run deluged as.
+# You may specify a group too, after a colon
+DELUGE_WEB_USER=""
+#DELUGE_WEB_HOME=""
+DELUGE_WEB_OPTS=""

diff --git a/net-p2p/deluge/files/deluge-web.init b/net-p2p/deluge/files/deluge-web.init
new file mode 100644
index 0000000..fc540e4
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.init
@@ -0,0 +1,54 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ "${DELUGE_WEB_USER}" = "" ] ; then
+		eerror "Please edit /etc/conf.d/deluge-web"
+		eerror "You have to specify a user to run deluge-web as, as we will not run it as root!"
+		eerror "Modify DELUGE_WEB_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${DELUGE_WEB_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/deluge-web"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${DELUGE_WEB_USER%:*}" = "${DELUGE_WEB_USER}" ] ; then
+		return 0
+	else
+		if ! getent group "${DELUGE_WEB_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/deluge-web"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi	
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	if [ "${DELUGE_WEB_HOME}" = "" ] ; then
+		DELUGE_WEB_USER_HOME=$(getent passwd "${DELUGE_WEB_USER%:*}" | cut -d ':' -f 6)
+	else
+		DELUGE_WEB_USER_HOME=${DELUGE_WEB_HOME}
+	fi
+	ebegin "Starting Deluge-Web"
+	start-stop-daemon --start --background --pidfile \
+	/run/deluge-web.pid  --make-pidfile \
+	--exec /usr/bin/deluge-web --user "${DELUGE_WEB_USER%:*}" \
+	-e HOME="${DELUGE_WEB_USER_HOME}" -- ${DELUGE_WEB_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Deluge-Web"
+	start-stop-daemon --stop --user "${DELUGE_WEB_USER%:*}" \
+	--pidfile /run/deluge-web.pid
+	eend $?
+}

diff --git a/net-p2p/deluge/files/deluged.conf-2 b/net-p2p/deluge/files/deluged.conf-2
new file mode 100644
index 0000000..5c507c6
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.conf-2
@@ -0,0 +1,7 @@
+# /etc/conf.d/deluged
+# Change this to the user you want to run deluged as.
+# You may specify a group too, after a colon
+DELUGED_USER=""
+# DELUGED_UMASK="0002"
+# DELUGED_OPTS="-p 58846"
+

diff --git a/net-p2p/deluge/files/deluged.init-2 b/net-p2p/deluge/files/deluged.init-2
new file mode 100644
index 0000000..082bf9d
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.init-2
@@ -0,0 +1,54 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ "${DELUGED_USER}" = "" ] ; then
+		eerror "Please edit /etc/conf.d/deluged"
+		eerror "You have to specify a user to run deluged as, as we will not run it as root!"
+		eerror "Modify DELUGED_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${DELUGED_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/deluged"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${DELUGED_USER%:*}" = "${DELUGED_USER}" ] ; then
+		return 0
+	else
+		if ! getent group "${DELUGED_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/deluged"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi	
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	if [ "${DELUGED_HOME}" = "" ] ; then
+		DELUGED_USER_HOME=$(getent passwd "${DELUGED_USER%:*}" | cut -d ':' -f 6)
+	else
+		DELUGED_USER_HOME=${DELUGED_HOME}
+	fi
+	ebegin "Starting Deluged"
+	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
+	--name deluged --pidfile /run/deluged.pid --background --make-pidfile \
+	${DELUGED_UMASK:+--umask ${DELUGED_UMASK}} \
+	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize ${DELUGED_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Deluged"
+	start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
+	--name deluged --pidfile /run/deluged.pid
+	eend $?
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Kristian Fiskerstrand]

commit:     827aca59c6854e49418f92bc6b8ef484a4c77b26
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Fri Feb 26 09:10:26 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 20:38:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827aca59

net-p2p/deluge: change shebang to #!/sbin/openrc-run

 net-p2p/deluge/files/deluge-web.init | 2 +-
 net-p2p/deluge/files/deluged.init-2  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-web.init b/net-p2p/deluge/files/deluge-web.init
index fc540e4..8e1fb08 100644
--- a/net-p2p/deluge/files/deluge-web.init
+++ b/net-p2p/deluge/files/deluge-web.init
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # $Id$

diff --git a/net-p2p/deluge/files/deluged.init-2 b/net-p2p/deluge/files/deluged.init-2
index 082bf9d..6869438 100644
--- a/net-p2p/deluge/files/deluged.init-2
+++ b/net-p2p/deluge/files/deluged.init-2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # $Id$

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Ian Delaney]

commit:     c7a49e7c181fd8041bdfa9c62a9971dd3b98392d
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Mon Feb 29 14:44:27 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 14:44:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a49e7c

net-p2p/deluge: remove unused patch

This file is no longer needed

 ...uge-1.3.5-rb_libtorrent-disable-python-bindings | 60 ----------------------
 1 file changed, 60 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-1.3.5-rb_libtorrent-disable-python-bindings b/net-p2p/deluge/files/deluge-1.3.5-rb_libtorrent-disable-python-bindings
deleted file mode 100644
index 301019e..0000000
--- a/net-p2p/deluge/files/deluge-1.3.5-rb_libtorrent-disable-python-bindings
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=437356
-
-From 37ea2854a21e50debdf7bc953a3411e5934b74d9 Mon Sep 17 00:00:00 2001
-From: Calum Lind <calumlind+deluge@gmail.com>
-Date: Thu, 27 Sep 2012 16:53:22 +0000
-Subject: Fix 2160 : Disable use of python bindings for libtorrent extensions and replace with session flag
-
-The fixes a GIL issue causing libtorrent segfault. https://code.google.com/p/libtorrent/issues/detail?id=369
-
-Note: The ut_pex plugin (Peer Exchange) will now always be enabled.
----
-diff --git a/deluge/core/core.py b/deluge/core/core.py
-index 4bda811..4ca3d96 100644
---- a/deluge/core/core.py
-+++ b/deluge/core/core.py
-@@ -84,7 +84,10 @@ class Core(component.Component):
-         while len(version) < 4:
-             version.append(0)
- 
--        self.session = lt.session(lt.fingerprint("DE", *version), flags=0)
-+        # Note: All libtorrent python bindings to set plugins/extensions need to be disabled
-+        # due to  GIL issue. https://code.google.com/p/libtorrent/issues/detail?id=369
-+        # Setting session flags to 1 enables all libtorrent default plugins
-+        self.session = lt.session(lt.fingerprint("DE", *version), flags=1)
- 
-         # Load the session state if available
-         self.__load_session_state()
-@@ -103,9 +106,11 @@ class Core(component.Component):
-         self.session.set_settings(self.settings)
- 
-         # Load metadata extension
--        self.session.add_extension(lt.create_metadata_plugin)
--        self.session.add_extension(lt.create_ut_metadata_plugin)
--        self.session.add_extension(lt.create_smart_ban_plugin)
-+        # Note: All libtorrent python bindings to set plugins/extensions need to be disabled
-+        # due to  GIL issue. https://code.google.com/p/libtorrent/issues/detail?id=369
-+        # self.session.add_extension(lt.create_metadata_plugin)
-+        # self.session.add_extension(lt.create_ut_metadata_plugin)
-+        # self.session.add_extension(lt.create_smart_ban_plugin)
- 
-         # Create the components
-         self.eventmanager = EventManager()
-diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py
-index 40070bb..2a5cb1b 100644
---- a/deluge/core/preferencesmanager.py
-+++ b/deluge/core/preferencesmanager.py
-@@ -338,7 +338,10 @@ class PreferencesManager(component.Component):
-     def _on_set_utpex(self, key, value):
-         log.debug("utpex value set to %s", value)
-         if value:
--            self.session.add_extension(lt.create_ut_pex_plugin)
-+            # Note: All libtorrent python bindings to set plugins/extensions need to be disabled
-+            # due to  GIL issue. https://code.google.com/p/libtorrent/issues/detail?id=369
-+            #self.session.add_extension(lt.create_ut_pex_plugin)
-+            pass
- 
-     def _on_set_encryption(self, key, value):
-         log.debug("encryption value %s set to %s..", key, value)
---
-cgit v0.9.0.2

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Patrice Clement]

commit:     e7447aac71d16585382070229e86872586524e5c
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Mar  9 10:15:36 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 10:18:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7447aac

net-p2p/deluge: improve configuration defaults

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/deluge/files/deluge-web.conf | 4 ++--
 net-p2p/deluge/files/deluged.conf-2  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-web.conf b/net-p2p/deluge/files/deluge-web.conf
index f1e904a..a08f9b7 100644
--- a/net-p2p/deluge/files/deluge-web.conf
+++ b/net-p2p/deluge/files/deluge-web.conf
@@ -1,6 +1,6 @@
 # /etc/conf.d/deluge-web
 # Change this to the user you want to run deluged as.
 # You may specify a group too, after a colon
-DELUGE_WEB_USER=""
-#DELUGE_WEB_HOME=""
+DELUGE_WEB_USER="deluge:deluge"
+DELUGE_WEB_HOME="/var/lib/deluge"
 #DELUGE_WEB_OPTS=""

diff --git a/net-p2p/deluge/files/deluged.conf-2 b/net-p2p/deluge/files/deluged.conf-2
index 8fe6ce4..ac0c4cd 100644
--- a/net-p2p/deluge/files/deluged.conf-2
+++ b/net-p2p/deluge/files/deluged.conf-2
@@ -1,7 +1,7 @@
 # /etc/conf.d/deluged
 # Change this to the user you want to run deluged as.
 # You may specify a group too, after a colon
-DELUGED_USER=""
+DELUGED_USER="deluge:deluge"
 # DELUGED_UMASK="0002"
-# DELUGED_OPTS="-p 58846"
-# DELUGED_HOME=""
+DELUGED_OPTS="-p 58846"
+DELUGED_HOME="/var/lib/deluge"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Patrice Clement]

commit:     6314161ce622b9e0ea6a80e18297464446753a7b
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Mar  9 10:17:14 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 10:18:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6314161c

net-p2p/deluge: Add systemd drop-ins

These files allow configuration of systemd units

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/deluge/files/deluge-web.service.conf | 4 ++++
 net-p2p/deluge/files/deluged.service.conf    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/net-p2p/deluge/files/deluge-web.service.conf b/net-p2p/deluge/files/deluge-web.service.conf
new file mode 100644
index 0000000..2c594cd
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.service.conf
@@ -0,0 +1,4 @@
+[Service]
+User=deluge
+Group=deluge
+Environment="DELUGE_WEB_HOME=/var/lib/deluge" "DELUGE_WEB_OPTS="

diff --git a/net-p2p/deluge/files/deluged.service.conf b/net-p2p/deluge/files/deluged.service.conf
new file mode 100644
index 0000000..2d74e23
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.service.conf
@@ -0,0 +1,5 @@
+[Service]
+User=deluge
+Group=deluge
+#UMask=0002
+Environment="DELUGED_HOME=/var/lib/deluge" "DELUGED_OPTS=-p 58846"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Patrice Clement]

commit:     3e1a129743e430017e58b5a24f9df6fefaef3e39
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Mar  9 10:21:00 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 10:18:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1a1297

net-p2p/deluge: Improved systemd units

No more sourcing of /etc/conf.d/deluge* (QA violation). Systemd
units are now configured in drop-in files.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/deluge/files/deluge-web.service-2 | 11 +++++++++++
 net-p2p/deluge/files/deluged.service-2    | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/net-p2p/deluge/files/deluge-web.service-2 b/net-p2p/deluge/files/deluge-web.service-2
new file mode 100644
index 0000000..adb3830
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.service-2
@@ -0,0 +1,11 @@
+[Unit]
+Description=Deluge WebUI
+Documentation=man:deluge-web
+After=deluged.service
+
+[Service]
+ExecStart=/usr/bin/deluge-web -c ${DELUGED_HOME} ${DELUGED_OPTS}
+
+[Install]
+WantedBy=multi-user.target
+

diff --git a/net-p2p/deluge/files/deluged.service-2 b/net-p2p/deluge/files/deluged.service-2
new file mode 100644
index 0000000..049cd02
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.service-2
@@ -0,0 +1,11 @@
+[Unit]
+Description=Deluge BitTorrent client
+Documentation=man:deluged
+After=network.target local-fs.target
+Wants=local-fs.target
+
+[Service]
+ExecStart=/usr/bin/deluged -d -c ${DELUGED_HOME} ${DELUGED_OPTS}
+
+[Install]
+WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Kristian Fiskerstrand]

commit:     fc9581d755e96bfd4eef2eb91669559f6d87ea0f
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Nov  8 11:45:35 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 22:13:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc9581d7

net-p2p/deluge: 'files' folder cleanup

Bug: https://bugs.gentoo.org/636860

 net-p2p/deluge/files/deluge-web.service | 11 -----
 net-p2p/deluge/files/deluged.conf       |  9 -----
 net-p2p/deluge/files/deluged.init       | 71 ---------------------------------
 net-p2p/deluge/files/deluged.service    | 13 ------
 4 files changed, 104 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-web.service b/net-p2p/deluge/files/deluge-web.service
deleted file mode 100644
index 426401a95e0..00000000000
--- a/net-p2p/deluge/files/deluge-web.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Deluge WebUI
-After=deluged.service
-
-[Service]
-User=deluge
-ExecStart=/usr/bin/deluge-web
-
-[Install]
-WantedBy=multi-user.target
-

diff --git a/net-p2p/deluge/files/deluged.conf b/net-p2p/deluge/files/deluged.conf
deleted file mode 100644
index 21b375d5c97..00000000000
--- a/net-p2p/deluge/files/deluged.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/conf.d/deluged
-# Change this to the user you want to run deluged as.
-# You may specify a group too, after a colon
-DELUGED_USER=""
-# DELUGED_UMASK="0002"
-# DELUGED_OPTS="-p 58846"
-DELUGEUI_START="false"
-DELUGEUI_OPTS="-u web"
-

diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
deleted file mode 100644
index 0fd9429fb05..00000000000
--- a/net-p2p/deluge/files/deluged.init
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ "${DELUGED_USER}" = "" ] ; then
-		eerror "Please edit /etc/conf.d/deluged"
-		eerror "You have to specify a user to run deluged as, as we will not run it as root!"
-		eerror "Modify DELUGED_USER to your needs (you can also add a group, after a colon)"
-		return 1
-	fi
-	if ! getent passwd "${DELUGED_USER%:*}" >/dev/null ; then
-		eerror "Please edit /etc/conf.d/deluged"
-		eerror "Your user has to exist!"
-		return 1
-	fi
-	if [ "${DELUGED_USER%:*}" = "${DELUGED_USER}" ] ; then
-		return 0
-	else
-		if ! getent group "${DELUGED_USER#*:}" >/dev/null ; then
-			eerror "Please edit /etc/conf.d/deluged"
-			eerror "Your group has to exist too!"
-			return 1
-		fi
-	fi	
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	if [ "${DELUGED_HOME}" = "" ] ; then
-		DELUGED_USER_HOME=$(getent passwd "${DELUGED_USER%:*}" | cut -d ':' -f 6)
-	else
-		DELUGED_USER_HOME=${DELUGED_HOME}
-	fi
-	ebegin "Starting Deluged"
-	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
-	--name deluged --pidfile /run/deluged.pid --background --make-pidfile \
-	${DELUGED_UMASK:+--umask ${DELUGED_UMASK}} \
-	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize ${DELUGED_OPTS}
-	eend $?
-
-	
-	if [ "${DELUGEUI_START}" = "true" ] ; then
-		ebegin "Starting Deluge"
-		start-stop-daemon --start --background --pidfile \
-		/run/deluge.pid  --make-pidfile \
-		--exec /usr/bin/deluge --user "${DELUGED_USER%:*}" \
-		-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
-		eend $?
-	fi
-}
-
-stop() {
-	ebegin "Stopping Deluged"
-	start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
-	--name deluged --pidfile /run/deluged.pid
-	eend $?
-
-
-	if [ "${DELUGEUI_START}" = "true" ] ; then
-		ebegin "Stopping Deluge"
-		start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
-		--name deluge --pidfile /run/deluge.pid
-		eend $?
-	fi
-}

diff --git a/net-p2p/deluge/files/deluged.service b/net-p2p/deluge/files/deluged.service
deleted file mode 100644
index 74876b008cc..00000000000
--- a/net-p2p/deluge/files/deluged.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Deluge BitTorrent client
-After=network.target local-fs.target
-Wants=local-fs.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/deluged
-User=deluge
-Group=deluge
-ExecStart=/usr/bin/deluged -d -p $DELUGED_PORT $DELUGED_OPTIONS
-
-[Install]
-WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Craig Andrews]

commit:     b35463dac1ca31fc012ec04e93f0fc30ae45cd65
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Oct 19 08:22:36 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 13:25:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b35463da

net-p2p/deluge: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13341
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 .../files/deluge-1.3.12-fix_scheduler_plugin.patch | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch b/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch
deleted file mode 100644
index fda64aa2b39..00000000000
--- a/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From cdf301601fe71bd697f3796cf0a5656d437d140e Mon Sep 17 00:00:00 2001
-From: Calum Lind <calumlind+deluge@gmail.com>
-Date: Wed, 16 Sep 2015 15:11:56 +0100
-Subject: [Scheduler] Revert erroneous fix backported from develop branch
-
- * The issue this was intended to fix only occurs on develop branch
----
- deluge/plugins/scheduler/scheduler/core.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/plugins/scheduler/scheduler/core.py b/deluge/plugins/scheduler/scheduler/core.py
-index 9fb81df..f0e2392 100644
---- a/deluge/plugins/scheduler/scheduler/core.py
-+++ b/deluge/plugins/scheduler/scheduler/core.py
-@@ -127,7 +127,7 @@ class Core(CorePluginBase):
-         """
-         core_config = deluge.configmanager.ConfigManager("core.conf")
-         for setting in CONTROLLED_SETTINGS:
--            component.get("PreferencesManager").do_config_set_func(setting, core_config[setting])
-+            core_config.apply_set_functions(setting)
-         # Resume the session if necessary
-         component.get("Core").session.resume()

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Mikle Kolyada]

commit:     14494109832558fc9d3e6faa9e0b5e034ebbaf1c
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 13:48:11 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 13:48:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14494109

net-p2p/deluge: Drop unused patches

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 .../deluge-1.3.15-r1-fix-preferences-ui.patch      | 32 -----------------
 ...ge-1.3.5-disable_libtorrent_internal_copy.patch | 42 ----------------------
 2 files changed, 74 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch b/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch
deleted file mode 100644
index a63e5de10de..00000000000
--- a/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 38d7b7cdfde3c50d6263602ffb03af92fcbfa52e Mon Sep 17 00:00:00 2001
-From: Calum Lind <calumlind+deluge@gmail.com>
-Date: Sat, 13 May 2017 00:05:48 +0100
-Subject: [GTKUI] Fix keyerror showing prefs
-
- * Fix the single_proxy ui to True as unlikely any users using <=0.15
-   and need to have different proxy type settings.
----
- deluge/ui/gtkui/preferences.py | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
-index 645ad26..efcd93d 100644
---- a/deluge/ui/gtkui/preferences.py
-+++ b/deluge/ui/gtkui/preferences.py
-@@ -318,11 +318,8 @@ class Preferences(component.Component):
-             }
-             # Add proxy stuff
- 
--            # Display workaround for single proxy in libtorrent >v0.16
--            try:
--                lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY
--            except AttributeError:
--                lt_single_proxy = False
-+            # Display workaround for single proxy in libtorrent >= v0.16
-+            lt_single_proxy = True
- 
-             for t in ("peer", "web_seed", "tracker", "dht"):
-                 if lt_single_proxy and not t == "peer":
--- 
-cgit v1.1
-

diff --git a/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
deleted file mode 100644
index 349261426de..00000000000
--- a/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -205,38 +205,7 @@
- 
- _ext_modules = []
- 
--# Check for a system libtorrent and if found, then do not build the libtorrent extension
--build_libtorrent = True
--try:
--    from deluge._libtorrent import lt
--except ImportError:
--    build_libtorrent = True
--else:
--    build_libtorrent = False
--
--if build_libtorrent:
--    got_libtorrent = False
--    if not os.path.exists("libtorrent"):
--        import subprocess
--        if subprocess.call(['./get_libtorrent.sh']) > 0:
--            got_libtorrent = False
--        else:
--            got_libtorrent = True
--    else:
--        got_libtorrent = True
--
--    if got_libtorrent:
--        # There isn't a system libtorrent library, so let's build the one included with deluge
--        libtorrent = Extension(
--            'libtorrent',
--            extra_compile_args = _extra_compile_args,
--            include_dirs = _include_dirs,
--            libraries = _libraries,
--            library_dirs = _library_dirs,
--            sources = _sources
--        )
--
--        _ext_modules = [libtorrent]
-+import deluge._libtorrent
- 
- desktop_data = 'deluge/data/share/applications/deluge.desktop'
- 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Andreas Sturmlechner]

commit:     00113e26e60349e8753ba7ca0642927e8ab8c96b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Apr 30 16:28:29 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 18:45:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00113e26

net-p2p/deluge: remove unused file

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15578
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-p2p/deluge/files/deluge-web.service-2 | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-web.service-2 b/net-p2p/deluge/files/deluge-web.service-2
deleted file mode 100644
index adb38300a30..00000000000
--- a/net-p2p/deluge/files/deluge-web.service-2
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Deluge WebUI
-Documentation=man:deluge-web
-After=deluged.service
-
-[Service]
-ExecStart=/usr/bin/deluge-web -c ${DELUGED_HOME} ${DELUGED_OPTS}
-
-[Install]
-WantedBy=multi-user.target
-

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

[Conrad Kostecki]

commit:     d91eae898ccf827917d9fea1fcc01f49e91a7602
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jun  4 18:48:11 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 23:03:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91eae89

net-p2p/deluge: remove unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25753
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch | 143 ---------------------
 net-p2p/deluge/files/deluge-2.0.3-gettext.patch    |  11 --
 net-p2p/deluge/files/deluge-2.0.3-log.patch        |  13 --
 3 files changed, 167 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch b/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch
deleted file mode 100644
index 446ae2e9a0e1..000000000000
--- a/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-https://dev.deluge-torrent.org/changeset/23b3f144fce3424ae
-
-Index: deluge/core/torrentmanager.py
-===================================================================
---- deluge-2.0.3/deluge/core/torrentmanager.py	(revision 8b62e50eb8bf81a177c4d62484a44b766c6f54a6)
-+++ deluge-2.0.3/deluge/core/torrentmanager.py	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-@@ -26,5 +26,5 @@
- import deluge.component as component
- from deluge._libtorrent import lt
--from deluge.common import archive_files, decode_bytes, get_magnet_info, is_magnet
-+from deluge.common import PY2, archive_files, decode_bytes, get_magnet_info, is_magnet
- from deluge.configmanager import ConfigManager, get_config_dir
- from deluge.core.authmanager import AUTH_LEVEL_ADMIN
-@@ -810,5 +810,8 @@
-             try:
-                 with open(filepath, 'rb') as _file:
--                    state = pickle.load(_file)
-+                    if PY2:
-+                        state = pickle.load(_file)
-+                    else:
-+                        state = pickle.load(_file, encoding='utf8')
-             except (IOError, EOFError, pickle.UnpicklingError) as ex:
-                 message = 'Unable to load {}: {}'.format(filepath, ex)
-Index: deluge/tests/data/utf8_filename_torrents.state
-===================================================================
---- deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-+++ deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-@@ -0,0 +1,85 @@
-+(ideluge.core.torrentmanager
-+TorrentManagerState
-+p1
-+(dp2
-+S'torrents'
-+p3
-+(lp4
-+(ideluge.core.torrentmanager
-+TorrentState
-+p5
-+(dp6
-+S'max_download_speed'
-+p7
-+I-1
-+sS'move_completed_path'
-+p8
-+S'/home/calum/Downloads'
-+p9
-+sS'paused'
-+p10
-+I00
-+sS'max_upload_slots'
-+p11
-+I-1
-+sS'prioritize_first_last'
-+p12
-+I00
-+sS'max_connections'
-+p13
-+I-1
-+sS'compact'
-+p14
-+I00
-+sS'queue'
-+p15
-+I0
-+sS'file_priorities'
-+p16
-+(lp17
-+I4
-+asS'filename'
-+p18
-+S'\xc2\xa2.torrent'
-+p19
-+sS'max_upload_speed'
-+p20
-+I-1
-+sS'save_path'
-+p21
-+S'/home/calum/Downloads'
-+p22
-+sS'time_added'
-+p23
-+F1573563097.749759
-+sS'total_uploaded'
-+p24
-+I0
-+sS'torrent_id'
-+p25
-+S'80d81d55ef3b85f3c1b634c362e014b35594dc71'
-+p26
-+sS'auto_managed'
-+p27
-+I01
-+sS'stop_at_ratio'
-+p28
-+I00
-+sS'move_completed'
-+p29
-+I00
-+sS'trackers'
-+p30
-+(lp31
-+sS'magnet'
-+p32
-+NsS'remove_at_ratio'
-+p33
-+I00
-+sS'stop_ratio'
-+p34
-+F2
-+sS'is_finished'
-+p35
-+I00
-+sbasb.
-Index: deluge/tests/test_torrentmanager.py
-===================================================================
---- deluge-2.0.3/deluge/tests/test_torrentmanager.py	(revision c6b6902e9f3e37f5b15184eb509b48b43817a331)
-+++ deluge-2.0.3/deluge/tests/test_torrentmanager.py	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-@@ -8,4 +8,6 @@
- from __future__ import unicode_literals
- 
-+import os
-+import shutil
- import warnings
- from base64 import b64encode
-@@ -29,5 +31,5 @@
- class TorrentmanagerTestCase(BaseTestCase):
-     def set_up(self):
--        common.set_tmp_config_dir()
-+        self.config_dir = common.set_tmp_config_dir()
-         self.rpcserver = RPCServer(listen=False)
-         self.core = Core()
-@@ -119,2 +121,11 @@
-             InvalidTorrentError, self.tm.remove, 'torrentidthatdoesntexist'
-         )
-+
-+    def test_open_state_from_python2(self):
-+        """Open a Python2 state with a UTF-8 encoded torrent filename."""
-+        shutil.copy(
-+            common.get_test_data_file('utf8_filename_torrents.state'),
-+            os.path.join(self.config_dir, 'state', 'torrents.state'),
-+        )
-+        state = self.tm.open_state()
-+        self.assertEqual(len(state.torrents), 1)

diff --git a/net-p2p/deluge/files/deluge-2.0.3-gettext.patch b/net-p2p/deluge/files/deluge-2.0.3-gettext.patch
deleted file mode 100644
index 41cf743749c6..000000000000
--- a/net-p2p/deluge/files/deluge-2.0.3-gettext.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@
-         # Workaround for Python 2 unicode gettext (keyword removed in Py3).
-         kwargs = {} if not deluge.common.PY2 else {'unicode': True}
- 
--        gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+        gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
-         builtins.__dict__['_n'] = builtins.__dict__['ngettext']
- 
-         libintl = None

diff --git a/net-p2p/deluge/files/deluge-2.0.3-log.patch b/net-p2p/deluge/files/deluge-2.0.3-log.patch
deleted file mode 100644
index 45dd9896a915..000000000000
--- a/net-p2p/deluge/files/deluge-2.0.3-log.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://dev.deluge-torrent.org/changeset/351664ec071daa04
-https://dev.deluge-torrent.org/ticket/3327
-Index: deluge/log.py
-===================================================================
---- a/deluge/log.py
-+++ b/deluge/log.py
-@@ -87,5 +87,5 @@
-         yield LoggingLoggerClass.exception(self, msg, *args, **kwargs)
- 
--    def findCaller(self, stack_info=False):  # NOQA: N802
-+    def findCaller(self, *args, **kwargs):  # NOQA: N802
-         f = logging.currentframe().f_back
-         rv = '(unknown file)', 0, '(unknown function)'