gentoo resync : 25.11.2020

4 files changed, 11 insertions, 17 deletions

diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 03d321dab2d1..e14638e6bd5e 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,4 +1,5 @@
 DIST jaraco.packaging-8.1.0.tar.gz 15322 BLAKE2B c354bec458a319bd9df0667c155203efa5c3de2d95218d0dd3a5878011d2d8fef694a490a2bac0035bff8daa18d1a3447c2c8dab7c0bd7bb09b62969f91d4709 SHA512 99996765cb047f2f0416d6afc4ff6ee0d84d03da0e07c7a7121518fbaf668f587c044f567c1d66a455372897ec1634ba5ee490552ac92064ca072e20b8f60a3b
-EBUILD jaraco-packaging-8.1.0-r1.ebuild 1560 BLAKE2B 9708457a39412c13e9d6958421988dab3c6c03b8e3ba940c815511c839bd43fbe4b1a685b5d616ebeb0cc190b7a2cf27f1b6335e241c7bf5770a6d7612a65a1d SHA512 997b0cbd1930f5e62e15ec49dd7a05f6cf9b0b73cd65555bb7519ffb1557706228e199d052a3cecc7f076bc7c2ce502507be2c22d76374c93f91b3c0e6789ae3
-EBUILD jaraco-packaging-8.1.0.ebuild 1504 BLAKE2B 0fb8c8862a24fec2ae8d5072d3aa79f19568ba4591fad16ff58d627714efcf35bfc7d33b431bd18095144c0c1c4f87a72c8ccca8de72b6eb7dbd5584b63f09c1 SHA512 8d8fd454efc874c8a1267ee7494bee7e7ebc5e3af1653cd13f98d06f028b3a42bb22dc17f5c8f72d13b0e776856208d1098cd6504f0fef66eb42af02e983f693
-MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
+DIST jaraco.packaging-8.1.1.tar.gz 14580 BLAKE2B 6ec709571d74a9c840652b565e42b5301ab1ad71df823df6fb972c110d7bc0dbfdbae0dd3cc7123b29076a42de0d2b716ef2bab8dd58ffeb2563a868d90bdc90 SHA512 c0724e8694c3019bf3be24d99c7cde6dca65851e288ae027eb0b0fdfde9e1260804db3f8690b3bf69abd1e1e50733178c0387a859b0d634e8096dc49537f5877
+EBUILD jaraco-packaging-8.1.0-r1.ebuild 1551 BLAKE2B 79d0807586bbc88b4d8146bec1338b10cb91101669efb91d540ca4630b6cf8d4d36a6dc9f2347a3fd36a93a1ac001951fd6409ce1b108887d6bf626650b290d7 SHA512 ac66e72cf3d93afb185855c543c6c1f480869a8c418042ee28b0b2d2198c8888a193dfe60f321b101a0c89997e77d13e2a19b1215647737504dbbeaf979ad831
+EBUILD jaraco-packaging-8.1.1.ebuild 1340 BLAKE2B 6ec2b025e9a1b56561377118c995f312fa9f3fab4dc32ff9a62ad70b65e14019b055830b097b6c9368f93587d08b6483c8f443ec557298c1c4bf57ea252c8daf SHA512 913e62cbfcc91f44569ed9dd45ee5b7469af86c63444731f0a718e0897c23303d18e7fc61fb731b3ef173d20ab414bd24c19dfc297ec16876b2b0bead9196391
+MISC metadata.xml 675 BLAKE2B 36430dbb7cf6f29c913d02aaca81aeafa88e15cf44529c81835ae95c1b7a023a60d0116d50f04fbc424ee6aa49a2fe0eb56ed93b3a91cdd9d3bdda3d0377be91 SHA512 1532e2554229bec8576d60f8bd6b1f170fbe7a869f6b3505bd84efe33472b66b83cb08a5b4cbf201966d7e140a0571a89ff9dc3f821ded1181213841e551c506
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild
index a80e08b70b10..2e4dfe36ae73 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.1.ebuild
index a14d9974caad..3562cc7c22a5 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.1.0.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -16,31 +16,23 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
 "
 
 distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
 
 python_test() {
-	# Skip one test which requires network access
 	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv -k "not test_revived_distribution" \
-		--override-ini="addopts=--doctest-modules" \
+	pytest -vv --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/jaraco-packaging/metadata.xml b/dev-python/jaraco-packaging/metadata.xml
index c83a14fb8f08..21296aa87c6e 100644
--- a/dev-python/jaraco-packaging/metadata.xml
+++ b/dev-python/jaraco-packaging/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.packaging</remote-id>
 		<remote-id type="github">jaraco/jaraco.packaging</remote-id>