gentoo resync : 08.10.2021

4 files changed, 2 insertions, 64 deletions

diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 2c0864ab3498..7dea98d9a6ca 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,6 +1,3 @@
-AUX pypng-0.0.20-py39.patch 1171 BLAKE2B e84a74ab9a783bca54d198a3d1ac9eda54e2c1229969c4a6d4b19ace752a50f9aa2b09d59ad15048db08a894290788978d6022fcb890f15ba6fea0e0bac6cea5 SHA512 c3a162e77a0d3ff9b153ba26379fffacf0e1683c5e4230af1c8a1c5392889e68d74334661cb19b6076fb7cf3ce48b1d1f1339d02b7167bff42bba44097d2155e
-DIST pypng-0.0.20.tar.gz 649538 BLAKE2B 9a15923c7f4d06deb982dc0b70d7502d3a5189f06cd6cdd0b35e81fcba6ea6b8ef50a6ab1ea03d8ac69a5e4d712eb23d7e18a3f1641c5a51f6f4d287d2fb5e43 SHA512 4f84e9b9cc68c0ad7e4558f0f46c54b0f091561f1a3679ac0679d8a1f1ab9a06493d71bf9df4db5deb6bedbdfa53bb1775ee51204133309eba962077102fdcdd
 DIST pypng-0.0.21.tar.gz 111899 BLAKE2B b4b8f17b76918f415c02edc09a597af643615f46839fb4464f3116e4cefb0a251227f344ff2c1c51efb87933faf647bfa6a7c4d89bc91c8389a3dc71479e878d SHA512 b8f5f9be05aafe59aeb69462b7ccc9e5c4df8eb157731d888773f0ef223dc1c45db83daa51347b45dc3c59be5141c3fc4e031004ac28927b786d7e254ffff4fa
-EBUILD pypng-0.0.20.ebuild 563 BLAKE2B d93263c9c134d47cd2f079291d443a5210f4e027360fc99bb633156538a793a4ac065132a87beca7962f4328e3b87496f5c111fc3b8dae27abec7135510d8d6a SHA512 75cee33db0a5dcfb6882cf3d1cab3376b8441ce419791cb459fd09f0a6381f270acba15d5bbf749603cfa120e489a86081d11eecc45ac5828c6f6d7a48490012
-EBUILD pypng-0.0.21.ebuild 573 BLAKE2B 1114ae656d7278efe402cad9ad95fbde0ffc3a21459ce3046f8795e187eeba169bbdfd750ee251643f0d5017a7cc041dabea432d9fc87dff8c33be1d31429df9 SHA512 f61b0f3c6e5a469672a4e307a1203e9aacdfcb0890107467138164d7ccd680e59a896825fa98e3433d6e85bd637c9945100fccc2f9b47778e40345412a079778
+EBUILD pypng-0.0.21.ebuild 569 BLAKE2B 3c48903ec49b7c9fc657a9a5e1b4d8eba6a6a2f60f453ea067fe6778bc898148b4ef254df50d81f6bc677138961ddb3e5105fb1ddb469c7743ded2f914b75524 SHA512 cdd61aff4ee27ae0f63e3630829e2c09cc26587b54654d1feb4007c335ea7f8bf8f60bc43d9ece23701542645ac04dec1744a41841688519811a8be39a46b0e2
 MISC metadata.xml 451 BLAKE2B 75c7df259e2f4bfceb7b7abf4302169b5b423d9a9818238b06df0b69270a953ea590f4026774c2fbba4aa24c1e100c3ea40aeeae8a0625390f12c8aab1c173c1 SHA512 b7139dd634bc093222cbd6f7acba8f6ed7856c3b84a101cd3f5703b960d52aa9ef9b388b33cd7b997bf32405fb6bd67771663022da254c7a88fab56d515f4758
diff --git a/dev-python/pypng/files/pypng-0.0.20-py39.patch b/dev-python/pypng/files/pypng-0.0.20-py39.patch
deleted file mode 100644
index e4c738ee3137..000000000000
--- a/dev-python/pypng/files/pypng-0.0.20-py39.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 040f2abb119f..000000000000
--- a/dev-python/pypng/pypng-0.0.20.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python PNG image encoder/decoder"
-HOMEPAGE="https://github.com/drj11/pypng https://pypi.org/project/pypng/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-python_test() {
-	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pypng/pypng-0.0.21.ebuild b/dev-python/pypng/pypng-0.0.21.ebuild
index da8290ca6532..cc3fad22146b 100644
--- a/dev-python/pypng/pypng-0.0.21.ebuild
+++ b/dev-python/pypng/pypng-0.0.21.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/pypng-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 python_test() {
 	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"