From ea7a178756c5cee2e4659280423c208e67972271 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 13 Aug 2021 21:10:19 -0400 Subject: 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 --- net-p2p/deluge/deluge-2.0.3-r9.ebuild | 143 ++++++++++++++++++++++++++++ net-p2p/deluge/deluge-9999.ebuild | 4 +- net-p2p/deluge/files/deluge-2.0.3-log.patch | 13 +++ 3 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 net-p2p/deluge/deluge-2.0.3-r9.ebuild create mode 100644 net-p2p/deluge/files/deluge-2.0.3-log.patch (limited to 'net-p2p/deluge') diff --git a/net-p2p/deluge/deluge-2.0.3-r9.ebuild b/net-p2p/deluge/deluge-2.0.3-r9.ebuild new file mode 100644 index 000000000000..6878f1f82c5f --- /dev/null +++ b/net-p2p/deluge/deluge-2.0.3-r9.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8,9} ) +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 systemd + +DESCRIPTION="BitTorrent client with a client/server model" +HOMEPAGE="https://deluge-torrent.org/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + 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 ~ppc ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="console geoip gtk libnotify sound webinterface" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + libnotify? ( gtk ) + sound? ( gtk ) +" + +DEPEND=" + $(python_gen_cond_dep ' + net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ') + dev-util/intltool + acct-group/deluge + acct-user/deluge" +RDEPEND=" + $(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[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:3[${PYTHON_USEDEP}] + gnome-base/librsvg + libnotify? ( x11-libs/libnotify ) + ) + net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + ')" + +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() { + 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 "${D}/$(python_get_sitedir)/deluge/ui/console/" || die + rm "${ED}/usr/bin/deluge-console" || die + rm "${ED}/usr/share/man/man1/deluge-console.1" ||die + fi + if ! use gtk ; then + rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die + rm -r "${ED}/usr/share/icons/" || die + rm "${ED}/usr/bin/deluge-gtk" || die + rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die + rm "${ED}/usr/share/applications/deluge.desktop" || die + fi + 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_install_serviced "${FILESDIR}/deluge-web.service.conf" + else + rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die + rm "${ED}/usr/bin/deluge-web" || die + rm "${ED}/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() { + 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 https://dev.deluge-torrent.org/wiki/Faq" + elog +} diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index 0fe6fe0a53f4..0d7b3a317c07 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; 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 000000000000..45dd9896a915 --- /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)' -- cgit v1.2.3-65-gdbad