gentoo resync : 23.09.2020

3 files changed, 2 insertions, 42 deletions

diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index fe50c668c355..d12dcc6f50c4 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,11 +1,9 @@
 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.0.tar.gz 252195 BLAKE2B 144c1d914518efe651bbd2c28ecf526be9cdc3422453d8e4208104b9a7832d787c8de093f0acf43f786460841852dc5a45076b96c12e1aedfb6124ce18c9034d SHA512 13f19264a52d97094dac9a0692ca4edc5ae2b5ce1a89b12207da8e994904d5c24382e304e62bfc7160ce67812b861352650f61c0273ca17fd091bde7133b2ffa
 DIST feedparser-6.0.0b1.tar.gz 250065 BLAKE2B 54e955f011af0755e0f627caa1491be15a073984d5c7c2b4edd6e9dcd6054e19b5c77cea9741d0bf7af151f9c79b22739c12db94619373f195e024df65b1cff1 SHA512 580e02bd77dcba547eb8295f958c6d30e55c62bd7fdbe25eda7687d0654b9342edf82ab637902175fc90b86a8ae9cbae8ba2c7c9a83009d25ab5c007c37cf02d
 DIST feedparser-6.0.1.tar.gz 251457 BLAKE2B e159ecae5cfdb6828a17bd26494218db78bcb2542b75161878ce9eb8f126ba0285772a4c99584654de53e297fcb308ed50baaf9f208459237a0447721e32f1f3 SHA512 562748e079b44bd249406cf15d88bd4bb338a1e5a9a9b2c606514b054edf6cdd78d66f1cf6f00320c24a9d8519069e44b730a86f92e47775614bee680b9d8b7b
 EBUILD feedparser-5.2.1.ebuild 1194 BLAKE2B 8fa165bdf23171244f6d0fb6fdf2cb296c06515296150cee3a871ad09c9825a476802d176935f7eb459d130f7c0c43a4a4774ac8d913004bc63c960db25dbb6b SHA512 90b24aa7ffd61794fa22a9d530f7ade3aec69cc8f330a9f1979f6ff302aa2a6c94b5897e0e05ae7671b86dbceea9b63f540e221bc3d739d366192ae45dee77a4
-EBUILD feedparser-6.0.0.ebuild 901 BLAKE2B 95134ee9e0b2236e7b4c9201a19c54ef615564edf6b54c3ad6cd477238faef0048354e53e04caa1f6e0269208f12cf3da82b332fde82e7082584f1062dbf09f4 SHA512 c318d48ac3681642c1b421fb811dd1e4a777fa3fa962562c3974c589d431a44a0fc7f191bf27c8aab685f97a76b54602e0ae36433869f5aaf5c62a722fd9e93d
-EBUILD feedparser-6.0.0_beta1.ebuild 939 BLAKE2B d4670427e411e6fe1346562c317f97ab8b6a43d9fd2b0264b046ffbb43a0e1c857e4b90da3922fe61048594d6af678d9efc73167eb7d7e326bc74550cc71e62b SHA512 04ab36f69ea551bcaa2a3d6c837e88d03ab861dc922dc606c1ca83595a1201cb16e1a81a8a2f9911476f751024117fca2d84f29e7d8c2b16c05350cfd4616d0f
+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
diff --git a/dev-python/feedparser/feedparser-6.0.0.ebuild b/dev-python/feedparser/feedparser-6.0.0.ebuild
deleted file mode 100644
index dc1e470b0678..000000000000
--- a/dev-python/feedparser/feedparser-6.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-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/"
-SRC_URI="
-	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-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"
-
-RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken
-	rm \
-		tests/illformed/chardet/big5.xml \
-		tests/illformed/undeclared_namespace.xml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/runtests.py || die
-}
diff --git a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
index 48535d9068a5..eff7e7b9f375 100644
--- a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
@@ -18,7 +18,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}]"