reinit the tree, so we can have metadata

14 files changed, 318 insertions, 0 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
new file mode 100644
index 000000000000..fda64aa2b393
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch
@@ -0,0 +1,22 @@
+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()
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
new file mode 100644
index 000000000000..349261426de8
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
@@ -0,0 +1,42 @@
+--- 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'
+ 
diff --git a/net-p2p/deluge/files/deluge-web.conf b/net-p2p/deluge/files/deluge-web.conf
new file mode 100644
index 000000000000..a08f9b74fe61
--- /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:deluge"
+DELUGE_WEB_HOME="/var/lib/deluge"
+#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 000000000000..1e0b4833f072
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.init
@@ -0,0 +1,53 @@
+#!/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 [ "${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/deluge-web.service b/net-p2p/deluge/files/deluge-web.service
new file mode 100644
index 000000000000..426401a95e08
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.service
@@ -0,0 +1,11 @@
+[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/deluge-web.service-2 b/net-p2p/deluge/files/deluge-web.service-2
new file mode 100644
index 000000000000..adb38300a30e
--- /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/deluge-web.service.conf b/net-p2p/deluge/files/deluge-web.service.conf
new file mode 100644
index 000000000000..2c594cdf8f7b
--- /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.conf b/net-p2p/deluge/files/deluged.conf
new file mode 100644
index 000000000000..21b375d5c97f
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.conf
@@ -0,0 +1,9 @@
+# /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.conf-2 b/net-p2p/deluge/files/deluged.conf-2
new file mode 100644
index 000000000000..ac0c4cd0db51
--- /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="deluge:deluge"
+# DELUGED_UMASK="0002"
+DELUGED_OPTS="-p 58846"
+DELUGED_HOME="/var/lib/deluge"
diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
new file mode 100644
index 000000000000..0fd9429fb055
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.init
@@ -0,0 +1,71 @@
+#!/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.init-2 b/net-p2p/deluge/files/deluged.init-2
new file mode 100644
index 000000000000..1f76298d1877
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.init-2
@@ -0,0 +1,53 @@
+#!/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 $?
+}
+
+stop() {
+	ebegin "Stopping Deluged"
+	start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
+	--name deluged --pidfile /run/deluged.pid
+	eend $?
+}
diff --git a/net-p2p/deluge/files/deluged.service b/net-p2p/deluge/files/deluged.service
new file mode 100644
index 000000000000..74876b008ccf
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.service
@@ -0,0 +1,13 @@
+[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
diff --git a/net-p2p/deluge/files/deluged.service-2 b/net-p2p/deluge/files/deluged.service-2
new file mode 100644
index 000000000000..049cd025b534
--- /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
diff --git a/net-p2p/deluge/files/deluged.service.conf b/net-p2p/deluge/files/deluged.service.conf
new file mode 100644
index 000000000000..2d74e23582cb
--- /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"