[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/, net-p2p/deluge/

["Craig Andrews" <candrews@gentoo.org>]

commit:     ea7a178756c5cee2e4659280423c208e67972271
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 01:10:19 2021 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 01:10:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7a1787

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 <candrews <AT> gentoo.org>

 .../deluge/{deluge-9999.ebuild => deluge-2.0.3-r9.ebuild}   |  8 ++++----
 net-p2p/deluge/deluge-9999.ebuild                           |  4 +++-
 net-p2p/deluge/files/deluge-2.0.3-log.patch                 | 13 +++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r9.ebuild
similarity index 96%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.0.3-r9.ebuild
index 0fe6fe0a53f..6878f1f82c5 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r9.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
-inherit xdg distutils-r1 systemd
+inherit distutils-r1 systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -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() {
@@ -121,8 +123,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	xdg_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"

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 0fe6fe0a53f..0d7b3a317c0 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 00000000000..45dd9896a91
--- /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)'