Add net-p2p/deluge-1.3.15-r2

3 files changed, 195 insertions, 11 deletions

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 8335e010..5892b7aa 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,11 +1,13 @@
-AUX deluge-1.3.5-disable_libtorrent_internal_copy.patch 1165 SHA256 873b599723f2ec87df386badaaf1fa79686c32a50beaab0924bf40c0f2bb9fa1 SHA512 8f08d5b9cfcff3fda8153d4bdfc8435a3b63fefc51b6cd3c648a82134377dc561e68df3c9aba4a37cffeff7b789d352a438b75ec6bdaf58f87ab5326f641b316 WHIRLPOOL b9742b0e1fe666055c2e7cc141e4437143a534229a5661d6e3ec139971289b291fff736629ffc66034d2430971e9119d1cc6bd85e68f5be07b8bb5f9e2a19a3c
-AUX deluge-web.conf 210 SHA256 58c2b8c916a689b5f11a569450935cb5844c2eed9824625a46c7a608eb6d8e52 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999 WHIRLPOOL 4b15a1c5987454a894ed2f3ba3bb34910f649e663feee5a5c4695dc74b1c305a1afee18a086fb562fe289e450382d77c177238a072500a543cf27281f1ab1b82
-AUX deluge-web.init 1492 SHA256 7a41476a23c72bbf90fced8ffb4b76a0b8d164f428c37ea7bb68cfc4bd36c76e SHA512 8d35abff60f7b33d19f3b1d7538250313ee58b75b6290d13a2d38a4d33f88e4351917abaa16e890aa4dd7dfaa7c9c1d92387a3a7ab5f28248e64ef817e4082a5 WHIRLPOOL ec926a0a6c40712383ecea6a81d860661e27c60e19331cf3820706b247a7af0b0466244261afbc8452e93ef72c1b9f6137b874cbe04b222587f1e03df64b6933
-AUX deluge-web.service-2 198 SHA256 b9b79371a72226b6a76c2d9b61dc21d339d4574a9be68e3fc9defab530ca61af SHA512 51d761c76d213285bef2cd4cc80c7135838f0fb955a7584ca15194080d50aa63e81642d566b901af8970ed01ae9952482226a41627f1e198fd6587c197737889 WHIRLPOOL 6a382545f1d7c4087016d162417717aefd70034ef02c5e4ad5bf31f3ff94b5f482199851f39f817552ed979256fcb05fb9b59cd82200721c6347c99e7dc7e146
-AUX deluge-web.service.conf 100 SHA256 0dd1c923daf1d58721986670ddfe57e26e81d63fe33f516ff32f73d3d7330206 SHA512 aaf493b3f614558c762ffea3219eda7045e739eeeb826a19df456ef9a94a0894302695bd96490eb4fb44e16039126170ec31ba6e0a0a2f6ae69669e2b9f4cda9 WHIRLPOOL dc81c7cf547a1912fe28de1a3cc9644ec2b8c918f19acdf7f105471925604de37427629b7b7f962d6b017a2736bc406497e0238b4edd22e4aed7cd172a7e7800
-AUX deluged.conf-2 228 SHA256 e0d29488ff0a9b8404572b5d67a3ef56a6fc914a6b17b56b346bfe74d1249adf SHA512 3005478b48c6c4c67f0eb8d9ee44ea1310ccd209fe6364f7bbc37ec296111e50462296d678cd4098bb63472ade190fdaf38ded39c3e8a73cbb4cede4860978c1 WHIRLPOOL 94fd6bd28ced381dbc3f4f6f9df04facc8bca63b17eb829dbd7d874624c893ffe360c217b56a03cde9b219f651b1f18014cc4ede27ea172adc143944c440d4ac
-AUX deluged.init-2 1511 SHA256 f7cfc0b637cea4625da56c347b3c14d5b51f1969ca9235d7b2ae46c0795b111f SHA512 77a3a18facbd026f9245aa80818299608a3f6fc0f7bd2e34b1707894ae1a3c7a71999410cfda70d689408f7031815aa0677fa37824faf344086141c89f8ccf5c WHIRLPOOL 5e8444594aa0399dec23417d1fa6902faf05a377084d8ac72e8d792c0b129de18d518387fa2e646160c2d328d7f255c1e8e04e1fbb321790279958796bf740a9
-AUX deluged.service-2 243 SHA256 b1246ead13fee7a2ff3e94a47f6535a665282e407deb5186383b456cd4ffec5e SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c WHIRLPOOL 054dff55cdfcbf3f66e49b3f8676fc0561cc079c6a428e4184804f4eada703af470febf9ae18ebb9c9d462e87a1aaa73194712cc74d34b9c3573f256633436c8
-AUX deluged.service.conf 114 SHA256 b57941f17dd8be788ed24e75a9b46548ef3e1cd6bf7ad1b68e7c7d7a38ef522d SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a WHIRLPOOL fa19e0f20aefb6ba68da996491766539bd340f81f6c5398251f5e175485c0cbf091edd81b5e119653fe068c6742c5664ba8d672dafab8e119384f85e60559410
-DIST deluge-1.3.15.tar.bz2 1775913 SHA256 dcf823131be56c2180814e8def11496aaaf700710b5694867ba9f057615ac790 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda WHIRLPOOL 93f3b2c86b983ecea7b001f0b58bd6e904ecc4c11c718286885d82b09f0068c4bf347b03be12edfe77677604d3af3ca9a68e8a2a08d696ff16f5385eb43c464f
-EBUILD deluge-1.3.15.ebuild 4974 SHA256 3fd595b3f3832d1ef57d9719a8f1ba5ee014cf2eb9cd26d974e1a3ed6acf7a2a SHA512 a9f8ead8f6463629212d04d26bcba2714124f2ec35733515a5ed5fbb82a90cdbef708968c51f2ced80654da56370db5408499b8f6d579ad814b283404f397501 WHIRLPOOL 531d773ad1cd3e0c723c4b9869d07f404bd2d6ee9f49ccedae7da7941508015361214071f7b3cb4b4b6f8cc9debc2fb52af49d5916333b9832912067c7341491
+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-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999
+AUX deluge-web.init 1492 BLAKE2B 578e3c7670e3cc7fa4dae84b3a09213cefc95ff44748dbed2369959f7e5ea3b42876b2edf82584db1fe442391540c90577d47f884fa65a68614c24dde93f4c14 SHA512 8d35abff60f7b33d19f3b1d7538250313ee58b75b6290d13a2d38a4d33f88e4351917abaa16e890aa4dd7dfaa7c9c1d92387a3a7ab5f28248e64ef817e4082a5
+AUX deluge-web.service-2 198 BLAKE2B 00195276c90653b406fcd9d7d75cb6a69fff6929644372905de42e5a62ad1129e954adbe54415a3be612f705cb773f40570d49c7720b40b6caffacc7fce4518f SHA512 51d761c76d213285bef2cd4cc80c7135838f0fb955a7584ca15194080d50aa63e81642d566b901af8970ed01ae9952482226a41627f1e198fd6587c197737889
+AUX deluge-web.service.conf 100 BLAKE2B 2ed6ce80fb88d19f50911940ca5092617b55670228354cb5c7c38b7fb23801e3880ecea4d2326bb2ce1b496ba484242ed109ef6149b712f3fe6cd4b356eccdf5 SHA512 aaf493b3f614558c762ffea3219eda7045e739eeeb826a19df456ef9a94a0894302695bd96490eb4fb44e16039126170ec31ba6e0a0a2f6ae69669e2b9f4cda9
+AUX deluged.conf-2 228 BLAKE2B e498f2d8b232ce40fee847079608750a58e15bb88e5918cf9325a44258a1ae73d114db8d6ff80bcf093a956ed33d592bf76748015a14803c3a380c415a805a0e SHA512 3005478b48c6c4c67f0eb8d9ee44ea1310ccd209fe6364f7bbc37ec296111e50462296d678cd4098bb63472ade190fdaf38ded39c3e8a73cbb4cede4860978c1
+AUX deluged.init-2 1511 BLAKE2B 2d07d1a76879bc9b78a9e804e8287c7c944cd315fd406288185e0a62af86104b33b8582e0a7963e745d3728ff51b08d83b952c2cc475d28ea496cec59d10053e SHA512 77a3a18facbd026f9245aa80818299608a3f6fc0f7bd2e34b1707894ae1a3c7a71999410cfda70d689408f7031815aa0677fa37824faf344086141c89f8ccf5c
+AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7385d8c7350ea3a23aa16d4761c598ff2208a2eeb997c3ded11f79637aefb4268fdfc74e7eaedd5fb5f SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c
+AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
+DIST deluge-1.3.15.tar.bz2 1775913 BLAKE2B 9d5224766051d52b6e075dcafab5716793081c78ba69da616fc98f2c463ddc7676b2c2ce8f54b81e1480cf4344582245733033cf5927a9692bc43ec0a23f0001 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda
+EBUILD deluge-1.3.15-r2.ebuild 5057 BLAKE2B a8da47076b38c1b794006f658850ecccd3b18f05379812ec275da5579661e579d6ea74112ce59be87a6c71d76e5d0914c7aba3f5115be79bf99887a80cbb523c SHA512 a69c859ec67685993542c8bb308b5d7e7d9ef95926dfe5f1215d84296d8e19e7707a235cb22025d3de8ed854cee7f84c0e2a0a46ac627cd8197166e32b1c9192
+EBUILD deluge-1.3.15.ebuild 4974 BLAKE2B eb57aeb5af2f646120623298438cd54e834577c4351d3e47c4817ffdb9c1c306aa1b84ba9cf546ab25b74b4b014bae3bc45159eb7b9e808b95722dce55186f9d SHA512 a9f8ead8f6463629212d04d26bcba2714124f2ec35733515a5ed5fbb82a90cdbef708968c51f2ced80654da56370db5408499b8f6d579ad814b283404f397501
diff --git a/net-p2p/deluge/deluge-1.3.15-r2.ebuild b/net-p2p/deluge/deluge-1.3.15-r2.ebuild
new file mode 100644
index 00000000..0c1ef205
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15-r2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 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} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+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 systemd 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="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		(
+		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-web-13.0[${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}]
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	)
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+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
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	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 -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
+	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
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
+			systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+		fi
+	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
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	if use systemd; then
+		systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+		systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+	fi
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	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 "You can still use deluge the old way"
+	if use systemd; then
+		elog
+		elog "Systemd unit files for deluged and deluge-web no longer source"
+		elog "/etc/conf.d/deluge* files. Environment variable customization now"
+		elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+		elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	fi
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
+# vi: set diffopt=iwhite,filler:
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 00000000..a63e5de1
--- /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 <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
+