diff options
Diffstat (limited to 'net-p2p/deluge')
-rw-r--r-- | net-p2p/deluge/Manifest | 6 | ||||
-rw-r--r-- | net-p2p/deluge/deluge-2.0.3-r1.ebuild (renamed from net-p2p/deluge/deluge-2.0.3.ebuild) | 6 | ||||
-rw-r--r-- | net-p2p/deluge/deluge-9999.ebuild | 6 | ||||
-rw-r--r-- | net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch | 22 | ||||
-rw-r--r-- | net-p2p/deluge/files/deluge-web.service-3 | 10 |
5 files changed, 19 insertions, 31 deletions
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest index d8bced93ad91..ebb838367e37 100644 --- a/net-p2p/deluge/Manifest +++ b/net-p2p/deluge/Manifest @@ -1,4 +1,3 @@ -AUX deluge-1.3.12-fix_scheduler_plugin.patch 1050 BLAKE2B 574e0a32d856247108418978bd8a4cab7db960ec929175a4a5845f07ab726e0714070c3bd853dc2537ec52a770daea11d54c43568da1e12cc5bba3f394b2a42c SHA512 0613de93b5f61e523dfd8b8d5ec145a64b69ae96fde8236d9da9c7e4a54af681490879157f0a8a5537c27e93feb5b1db6651d61a9655e58763c1676e1843e087 AUX deluge-1.3.15-r1-fix-preferences-ui.patch 1209 BLAKE2B 570dba58991221c2c2d329c0a367f68ebadf15d7b0fef8633c9c22d1c3dc992328d69f329f9700d2c46ab812ff4d99de420a37daecbb6623338e005f8fa9538d SHA512 9d32dad457ce5fe5752fa3f4dd42492443ffbeb0508347d21197b4ee950674dbf209d4faf6a730c37eecfa8a5233606fbef9ede5c4a2da5ee60d047ec7569b98 AUX deluge-1.3.5-disable_libtorrent_internal_copy.patch 1165 BLAKE2B 68d0e98ca8648adb3f5afdeda84c4d36fa5bcea2239e37087404573faa4b8084a8c54362d237bbfda702d4b12213818259ddc0cd61013dc7261186899ded4b96 SHA512 8f08d5b9cfcff3fda8153d4bdfc8435a3b63fefc51b6cd3c648a82134377dc561e68df3c9aba4a37cffeff7b789d352a438b75ec6bdaf58f87ab5326f641b316 AUX deluge-2.0.3-UI-status.patch 1406 BLAKE2B 7da865fa6d87fbfc0443572d34cbf7324cc76037c603b7d2199081533fab04362d78e15dcaf37ceeb606f04017e8b1b5ad9ceb2028a9bd4d11bb859f02d3d898 SHA512 4860c7147ff4ec6da072a4245be7a80e6512f6cf2eecfd4db8260a206e76d1cb44b9f063e82e5a57ef70ab3d7dd020d9ba5ddb1c96b2bbb72ed9d3b2f20d85c8 @@ -6,6 +5,7 @@ AUX deluge-2.0.3-setup.py.patch 428 BLAKE2B f9469cac78d66cf71b510d846bceb1e59e6c AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999 AUX deluge-web.init 1484 BLAKE2B f58b9a929345ee705088cc7efbf83bd1537a8e0c8332e3c4d50f08f47b1a41c5b5005cb19c94e555fcbe92bcc1c5f2e274057cd9624789ee107d22717ffa0d03 SHA512 8afb1318e4cf267013a3704f71c83942c4c862eeb6d91ea15f4a2a8bb5f1bed7461453bf2877fe0afc4c3f560dad3629ade538324a75a9b6ce4982f5121a74ef AUX deluge-web.service-2 198 BLAKE2B 00195276c90653b406fcd9d7d75cb6a69fff6929644372905de42e5a62ad1129e954adbe54415a3be612f705cb773f40570d49c7720b40b6caffacc7fce4518f SHA512 51d761c76d213285bef2cd4cc80c7135838f0fb955a7584ca15194080d50aa63e81642d566b901af8970ed01ae9952482226a41627f1e198fd6587c197737889 +AUX deluge-web.service-3 200 BLAKE2B cddc255dda99d26d603c20d2d5e6ab15b46a81fd1865734e9b77df82580788938fd2f343c1f3bc5e57062c5089c3244b7e1950451912bdc460c2bba28dd6da89 SHA512 50791884fe84c39784b6350cc38dbca116ae5e4505a6cae6a3833167014861d51fdce7902ad1ca74bbe0b580438d850cc7a8f4f2d065f495c6e7864e360577fa AUX deluge-web.service.conf 100 BLAKE2B 2ed6ce80fb88d19f50911940ca5092617b55670228354cb5c7c38b7fb23801e3880ecea4d2326bb2ce1b496ba484242ed109ef6149b712f3fe6cd4b356eccdf5 SHA512 aaf493b3f614558c762ffea3219eda7045e739eeeb826a19df456ef9a94a0894302695bd96490eb4fb44e16039126170ec31ba6e0a0a2f6ae69669e2b9f4cda9 AUX deluged.conf-2 228 BLAKE2B e498f2d8b232ce40fee847079608750a58e15bb88e5918cf9325a44258a1ae73d114db8d6ff80bcf093a956ed33d592bf76748015a14803c3a380c415a805a0e SHA512 3005478b48c6c4c67f0eb8d9ee44ea1310ccd209fe6364f7bbc37ec296111e50462296d678cd4098bb63472ade190fdaf38ded39c3e8a73cbb4cede4860978c1 AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aae1f61677f0f2fd763c3d7686d4fcb5a583884f560906bf75917fddd4ebbe379cdb2d839dfba80e9e SHA512 a2514306b14712c7b31e64baccb65080101314e5f81e01702caf0f030afa40d98c1d3898c90fb66f55092bb27c48f0a6bd5a4db215ac68e352602000b700164a @@ -17,6 +17,6 @@ EBUILD deluge-1.3.15-r2.ebuild 4929 BLAKE2B 78454c0525b20a0a521d15bd49c01e556c7c EBUILD deluge-1.3.15-r3.ebuild 4495 BLAKE2B 82ffe9b866a7761cfce5cea806ba57cce365172fe092470481c0ca6af14801b91d2d3c58da3c9b5d41764273b35223f4d18daa44682f45901038d4fc64b773e6 SHA512 dd366542d8ad15db9ff42ded2e2a45c421457f8cddc2640438decccbc82e25e4b3a8c3c4959eb265c3a27c655b86af7902ebba989301066f97176d5d07fb0120 EBUILD deluge-1.3.15-r4.ebuild 4433 BLAKE2B 3568da55fb548fd2bff397e7475eb35566b32215c704e0bea54088c3bf99a2819a866111ff579f3a64cd3160bb1dc1f7a5273f1a9be5aa1fbe40ba5ece07230b SHA512 21a791b18064beabc6213ebe9414af89151e47bc80747691045b4931c67f72b158a6ca444ecb94efc428db250c4dc94dc9425b46d6791b26329a6ee6621e17c7 EBUILD deluge-1.3.9999.ebuild 4443 BLAKE2B bc2778509d617096c242d0d0d0295bb9c257cbc0befbfaff376d530106b278260970eaf162ead9d83c841f33cce180be84d8d0f81686f3394bb52edbe596e94d SHA512 70391b5670f0b3fe38e477a952fa563bc7441d65f7b0e141eebd073166392a5aaa9f98f3e2414c240333007eb4fb714517c190b8b6287812e96bb5b244f41469 -EBUILD deluge-2.0.3.ebuild 4431 BLAKE2B 83af31524f55d3be3a3dddc9090030734b42eea4155fe257d8288be886c7de430127c3ec3927ad13be50368005c8d8d8c0ef0cabca70ae12587a3e55f9ea4e7a SHA512 f01b50cfbe640e43756ee4aed3d56d633c5ffec2bd6c2ea2a3483c6f72df613156386b89fdd74948eb07eeefe2ee3a161cddd3dc73617a85a3dcbb200e7f4f70 -EBUILD deluge-9999.ebuild 4431 BLAKE2B 83af31524f55d3be3a3dddc9090030734b42eea4155fe257d8288be886c7de430127c3ec3927ad13be50368005c8d8d8c0ef0cabca70ae12587a3e55f9ea4e7a SHA512 f01b50cfbe640e43756ee4aed3d56d633c5ffec2bd6c2ea2a3483c6f72df613156386b89fdd74948eb07eeefe2ee3a161cddd3dc73617a85a3dcbb200e7f4f70 +EBUILD deluge-2.0.3-r1.ebuild 4415 BLAKE2B b1028710ba509fe4e3b89ecb973f5e788c8ac1ed4172954a2f92ab0e8ad43542819d083b82c18f2d58360d49ae1572bd75e7496454f44a665a18606a5bcb758e SHA512 07ac0dd3bfcc907088d682b5f9e699cf70d9dc12d4ffd6690dcd9a54e6b7a5daed81963aa0722f54aee6a3270068acf4913ae009462d9904186069e21971c631 +EBUILD deluge-9999.ebuild 4415 BLAKE2B b1028710ba509fe4e3b89ecb973f5e788c8ac1ed4172954a2f92ab0e8ad43542819d083b82c18f2d58360d49ae1572bd75e7496454f44a665a18606a5bcb758e SHA512 07ac0dd3bfcc907088d682b5f9e699cf70d9dc12d4ffd6690dcd9a54e6b7a5daed81963aa0722f54aee6a3270068acf4913ae009462d9904186069e21971c631 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81 diff --git a/net-p2p/deluge/deluge-2.0.3.ebuild b/net-p2p/deluge/deluge-2.0.3-r1.ebuild index f347e4c3ee39..9d936b780a05 100644 --- a/net-p2p/deluge/deluge-2.0.3.ebuild +++ b/net-p2p/deluge/deluge-2.0.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PYTHON_COMPAT=( python2_7 python3_{5,6} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 systemd @@ -51,7 +51,7 @@ RDEPEND="dev-python/chardet[${PYTHON_USEDEP}] libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] - webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )" + dev-python/mako[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}/${PN}-2.0.3-setup.py.patch" @@ -99,7 +99,7 @@ python_install_all() { if use webinterface; then newinitd "${FILESDIR}/deluge-web.init" deluge-web newconfd "${FILESDIR}/deluge-web.conf" deluge-web - systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service + 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 diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index f347e4c3ee39..9d936b780a05 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PYTHON_COMPAT=( python2_7 python3_{5,6} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 systemd @@ -51,7 +51,7 @@ RDEPEND="dev-python/chardet[${PYTHON_USEDEP}] libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] - webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )" + dev-python/mako[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}/${PN}-2.0.3-setup.py.patch" @@ -99,7 +99,7 @@ python_install_all() { if use webinterface; then newinitd "${FILESDIR}/deluge-web.init" deluge-web newconfd "${FILESDIR}/deluge-web.conf" deluge-web - systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service + 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 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 fda64aa2b393..000000000000 --- 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() diff --git a/net-p2p/deluge/files/deluge-web.service-3 b/net-p2p/deluge/files/deluge-web.service-3 new file mode 100644 index 000000000000..5e0049e7ac23 --- /dev/null +++ b/net-p2p/deluge/files/deluge-web.service-3 @@ -0,0 +1,10 @@ +[Unit] +Description=Deluge WebUI +Documentation=man:deluge-web +After=deluged.service + +[Service] +ExecStart=/usr/bin/deluge-web -d -c ${DELUGED_HOME} ${DELUGED_OPTS} + +[Install] +WantedBy=multi-user.target |