[patch] deluge.patch

deluge.patch (text/plain), 5.97 KB, created by . on 2016-03-19 20:44:03 UTC

diff --git a/gentoo/master:./deluge-1.3.12-r3.ebuild..master:./deluge-1.3.12-r4.ebuild b/master:./deluge-1.3.12-r4.ebuild
index cd671e1..d1a5ca4 100644
--- a/gentoo/master:./deluge-1.3.12-r3.ebuild..master:./deluge-1.3.12-r4.ebuild
+++ b/master:./deluge-1.3.12-r4.ebuild
@@ -2,40 +2,43 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
+
 inherit distutils-r1 eutils systemd user
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-fi
-
 LICENSE="GPL-2"
+SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~arm"
 SLOT="0"
-IUSE="geoip gtk libnotify setproctitle sound webinterface"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
+IUSE="console +daemon geoip +gtk +libnotify +setproctitle +sound webui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	sound? ( gtk ) libnotify? ( gtk )
+	|| ( console daemon gtk webui )"
+LANGS=(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 ja ka kk km kn ko ku ky la lb lt lv mk ml ms nb nds nl nn oc pl
+	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)
+for l in "${LANGS[@]}" ; do
+	IUSE+=" linguas_${l}"
+done
+
+CDEPEND="daemon? ( >=net-libs/libtorrent-rasterbar-0.14.9[python] )"
+DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-util/intltool"
-RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
+RDEPEND="${CDEPEND}
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	>=dev-python/twisted-core-8.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-web-8.1[${PYTHON_USEDEP}]
+
 	geoip? ( dev-libs/geoip )
 	gtk? (
 		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
@@ -45,12 +48,26 @@ RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
 		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
 	)
 	setproctitle? ( dev-python/setproctitle[${PYTHON_USEDEP}] )
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+	webui? ( dev-python/mako[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
+	eapply "${FILESDIR}/revert-erroneous-commit.patch"
+
+	local args=(
+		-e 's|build_libtorrent = True|build_libtorrent = False|'
+		-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
+
+	for l in "${LANGS[@]}" ;do
+		has ${l} ${LINGUAS} || rm -vf deluge/i18n/${l}.po
+	done
 
 	distutils-r1_python_prepare_all
 }
@@ -58,40 +75,40 @@ python_prepare_all() {
 _distutils-r1_create_setup_cfg() {
 	# 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.
+	# This does not respect the distutils-r1 API. DO NOT copy this example.
 	:
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	newinitd "${FILESDIR}"/deluge-web.init deluge-web
-	newconfd "${FILESDIR}"/deluge-web.conf deluge-web
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_newunit "${FILESDIR}"/deluge-web.service-2 deluge-web.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-	systemd_install_serviced "${FILESDIR}"/deluge-web.service.conf
-}
 
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If after upgrading it 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
+	if use daemon ;then
+		newinitd "${FILESDIR}"/deluged.init deluged
+		newconfd "${FILESDIR}"/deluged.conf deluged
+		systemd_newunit "${FILESDIR}"/deluged.service deluged.service
+		systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+	else
+		rm -rvf "${D}"/usr/bin/deluged "${D}"/usr/share/man/man1/deluged.*
+	fi
+
+	if use webui ;then
+		newinitd "${FILESDIR}"/deluge-web.init deluge-web
+		newconfd "${FILESDIR}"/deluge-web.conf deluge-web
+		systemd_newunit "${FILESDIR}"/deluge-web.service deluge-web.service
+		systemd_install_serviced "${FILESDIR}"/deluge-web.service.conf
+	else
+		rm -rvf "${D}"/usr/bin/deluge-web "${D}"/usr/lib*/python*/*-packages/deluge/ui/web/ \
+			"${D}"/usr/share/man/man1/deluge-web.*
+	fi
+
+	if ! use gtk ;then
+		rm -rvf "${D}"/usr/bin/deluge-gtk "${D}"/usr/lib*/python*/*-packages/deluge/ui/gtkui/ \
+			"${D}"/usr/share/applications/deluge-gtk.desktop "${D}"/usr/share/icons/deluge* \
+			"${D}"/usr/share/man/man1/deluge-gtk.*
+	fi
+
+	if ! use console ;then
+		rm -rvf "${D}"/usr/bin/deluge-console "${D}"/usr/lib*/python*/*-packages/deluge/ui/console/* \
+			"${D}"/usr/share/man/man1/deluge-console.*
+	fi
 }