gentoo resync : 25.11.2020

5 files changed, 9 insertions, 101 deletions

diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index d12dcc6f50c4..4e51dd5e3dfb 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,9 +1,8 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
-AUX feedparser-6.0.0_beta1-py39.patch 2768 BLAKE2B 26966964d788891224adf67f0afe6ee20a233d2eb46c5215d643085edd8d8f15b7cff7d6a353029d1dc1e435dbc5cf7c690f157ae5d2069bf8684cd10b470365 SHA512 25f371a75e1b5b1688dccd1fc55be8a011018a4555727f87725238c28ca2ae2b0da491f45b9b48ef49ab4af19f373eed54ac2acf2e5a382dcebc91c1c60ae921
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
-DIST feedparser-6.0.0b1.tar.gz 250065 BLAKE2B 54e955f011af0755e0f627caa1491be15a073984d5c7c2b4edd6e9dcd6054e19b5c77cea9741d0bf7af151f9c79b22739c12db94619373f195e024df65b1cff1 SHA512 580e02bd77dcba547eb8295f958c6d30e55c62bd7fdbe25eda7687d0654b9342edf82ab637902175fc90b86a8ae9cbae8ba2c7c9a83009d25ab5c007c37cf02d
 DIST feedparser-6.0.1.tar.gz 251457 BLAKE2B e159ecae5cfdb6828a17bd26494218db78bcb2542b75161878ce9eb8f126ba0285772a4c99584654de53e297fcb308ed50baaf9f208459237a0447721e32f1f3 SHA512 562748e079b44bd249406cf15d88bd4bb338a1e5a9a9b2c606514b054edf6cdd78d66f1cf6f00320c24a9d8519069e44b730a86f92e47775614bee680b9d8b7b
+DIST feedparser-6.0.2.tar.gz 251508 BLAKE2B e571bbd1a26ff06536ce3a134a5f91ff2cfc65ef7074ba7d1e17f4ed57ba19f8db395991b0a8137f9a7db931d4bda2a8a9157588ea5764ffde3bfd0616c71a35 SHA512 8ffcfb2934070ed6f0fc1a3b3d7c6a055c8c8e29dee8d56fa489832b71b94bc70dd8c8360061a103894ea9a80c6a91a6708da16999e36619092674ccfda36a75
 EBUILD feedparser-5.2.1.ebuild 1194 BLAKE2B 8fa165bdf23171244f6d0fb6fdf2cb296c06515296150cee3a871ad09c9825a476802d176935f7eb459d130f7c0c43a4a4774ac8d913004bc63c960db25dbb6b SHA512 90b24aa7ffd61794fa22a9d530f7ade3aec69cc8f330a9f1979f6ff302aa2a6c94b5897e0e05ae7671b86dbceea9b63f540e221bc3d739d366192ae45dee77a4
-EBUILD feedparser-6.0.0_beta1.ebuild 936 BLAKE2B 0bc4136cb3e1f096af1073603f56a289825d42bf139d9d5a3e5d54ee19cfcd6e732eacf1413428f3450ee1f54a95702ee6aed1d4683a12c9af6973b06144808f SHA512 43adcf9e51db7087457502e22a44f76f61b9f4d61d818139f1b496befbc2a3beb5f8c28843b0cbe3dd3aa1ef9427f4043f90c73918d3163d6813ed232deac929
-EBUILD feedparser-6.0.1.ebuild 901 BLAKE2B 95134ee9e0b2236e7b4c9201a19c54ef615564edf6b54c3ad6cd477238faef0048354e53e04caa1f6e0269208f12cf3da82b332fde82e7082584f1062dbf09f4 SHA512 c318d48ac3681642c1b421fb811dd1e4a777fa3fa962562c3974c589d431a44a0fc7f191bf27c8aab685f97a76b54602e0ae36433869f5aaf5c62a722fd9e93d
-MISC metadata.xml 442 BLAKE2B a561722b8e5ad877d3a1b0503f159b7933a2bb45673420b20f840dd876881a0fd8fc3eedb3b0c3aecb76b044c770ef42cdbcf3f210e71e400dfb002eb4742251 SHA512 20cef7a9f4d1bb89e11748a8b5ab31136b85f68d15ecec018f1f0872b721a2d53f3aa3ab06a1b97e3f79588656e327feb87f90a0e75f4adc5e879c9f0fd36017
+EBUILD feedparser-6.0.1.ebuild 893 BLAKE2B 21b4df6b21a24d54ae9c6392cdec404fb664dee11f365871670c78f066e82ca82a8f11462d4de3e9a92df31427887ebe19753696ee3ca561781c0ef78f3be721 SHA512 1dfec37a2a8be9a53f9abb94f8e80457f265371f4267449e724a6637e82b896e3319a1f905f8e94a1b7a35338b00abb29091c38f37532ee64b1551bfd3b0dd7e
+EBUILD feedparser-6.0.2.ebuild 901 BLAKE2B 95134ee9e0b2236e7b4c9201a19c54ef615564edf6b54c3ad6cd477238faef0048354e53e04caa1f6e0269208f12cf3da82b332fde82e7082584f1062dbf09f4 SHA512 c318d48ac3681642c1b421fb811dd1e4a777fa3fa962562c3974c589d431a44a0fc7f191bf27c8aab685f97a76b54602e0ae36433869f5aaf5c62a722fd9e93d
+MISC metadata.xml 467 BLAKE2B 99c83112b5515f5fd591bedf71882a7445b064cd44dc1e8f6fb2654d31582ad310cf796e36cdb8e093ea80a8546dc34fe263ae1a77e34f56db968f174c1e3e6d SHA512 80c5b4647324ece6c83e748e8eb41002403308f75397f643a95c8c9f7682074a66256d0bae04c6a4040ce6d0c3bec564d2496aec15647bf5447b49c8917f2db0
diff --git a/dev-python/feedparser/feedparser-6.0.1.ebuild b/dev-python/feedparser/feedparser-6.0.1.ebuild
index dc1e470b0678..fc81a0fea88e 100644
--- a/dev-python/feedparser/feedparser-6.0.1.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild b/dev-python/feedparser/feedparser-6.0.2.ebuild
index eff7e7b9f375..dc1e470b0678 100644
--- a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.2.ebuild
@@ -10,7 +10,8 @@ inherit distutils-r1
 MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}
 DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
