[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/, net-p2p/deluge/
commit: 0550e8561811e86aa2d433918a7911e5a6bfcb93
Author: Pacho Ramos gentoo org>
AuthorDate: Thu Apr 27 14:39:30 2023 +
Commit: Pacho Ramos gentoo org>
CommitDate: Thu Apr 27 14:40:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0550e856
net-p2p/deluge: Fix ayatana indicators detection
Patch already accepted by upstream:
https://dev.deluge-torrent.org/ticket/3598
https://dev.deluge-torrent.org/changeset/dbedf7f63
Closes: https://bugs.gentoo.org/904663
Signed-off-by: Pacho Ramos gentoo.org>
net-p2p/deluge/deluge-2.1.1-r3.ebuild | 177
net-p2p/deluge/files/deluge-2.1.1-ayatana.patch | 17 +++
2 files changed, 194 insertions(+)
diff --git a/net-p2p/deluge/deluge-2.1.1-r3.ebuild
b/net-p2p/deluge/deluge-2.1.1-r3.ebuild
new file mode 100644
index ..2d6ade36c4d5
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.1.1-r3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 systemd xdg
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}";
+else
+ SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut
1-2)/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console gui libnotify sound webinterface"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ libnotify? ( gui )
+ sound? ( gui )
+"
+
+BDEPEND="
+ dev-util/intltool
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+RDEPEND="
+ acct-group/deluge
+ acct-user/deluge
+ net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ gui? (
+ sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ gnome-base/librsvg
+ libnotify? ( x11-libs/libnotify )
+ )
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ || (
+ >=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
+ >=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
+ )
+ >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ ')
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-twisted-22.10.patch"
+ # https://dev.deluge-torrent.org/ticket/3598
+ "${FILESDIR}/${P}-ayatana.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ local args=(
+ -e 's|"new_release_check": True|"new_release_check": False|'
+ -e 's|"check_new_releases": True|"check_new_releases": False|'
+ -e 's|"show_new_releases": True|"show_new_releases": False|'
+ )
+ sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local EPYTEST_IGNORE=(
+ # Upstream CI/CD skips these and they seem to intentionally
segfault to collect core dumps...
+ deluge/plugins/Stats/deluge_stats/tests/test_stats.py
+ # Skipped upstream
+ deluge/tests/test_security.py
+ )
+ local EPYTEST_DESELECT=(
+ # Skipped upstream
+
'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
+
'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
+
'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
+ # never returns
+
'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
+ # failing network(?)-related tests, even with sandbox disabled
+ 'deluge/tests/test_common.py::TestCommon::test_is_interface'
+ # fails
+ 'deluge/tests/test_core.py::TestCore::test_pause_torrents'
+ # fails because of network sandbox
+ 'deluge/tests/test_core.py::TestCore::test_test_listen_port'
+
'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/, net-p2p/deluge/
commit: 0fe44f7a1d0009f74cfe5cd7e9d8495859c5052a
Author: Paolo Pedroni iol it>
AuthorDate: Tue Dec 27 14:38:22 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Jan 12 14:41:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe44f7a
net-p2p/deluge: Fix deluge-web systemd service unit
Also clarify systemd service usage and drop old.
Closes: https://bugs.gentoo.org/888183
Signed-off-by: Paolo Pedroni iol.it>
Closes: https://github.com/gentoo/gentoo/pull/28852
Signed-off-by: Joonas Niilola gentoo.org>
.../deluge/{deluge-2.1.1.ebuild => deluge-2.1.1-r2.ebuild} | 12
net-p2p/deluge/files/deluge-web.service-4| 10 ++
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild
b/net-p2p/deluge/deluge-2.1.1-r2.ebuild
similarity index 94%
rename from net-p2p/deluge/deluge-2.1.1.ebuild
rename to net-p2p/deluge/deluge-2.1.1-r2.ebuild
index 6e8715c9404e..e30912c37127 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}";
else
SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut
1-2)/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
fi
LICENSE="GPL-2"
@@ -64,6 +64,8 @@ RDEPEND="
')
"
+PATCHES=( "${FILESDIR}/${P}-twisted-22.10.patch" )
+
distutils_enable_tests pytest
python_prepare_all() {
@@ -131,7 +133,7 @@ python_install_all() {
if use webinterface; then
newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
newconfd "${FILESDIR}/deluge-web.conf" deluge-web
- systemd_newunit "${FILESDIR}/deluge-web.service-3"
deluge-web.service
+ systemd_newunit "${FILESDIR}/deluge-web.service-4"
deluge-web.service
systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
else
rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
@@ -156,7 +158,9 @@ pkg_postinst() {
elog
elog "To start the daemon either run 'deluged' as user"
elog "or modify /etc/conf.d/deluged and run"
- elog "/etc/init.d/deluged start as root"
+ elog "'/etc/init.d/deluged start' as root if you use OpenRC"
+ elog "or"
+ elog "'systemctl start deluged.service' as root if you use systemd"
elog "You can still use deluge the old way"
elog
elog "Systemd unit files for deluged and deluge-web no longer source"
diff --git a/net-p2p/deluge/files/deluge-web.service-4
b/net-p2p/deluge/files/deluge-web.service-4
new file mode 100644
index ..9ebfcbc84745
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.service-4
@@ -0,0 +1,10 @@
+[Unit]
+Description=Deluge WebUI
+Documentation=man:deluge-web
+After=deluged.service
+
+[Service]
+ExecStart=/usr/bin/deluge-web -d -c ${DELUGE_WEB_HOME} ${DELUGE_WEB_OPTS}
+
+[Install]
+WantedBy=multi-user.target
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/, net-p2p/deluge/
commit: eaceccfa7548d133e33add079ba76618a39730f8
Author: Paolo Pedroni iol it>
AuthorDate: Mon Nov 7 15:23:07 2022 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Nov 7 15:35:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaceccfa
net-p2p/deluge: Fix deluge-web execution with twisted-22.10.0
Closes: https://bugs.gentoo.org/879351
Signed-off-by: Paolo Pedroni iol.it>
Closes: https://github.com/gentoo/gentoo/pull/28167
Signed-off-by: Craig Andrews gentoo.org>
net-p2p/deluge/deluge-2.1.1-r1.ebuild | 171 +
.../deluge/files/deluge-2.1.1-twisted-22.10.patch | 31
2 files changed, 202 insertions(+)
diff --git a/net-p2p/deluge/deluge-2.1.1-r1.ebuild
b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
new file mode 100644
index ..49f330c238b3
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 systemd xdg
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}";
+else
+ SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut
1-2)/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console gui libnotify sound webinterface"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ libnotify? ( gui )
+ sound? ( gui )
+"
+
+BDEPEND="
+ dev-util/intltool
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+RDEPEND="
+ acct-group/deluge
+ acct-user/deluge
+ net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ gui? (
+ sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ gnome-base/librsvg
+ libnotify? ( x11-libs/libnotify )
+ )
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ || (
+ >=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
+ >=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
+ )
+ >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ ')
+"
+
+PATCHES=( "${FILESDIR}/${P}-twisted-22.10.patch" )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ local args=(
+ -e 's|"new_release_check": True|"new_release_check": False|'
+ -e 's|"check_new_releases": True|"check_new_releases": False|'
+ -e 's|"show_new_releases": True|"show_new_releases": False|'
+ )
+ sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local EPYTEST_IGNORE=(
+ # Upstream CI/CD skips these and they seem to intentionally
segfault to collect core dumps...
+ deluge/plugins/Stats/deluge_stats/tests/test_stats.py
+ # Skipped upstream
+ deluge/tests/test_security.py
+ )
+ local EPYTEST_DESELECT=(
+ # Skipped upstream
+
'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
+
'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
+
'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
+ # never returns
+
'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
+ # failing network(?)-related tests, even with sandbox disabled
+ 'deluge/tests/test_common.py::TestCommon::test_is_interface'
+ # fails
+ 'deluge/tests/test_core.py::TestCore::test_pause_torrents'
+ # fails because of network sandbox
+ 'deluge/tests/test_core.py::TestCore::test_test_listen_port'
+
'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
+
'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
+
'deluge/tests/test_
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/, net-p2p/deluge/
commit: 5e59c9a6bf0ee6b3aeea0c6b9bc6226896ecc5c5
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Oct 15 06:44:49 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Oct 15 06:47:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e59c9a6
net-p2p/deluge: drop 2.0.5-r2
Bug: https://bugs.gentoo.org/866842
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/deluge/Manifest | 1 -
net-p2p/deluge/deluge-2.0.5-r2.ebuild | 144 --
net-p2p/deluge/files/deluge-2.0.3-UI-status.patch | 31 -
net-p2p/deluge/files/deluge-2.0.3-setup.py.patch | 11 --
4 files changed, 187 deletions(-)
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 1304a7562619..640b58957ce0 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,2 +1 @@
-DIST deluge-2.0.5.tar.xz 1895268 BLAKE2B
2c815aa9dbbbed5ba780d694b0518f224577b9c370a03712b15c706eda6de55e34b834f624ec18001c9d41b925677b6a001a384691a7ffd9f29c16731a735d4b
SHA512
6c2994ca2906fdb92e96aa3534a4ffd5199e9ab6a1b5b12de94c94ec29850cad0cef7546ae1bea5188075fd16a07e584a17bf2f8b5eb1d2b91dee2da1e494588
DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B
3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da
SHA512
e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455
diff --git a/net-p2p/deluge/deluge-2.0.5-r2.ebuild
b/net-p2p/deluge/deluge-2.0.5-r2.ebuild
deleted file mode 100644
index f7144d94500d..
--- a/net-p2p/deluge/deluge-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/";
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}";
-else
- SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut
1-2)/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console gtk libnotify sound webinterface"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- libnotify? ( gtk )
- sound? ( gtk )
-"
-
-DEPEND="
- net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/wheel[${PYTHON_USEDEP}]
- ')
- dev-util/intltool
- acct-group/deluge
- acct-user/deluge"
-RDEPEND="
- net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- dev-python/setproctitle[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- || (
- >=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
- >=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
- )
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
- gtk? (
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- gnome-base/librsvg
- libnotify? ( x11-libs/libnotify )
- )
- dev-python/mako[${PYTHON_USEDEP}]
- ')"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.3-setup.py.patch"
- "${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
-python_prepare_all() {
- local args=(
- -e "/Compiling po file/a \\\tuptoDate = False"
- )
- sed -i "${args[@]}" -- 'setup.py' || die
- args=(
- -e 's|"new_release_check": True|"new_release_check": False|'
- -e 's|"check_new_releases": True|"check_new_releases": False|'
- -e 's|"show_new_releases": True|"show_new_releases": False|'
- )
- sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
- distutils-r1_python_prepare_all
-}
-
-esetup.py() {
- # bug 531370: deluge has its own plugin system. No need to relocate its
egg info files.
- # Override this call from the distutils-r1 eclass.
- # This does not respect the distutils-r1 API. DONOT copy this example.
- set -- "${PYTHON}" setup.py "$@"
- echo "$@"
- "$@" || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- if ! use console ; then
- rm -r "
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/
commit: d91eae898ccf827917d9fea1fcc01f49e91a7602
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Jun 4 18:48:11 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Jun 5 23:03:27 2022 +
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 levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25753
Signed-off-by: Conrad Kostecki 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..
--- 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/fi
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/, net-p2p/deluge/
commit: ea7a178756c5cee2e4659280423c208e67972271
Author: Craig Andrews gentoo org>
AuthorDate: Sat Aug 14 01:10:19 2021 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Aug 14 01:10:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7a1787
net-p2p/deluge: Fix twisted logging error
Closes: https://bugs.gentoo.org/807997
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Craig Andrews gentoo.org>
.../deluge/{deluge-.ebuild => deluge-2.0.3-r9.ebuild} | 8
net-p2p/deluge/deluge-.ebuild | 4 +++-
net-p2p/deluge/files/deluge-2.0.3-log.patch | 13 +
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/net-p2p/deluge/deluge-.ebuild
b/net-p2p/deluge/deluge-2.0.3-r9.ebuild
similarity index 96%
copy from net-p2p/deluge/deluge-.ebuild
copy to net-p2p/deluge/deluge-2.0.3-r9.ebuild
index 0fe6fe0a53f..6878f1f82c5 100644
--- a/net-p2p/deluge/deluge-.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r9.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
PYTHON_COMPAT=( python3_{8,9} )
DISTUTILS_SINGLE_IMPL=1
-inherit xdg distutils-r1 systemd
+inherit distutils-r1 systemd
DESCRIPTION="BitTorrent client with a client/server model"
HOMEPAGE="https://deluge-torrent.org/";
@@ -15,7 +15,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}";
else
SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
fi
LICENSE="GPL-2"
@@ -62,6 +62,8 @@ PATCHES=(
"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
"${FILESDIR}/${PN}-2.0.3-gettext.patch"
+ "${FILESDIR}/${P}-fix-pickle.patch"
+ "${FILESDIR}/${P}-log.patch"
)
python_prepare_all() {
@@ -121,8 +123,6 @@ python_install_all() {
}
pkg_postinst() {
- xdg_pkg_postinst
-
elog
elog "If, after upgrading, deluge doesn't work, please remove the"
elog "'~/.config/deluge' directory and try again, but make a backup"
diff --git a/net-p2p/deluge/deluge-.ebuild
b/net-p2p/deluge/deluge-.ebuild
index 0fe6fe0a53f..0d7b3a317c0 100644
--- a/net-p2p/deluge/deluge-.ebuild
+++ b/net-p2p/deluge/deluge-.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}";
else
SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
fi
LICENSE="GPL-2"
@@ -62,6 +62,8 @@ PATCHES=(
"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
"${FILESDIR}/${PN}-2.0.3-gettext.patch"
+ "${FILESDIR}/${P}-fix-pickle.patch"
+ "${FILESDIR}/${P}-log.patch"
)
python_prepare_all() {
diff --git a/net-p2p/deluge/files/deluge-2.0.3-log.patch
b/net-p2p/deluge/files/deluge-2.0.3-log.patch
new file mode 100644
index 000..45dd9896a91
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.0.3-log.patch
@@ -0,0 +1,13 @@
+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)'
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/
commit: 00113e26e60349e8753ba7ca0642927e8ab8c96b
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Thu Apr 30 16:28:29 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 18:45:50 2020 +
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 gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15578
Signed-off-by: Andreas Sturmlechner 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..000
--- 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/
commit: 14494109832558fc9d3e6faa9e0b5e034ebbaf1c
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon Apr 27 13:48:11 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Apr 27 13:48:34 2020 +
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 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..000
--- 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
-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..000
--- 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/, net-p2p/deluge/
commit: 8eeaceea9b91ac8f068cdcb333842d7aebb7c9e6
Author: PPed72 iol it>
AuthorDate: Fri Jan 24 15:04:07 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Jan 27 06:32:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eeaceea
net-p2p/deluge: fix deluge-web.init file
Also fixes installation of unwanted files and byte compilation of
python modules. Remove old.
Closes: https://bugs.gentoo.org/705914
Signed-off-by: Paolo Pedroni iol.it>
Closes: https://github.com/gentoo/gentoo/pull/14425
Signed-off-by: Joonas Niilola gentoo.org>
...luge-2.0.3-r1.ebuild => deluge-2.0.3-r3.ebuild} | 28 ++--
net-p2p/deluge/deluge-.ebuild | 26 ++-
net-p2p/deluge/files/deluge-web.init-2 | 53 ++
3 files changed, 82 insertions(+), 25 deletions(-)
diff --git a/net-p2p/deluge/deluge-2.0.3-r1.ebuild
b/net-p2p/deluge/deluge-2.0.3-r3.ebuild
similarity index 83%
rename from net-p2p/deluge/deluge-2.0.3-r1.ebuild
rename to net-p2p/deluge/deluge-2.0.3-r3.ebuild
index 960cc354e42..d1806e7558e 100644
--- a/net-p2p/deluge/deluge-2.0.3-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r3.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 systemd
@@ -85,31 +85,33 @@ esetup.py() {
python_install_all() {
distutils-r1_python_install_all
if ! use console ; then
- rm -rf
"${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
- rm -f "${D}/usr/bin/deluge-console" || die
- rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+ rm "${D}/usr/bin/deluge-console" || die
+ rm "${D}/usr/share/man/man1/deluge-console.1" ||die
fi
if ! use gtk ; then
- rm -rf
"${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
- rm -rf "${D}/usr/share/icons/" || die
- rm -f "${D}/usr/bin/deluge-gtk" || die
- rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
- rm -f "${D}/usr/share/applications/deluge.desktop" || die
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+ rm -r "${D}/usr/share/icons/" || die
+ rm "${D}/usr/bin/deluge-gtk" || die
+ rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
+ rm "${D}/usr/share/applications/deluge.desktop" || die
fi
if use webinterface; then
- newinitd "${FILESDIR}/deluge-web.init" deluge-web
+ newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
newconfd "${FILESDIR}/deluge-web.conf" deluge-web
systemd_newunit "${FILESDIR}/deluge-web.service-3"
deluge-web.service
systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
else
- rm -rf
"${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
- rm -f "${D}/usr/bin/deluge-web" || die
- rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+ rm "${D}/usr/bin/deluge-web" || die
+ rm "${D}/usr/share/man/man1/deluge-web.1" || die
fi
newinitd "${FILESDIR}"/deluged.init-2 deluged
newconfd "${FILESDIR}"/deluged.conf-2 deluged
systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+ python_optimize
}
pkg_postinst() {
diff --git a/net-p2p/deluge/deluge-.ebuild
b/net-p2p/deluge/deluge-.ebuild
index fc0402eb722..d1806e7558e 100644
--- a/net-p2p/deluge/deluge-.ebuild
+++ b/net-p2p/deluge/deluge-.ebuild
@@ -85,31 +85,33 @@ esetup.py() {
python_install_all() {
distutils-r1_python_install_all
if ! use console ; then
- rm -rf
"${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
- rm -f "${D}/usr/bin/deluge-console" || die
- rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+ rm "${D}/usr/bin/deluge-console" || die
+ rm "${D}/usr/share/man/man1/deluge-console.1" ||die
fi
if ! use gtk ; then
- rm -rf
"${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
- rm -rf "${D}/usr/share/icons/" || die
- rm -f "${D}/usr/bin/deluge-gtk" || die
- rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
- rm -f "${D}/usr/share/applications/deluge.desktop" || die
+ rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/
commit: b35463dac1ca31fc012ec04e93f0fc30ae45cd65
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Oct 19 08:22:36 2019 +
Commit: Craig Andrews gentoo org>
CommitDate: Mon Oct 21 13:25:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b35463da
net-p2p/deluge: remove unused patch
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13341
Signed-off-by: Craig Andrews 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..000
--- 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
-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/, net-p2p/deluge/
commit: 0636a6c1baa2467b6642ea60227ba5af62388bb0
Author: Craig Andrews gentoo org>
AuthorDate: Wed Oct 9 20:52:51 2019 +
Commit: Craig Andrews gentoo org>
CommitDate: Fri Oct 11 15:07:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0636a6c1
net-p2p/deluge: 2.0.3 version bump
Closes: https://bugs.gentoo.org/688024
Closes: https://github.com/gentoo/gentoo/pull/12548
Closes: https://github.com/gentoo/gentoo/pull/9327
Closes: https://github.com/gentoo/gentoo/pull/13243
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Craig Andrews gentoo.org>
net-p2p/deluge/Manifest| 1 +
.../{deluge-.ebuild => deluge-2.0.3.ebuild}| 56 ++
net-p2p/deluge/deluge-.ebuild | 56 ++
net-p2p/deluge/files/deluge-2.0.3-UI-status.patch | 31
net-p2p/deluge/files/deluge-2.0.3-setup.py.patch | 11 +
net-p2p/deluge/metadata.xml| 4 ++
6 files changed, 97 insertions(+), 62 deletions(-)
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 9f49e45f37b..437ebf60a93 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1 +1,2 @@
DIST deluge-1.3.15.tar.bz2 1775913 BLAKE2B
9d5224766051d52b6e075dcafab5716793081c78ba69da616fc98f2c463ddc7676b2c2ce8f54b81e1480cf4344582245733033cf5927a9692bc43ec0a23f0001
SHA512
1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda
+DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B
d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d
SHA512
3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
diff --git a/net-p2p/deluge/deluge-.ebuild
b/net-p2p/deluge/deluge-2.0.3.ebuild
similarity index 74%
copy from net-p2p/deluge/deluge-.ebuild
copy to net-p2p/deluge/deluge-2.0.3.ebuild
index 9989834d997..f347e4c3ee3 100644
--- a/net-p2p/deluge/deluge-.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3.ebuild
@@ -1,24 +1,21 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et
eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb
lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te
th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd l10n
+inherit distutils-r1 systemd
DESCRIPTION="BitTorrent client with a client/server model"
HOMEPAGE="https://deluge-torrent.org/";
if [[ ${PV} == ]]; then
inherit git-r3
- EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
- http://git.deluge-torrent.org/${PN}";
- SRC_URI=""
+ EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}";
else
- SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+ SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz";
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2"
@@ -26,37 +23,41 @@ SLOT="0"
IUSE="console geoip gtk libnotify sound webinterface"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
- sound? ( gtk )
libnotify? ( gtk )
+ sound? ( gtk )
"
-PATCHES=(
- "${FILESDIR}/${PN}-1.3.12-fix_scheduler_plugin.patch"
-)
-CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
+DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-util/intltool
+ dev-python/wheel[${PYTHON_USEDEP}]
acct-group/deluge
acct-user/deluge"
-RDEPEND="${CDEPEND}
- dev-python/chardet[${PYTHON_USEDEP}]
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
dev-python/setproctitle[${PYTHON_USEDEP}]
- || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
- >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
- )
- geoip? ( dev-libs/geoip )
+ dev-python/six[${PYTHON_USEDEP}]
+ >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
+ >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+ geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
gtk? (
sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+ dev-pyt
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/
commit: fc9581d755e96bfd4eef2eb91669559f6d87ea0f
Author: PPed72 iol it>
AuthorDate: Wed Nov 8 11:45:35 2017 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Wed Dec 20 22:13:47 2017 +
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..000
--- 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..000
--- 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..000
--- 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..000
--- 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/, net-p2p/deluge/
commit: 9180e836c5fbd22c5aecde178597faa0bcaaf30e
Author: PPed72 iol it>
AuthorDate: Wed Aug 30 14:38:06 2017 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Mon Oct 16 20:36:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9180e836
net-p2p/deluge: fix to preferences ui
Bug: https://bugs.gentoo.org/623650
net-p2p/deluge/deluge-1.3.15-r1.ebuild | 144 +
.../deluge-1.3.15-r1-fix-preferences-ui.patch | 32 +
2 files changed, 176 insertions(+)
diff --git a/net-p2p/deluge/deluge-1.3.15-r1.ebuild
b/net-p2p/deluge/deluge-1.3.15-r1.ebuild
new file mode 100644
index 000..e76bbab1485
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et
eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb
lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te
th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+ http://git.deluge-torrent.org/${PN}";
+ SRC_URI=""
+ KEYWORDS="~amd64 ~x86"
+else
+ SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2";
+ KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ sound? ( gtk )
+ libnotify? ( gtk )
+"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+ "${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
+)
+
+CDEPEND="http://dev.deluge-torrent.org/wiki/Faq";
+ elog
+}
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
new file mode 100644
index 000..a63e5de10de
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch
@@ -0,0 +1,32 @@
+From 38d7b7cdfde3c50d6263602ffb03af92fcbfa52e Mon Sep 17 00:00:00 2001
+From: Calum Lind
+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
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/, net-p2p/deluge/
commit: 900dcc34dcda0cbc21d152fb9011907a632c0e31
Author: PPed72 iol it>
AuthorDate: Mon Mar 21 09:58:31 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Mar 21 11:43:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900dcc34
net-p2p/deluge: fix scheduler plugin
Reporter: Giacomo Tazzari gmail.com>
Gentoo-Bug: https://bugs.gentoo.org/577848
Closes: https://github.com/gentoo/gentoo/pull/1103
net-p2p/deluge/deluge-1.3.12-r3.ebuild | 1 +
.../files/deluge-1.3.12-fix_scheduler_plugin.patch | 22 ++
2 files changed, 23 insertions(+)
diff --git a/net-p2p/deluge/deluge-1.3.12-r3.ebuild
b/net-p2p/deluge/deluge-1.3.12-r3.ebuild
index cd671e1..1327cd2 100644
--- a/net-p2p/deluge/deluge-1.3.12-r3.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12-r3.ebuild
@@ -50,6 +50,7 @@ RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
python_prepare_all() {
local PATCHES=(
"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
+ "${FILESDIR}"/${PN}-1.3.12-fix_scheduler_plugin.patch
)
distutils-r1_python_prepare_all
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 000..fda64aa
--- /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
+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/
commit: e7447aac71d16585382070229e86872586524e5c Author: PPed72 iol it> AuthorDate: Wed Mar 9 10:15:36 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Mar 10 10:18:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7447aac net-p2p/deluge: improve configuration defaults Signed-off-by: Patrice Clement 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/
commit: 3e1a129743e430017e58b5a24f9df6fefaef3e39
Author: PPed72 iol it>
AuthorDate: Wed Mar 9 10:21:00 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Mar 10 10:18:12 2016 +
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 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 000..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 000..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/
commit: 6314161ce622b9e0ea6a80e18297464446753a7b Author: PPed72 iol it> AuthorDate: Wed Mar 9 10:17:14 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Mar 10 10:18:12 2016 + 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 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 000..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 000..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/
commit: c7a49e7c181fd8041bdfa9c62a9971dd3b98392d
Author: Paolo Pedroni iol it>
AuthorDate: Mon Feb 29 14:44:27 2016 +
Commit: Ian Delaney gentoo org>
CommitDate: Mon Feb 29 14:44:27 2016 +
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..000
--- 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
-Date: Thu, 27 Sep 2012 16:53:22 +
-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/
commit: 96117d3b7fc98d99bd11a4bf135cfb85fab87024
Author: Paolo Pedroni iol it>
AuthorDate: Wed Feb 17 10:24:42 2016 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Sun Feb 28 20:38:24 2016 +
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 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 000..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 000..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 000..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 000..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!"
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/
commit: 4ac506c9c23cee826923655b8b7d722d31559cd5 Author: Paolo Pedroni iol it> AuthorDate: Wed Feb 17 10:51:15 2016 + Commit: Kristian Fiskerstrand gentoo org> CommitDate: Sun Feb 28 20:38:34 2016 + 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/
commit: 827aca59c6854e49418f92bc6b8ef484a4c77b26 Author: Paolo Pedroni iol it> AuthorDate: Fri Feb 26 09:10:26 2016 + Commit: Kristian Fiskerstrand gentoo org> CommitDate: Sun Feb 28 20:38:43 2016 + 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/
commit: f5049e856eb8a5811df3e7bcb6daf43875a88511
Author: Paolo Pedroni iol it>
AuthorDate: Fri Feb 12 10:23:25 2016 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Tue Feb 16 17:51:09 2016 +
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 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/
commit: 16ea539b0675ae3ed164236d7506f7e7df6af6ee
Author: Paolo Pedroni iol it>
AuthorDate: Tue Feb 16 09:18:36 2016 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Tue Feb 16 17:51:13 2016 +
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/
commit: b9d41d1974b7f60a90c62e354c5a8e849a727c6e
Author: Paolo Pedroni iol it>
AuthorDate: Fri Feb 12 10:19:33 2016 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Tue Feb 16 17:51:04 2016 +
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 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/
commit: f821754bbdeaf70e6b079d94d124b8f90978290c
Author: Paolo Pedroni iol it>
AuthorDate: Tue Feb 16 09:44:01 2016 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Tue Feb 16 17:51:17 2016 +
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 $?
