gentoo resync : 17.10.2017

3 files changed, 178 insertions, 0 deletions

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index c6795a6d8b04..9f93fde7d73e 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,4 +1,5 @@
 AUX deluge-1.3.12-fix_scheduler_plugin.patch 1050 SHA256 9b0e4640a3537cb3b1805d4fca9d70539b341a2df0c3d4078194e0f4fdad037a SHA512 0613de93b5f61e523dfd8b8d5ec145a64b69ae96fde8236d9da9c7e4a54af681490879157f0a8a5537c27e93feb5b1db6651d61a9655e58763c1676e1843e087 WHIRLPOOL d26748a8c38ae912c736bf6db6ab9806c040d8d5b1c748f44c4619d5c7c74c826b682de7bd67cbcb1377b861e3ac93273f1568b80a875009f6b30f26d9147095
+AUX deluge-1.3.15-r1-fix-preferences-ui.patch 1209 SHA256 b4c397cc4ffede983554331c2b31e40feadda3a03e2ee377c3892c88b096b564 SHA512 9d32dad457ce5fe5752fa3f4dd42492443ffbeb0508347d21197b4ee950674dbf209d4faf6a730c37eecfa8a5233606fbef9ede5c4a2da5ee60d047ec7569b98 WHIRLPOOL b7b0fc8e2b7525b4fa02d356d4f9325da6082f6050a9ad1f65aaffa657e9c025bc1823045fdae8d13e1dfe1c3a6f1db6858f0673c829e10a9d78f92c6b164aec
 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 1484 SHA256 19adb9e46cf2d0a3f76ae12e2c6058cd6b80620d5fd5d2b02abecf54e5e3f726 SHA512 8afb1318e4cf267013a3704f71c83942c4c862eeb6d91ea15f4a2a8bb5f1bed7461453bf2877fe0afc4c3f560dad3629ade538324a75a9b6ce4982f5121a74ef WHIRLPOOL 1fef5a3f3b51f148bb3dbd7cd58129c722cc034f91b7f4d54814b6ac439f65f6a180817d9ac0016921ae4d68281ca6b6000f08e47c99b338db58b653c5ca5852
@@ -13,6 +14,7 @@ AUX deluged.service 277 SHA256 6347ec82b7a28daabe441e3436fdc725e96dae2249ccf8fb2
 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-r1.ebuild 4931 SHA256 7ccfa7993af82837fa57e39998850f7e66f58aeb8d0a098fd6b59dcdef93ca78 SHA512 e20014ecb103fd7a70bbaa47e7976b5b7074c58fb300abe75359a3c19bcc89fd6fd27a7857cd7fe4ecf48b9c9c0aec510f025220f4cb4c69144cd2b6a9e68cc1 WHIRLPOOL e0aa362401e4b3d8d355758472a8be4bcb8cb7bdd2ea0e8e355c5f6777495bc9fe8d1be760ba1d774f60eee138d3aa1de9a30efb862adb06515d2957e08bb8fd
 EBUILD deluge-1.3.15.ebuild 4871 SHA256 6a9772e2fa7d14f56fac837b3ad5561249376aed78c4acd98996bf7a4c469ab6 SHA512 7b6969f6d49b10a20c4278cab6a660f4fbc582c05c1d97d480434cb19598f1c68227236531a5f7e119cec9d0f40871f2e2ea7e3a6422d9765c6efc4aa2839ea5 WHIRLPOOL 88198b6cf1bc76b01508276b653a41fb677b59e55804a2e0f63f65d78063a8a32b702ed5fcfb0390cad645d73c6c93006fe5614fa9f0c18e6399baa5b27f0a84
 EBUILD deluge-1.3.9999.ebuild 4839 SHA256 6ae00d8ad91cf40f6b9c4ef8aede85a83444c253f6e7f3984982ecea1f0a092e SHA512 5dda54ad2be3d49147634d28e194961be91785b7462474290150650d1926d82c556e5851cc0f8e1127b5ba837ba131fc669e9f72cc6d53b800f5c35ef1459f1c WHIRLPOOL d288a352247e418e46ab20fc57594124f2948f3d76ecb67682dc10554138cfa1409b4dcac27b9cc0f89b0b7e2bbac77e54124edc6c2166e9333057f99f5e8b10
 EBUILD deluge-9999.ebuild 4798 SHA256 03259e6314d73bcd50a7b622b163007d9a257dbc7f07c484b15b8634f9bd6ff2 SHA512 6aa67f4d3c4d647e8dfb1593341b9168d1368da25c28790a446b1b5b4860a0b62830d9049c06151db0b656c790e4c0481d6b553a6e0eecf00ad7c7728c876c52 WHIRLPOOL 7b5db71160e796ff911faa3756a06aff4910ccadbbc69fda72e2d949f153ce5862abcb5d82013d585c8cceeb43a51e9b636c8a3bed4883c77231e0e2a0f66d9b
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 000000000000..e76bbab14851
--- /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} == 9999 ]]; 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="<net-libs/libtorrent-rasterbar-1.1[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-libs/geoip )
+	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
+		systemd_newunit "${FILESDIR}/deluge-web.service-2" 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
+	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
+}
+
+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"
+	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"
+	elog
+	elog "For more information look at 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 000000000000..a63e5de10de1
--- /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
+