gentoo resync : 25.08.2020

3 files changed, 42 insertions, 3 deletions

diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 25ea3bc6d548..a410e6c78398 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,3 +1,4 @@
+AUX pypng-0.0.20-py39.patch 1171 BLAKE2B e84a74ab9a783bca54d198a3d1ac9eda54e2c1229969c4a6d4b19ace752a50f9aa2b09d59ad15048db08a894290788978d6022fcb890f15ba6fea0e0bac6cea5 SHA512 c3a162e77a0d3ff9b153ba26379fffacf0e1683c5e4230af1c8a1c5392889e68d74334661cb19b6076fb7cf3ce48b1d1f1339d02b7167bff42bba44097d2155e
 DIST pypng-0.0.20.tar.gz 649538 BLAKE2B 9a15923c7f4d06deb982dc0b70d7502d3a5189f06cd6cdd0b35e81fcba6ea6b8ef50a6ab1ea03d8ac69a5e4d712eb23d7e18a3f1641c5a51f6f4d287d2fb5e43 SHA512 4f84e9b9cc68c0ad7e4558f0f46c54b0f091561f1a3679ac0679d8a1f1ab9a06493d71bf9df4db5deb6bedbdfa53bb1775ee51204133309eba962077102fdcdd
-EBUILD pypng-0.0.20.ebuild 520 BLAKE2B 0cd2ca27817f973f2540843063556aa040d51671752f3d901582d4ce957fb92b4fae032ab009299898dc0ed87bc3f10a3486fdf83005886c5ee7f33cf5b9bc62 SHA512 b172eb0d257baaa478908436887e9bf2420de5c0a67e050ffb929e273b35d0ccedcbf92af3b32f54bd0b642634b75333fd30f1d6b4896c9573a2f8fa54b07d8b
+EBUILD pypng-0.0.20.ebuild 562 BLAKE2B 8f0ee6c3e447cc0a3f232ae49491ab2fd6e51f23eff3d9835ee6043c47385a097f4e1f324311af676320029e35a9e48ef1dd127b68aab255554a7d31a3ce1246 SHA512 7d9cbff5314f75d39790e115a86760abb46ec6a1bac4710b6cdd709ea171c5d1a1f89876b51c5122d0ea0d42c75b873f6f6d68604171fbb8c539873f8d53ac39
 MISC metadata.xml 450 BLAKE2B 55c7ff0eef56a99bcb89587d9b3eb025d10855ed7015fb178d11e01e23d285e8f26c813db383e5022505f53761f4382c7631d8e7c9174486c00dd9ee2ba8c457 SHA512 3644b23663aa1d89f579ea60463044c901f60e25fe6ad42c5f144d15d559491858f0ef844209cf15bc890eb8cdca6342ea9d070f12776dce21ce30c76dc532d2
diff --git a/dev-python/pypng/files/pypng-0.0.20-py39.patch b/dev-python/pypng/files/pypng-0.0.20-py39.patch
new file mode 100644
index 000000000000..e4c738ee3137
--- /dev/null
+++ b/dev-python/pypng/files/pypng-0.0.20-py39.patch
@@ -0,0 +1,34 @@
+From fe9c973c5e92f24746dfa1be8796c14a2befec4f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 15 Jul 2020 07:54:53 +0200
+Subject: [PATCH] test_png: Use array.tobytes to fix py3.9 compatibility
+
+The deprecated array.tostring() method has been removed in Python 3.9.
+Use .tobytes() instead.
+---
+ code/test_png.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/code/test_png.py b/code/test_png.py
+index c858d18..447c314 100644
+--- a/code/test_png.py
++++ b/code/test_png.py
+@@ -448,13 +448,13 @@ class Test(unittest.TestCase):
+     def test_interlaced_array(self):
+         """Reading an interlaced PNG yields each row as an array."""
+         r = png.Reader(bytes=pngsuite.basi0g08)
+-        list(r.read()[2])[0].tostring
++        list(r.read()[2])[0].tobytes
+ 
+     def test_trns_array(self):
+         """A type 2 PNG with tRNS chunk yields each row
+         as an array (using asDirect)."""
+         r = png.Reader(bytes=pngsuite.tbrn2c08)
+-        list(r.asDirect()[2])[0].tostring
++        list(r.asDirect()[2])[0].tobytes
+ 
+     def test_flat(self):
+         """Test read_flat."""
+-- 
+2.27.0
+
diff --git a/dev-python/pypng/pypng-0.0.20.ebuild b/dev-python/pypng/pypng-0.0.20.ebuild
index 9bb9cf785ed9..9592e0db7268 100644
--- a/dev-python/pypng/pypng-0.0.20.ebuild
+++ b/dev-python/pypng/pypng-0.0.20.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,7 +14,11 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
 
 python_test() {
 	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"