[gentoo-commits] repo/gentoo:master commit in: dev-python/dbus-python/, dev-python/dbus-python/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/dbus-python/, dev-python/dbus-python/files/

[Andreas Sturmlechner]

commit:     873161d2dcd610fc67a58d583fad3be3f2700bed
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 17:57:49 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 22:42:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873161d2

dev-python/dbus-python: python3_9

Tests passed.

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/dbus-python/dbus-python-1.2.16.ebuild   |  4 ++-
 .../files/dbus-python-1.2.16-py39.patch            | 33 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/dev-python/dbus-python/dbus-python-1.2.16.ebuild b/dev-python/dbus-python/dbus-python-1.2.16.ebuild
index d7512b4dc8f..e07d2500f71 100644
--- a/dev-python/dbus-python/dbus-python-1.2.16.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit autotools python-r1
@@ -33,6 +33,8 @@ BDEPEND="
 		dev-python/tappy[${PYTHON_USEDEP}] )
 "
 
+PATCHES=( "${FILESDIR}/${P}-py39.patch" )
+
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }

diff --git a/dev-python/dbus-python/files/dbus-python-1.2.16-py39.patch b/dev-python/dbus-python/files/dbus-python-1.2.16-py39.patch
new file mode 100644
index 00000000000..93db26cfcef
--- /dev/null
+++ b/dev-python/dbus-python/files/dbus-python-1.2.16-py39.patch
@@ -0,0 +1,33 @@
+From 6a899a9174c8008ba5fb576238ea4d7c970453c3 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Tue, 14 Jan 2020 15:29:43 +0000
+Subject: [PATCH] service: Adjust to deprecation of collections.Sequence
+
+Since Python 3.3 the recommended location is collections.abc.Sequence,
+and the collections.Sequence alias will be removed in 3.9.
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+---
+ dbus/service.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dbus/service.py b/dbus/service.py
+index fd57054..0c8695a 100644
+--- a/dbus/service.py
++++ b/dbus/service.py
+@@ -32,7 +32,11 @@ import sys
+ import logging
+ import threading
+ import traceback
+-from collections import Sequence
++try:
++    from collections.abc import Sequence
++except ImportError:
++    # Python 2 (and 3.x < 3.3, but we don't support those)
++    from collections import Sequence
+ 
+ import _dbus_bindings
+ from dbus import (
+-- 
+2.26.2
+