+HOMEPAGE="https://github.com/kurtmckee/feedparser
+	https://pypi.org/project/feedparser/"
 SRC_URI="
 	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
 		-> ${MY_P}.tar.gz"
@@ -18,16 +19,12 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
 
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
 src_prepare() {
 	# broken
 	rm \
diff --git a/dev-python/feedparser/files/feedparser-6.0.0_beta1-py39.patch b/dev-python/feedparser/files/feedparser-6.0.0_beta1-py39.patch
deleted file mode 100644
index f9315e47809c..000000000000
--- a/dev-python/feedparser/files/feedparser-6.0.0_beta1-py39.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From fa587d171aed1b44ee06af271d718ab6fa73b77a Mon Sep 17 00:00:00 2001
-From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Wed, 26 Feb 2020 22:06:39 +0530
-Subject: [PATCH 1/2] Use encodebytes instead of encodestring in Python 3.9.
-
----
- feedparser/http.py  | 5 ++++-
- feedparser/mixin.py | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/feedparser/http.py b/feedparser/http.py
-index 272faad6..53511f02 100644
---- a/feedparser/http.py
-+++ b/feedparser/http.py
-@@ -73,7 +73,10 @@ class request(object):
- 
- # Python 3.1 deprecated decodestring in favor of decodebytes.
- # This can be removed after Python 2.7 support is dropped.
--_base64decode = getattr(base64, 'decodebytes', base64.decodestring)
-+try:
-+    _base64decode = base64.decodebytes
-+except AttributeError:
-+    _base64decode = base64.decodestring
- 
- try:
-     basestring
-diff --git a/feedparser/mixin.py b/feedparser/mixin.py
-index 1b0dc1ae..549931f5 100644
---- a/feedparser/mixin.py
-+++ b/feedparser/mixin.py
-@@ -50,7 +50,10 @@
- 
- # Python 2.7 only offers "decodestring()".
- # This name substitution can be removed when Python 2.7 support is dropped.
--_base64decode = getattr(base64, 'decodebytes', base64.decodestring)
-+try:
-+    _base64decode = base64.decodebytes
-+except AttributeError:
-+    _base64decode = base64.decodestring
- 
- 
- bytes_ = type(b'')
-
-From 7798957b66c9cee00db9a18f84c518cacf8f14aa Mon Sep 17 00:00:00 2001
-From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Sun, 17 May 2020 14:25:17 +0000
-Subject: [PATCH 2/2] Use base64.decodebytes only in Python 3
-
----
- feedparser/http.py  | 7 +------
- feedparser/mixin.py | 7 +------
- 2 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/feedparser/http.py b/feedparser/http.py
-index 53511f02..1119cb3b 100644
---- a/feedparser/http.py
-+++ b/feedparser/http.py
-@@ -71,12 +71,7 @@ class request(object):
- from .datetimes import _parse_date
- from .urls import convert_to_idn
- 
--# Python 3.1 deprecated decodestring in favor of decodebytes.
--# This can be removed after Python 2.7 support is dropped.
--try:
--    _base64decode = base64.decodebytes
--except AttributeError:
--    _base64decode = base64.decodestring
-+_base64decode = base64.decodebytes
- 
- try:
-     basestring
-diff --git a/feedparser/mixin.py b/feedparser/mixin.py
-index 549931f5..119fa4ca 100644
---- a/feedparser/mixin.py
-+++ b/feedparser/mixin.py
-@@ -48,12 +48,7 @@
- from .urls import _urljoin, make_safe_absolute_uri, resolve_relative_uris
- 
- 
--# Python 2.7 only offers "decodestring()".
--# This name substitution can be removed when Python 2.7 support is dropped.
--try:
--    _base64decode = base64.decodebytes
--except AttributeError:
--    _base64decode = base64.decodestring
-+_base64decode = base64.decodebytes
- 
- 
- bytes_ = type(b'')
diff --git a/dev-python/feedparser/metadata.xml b/dev-python/feedparser/metadata.xml
index 723c95fec111..dfe7003bfe13 100644
--- a/dev-python/feedparser/metadata.xml
+++ b/dev-python/feedparser/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="google-code">feedparser</remote-id>
     <remote-id type="github">kurtmckee/feedparser</remote-id>