gentoo resync : 15.01.2020

4 files changed, 12 insertions, 13 deletions

diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 34cf70a4dc15..51215c69ba84 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,8 +1,8 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
 DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac12498be4d15cd0f5c52c80435f8ea513589e8aec671cf88b10cc8c98555e7cac7fe9a1e0c67f4625fce83f80f SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb
-DIST packaging-18.0.tar.gz 48018 BLAKE2B 3c7082a6cd6ba697f8b2c036062c7020b3b6417ba5492abee3b57b6a14bd8895168f6d6ab385458d08561fdf37230eb9d79ce82a8eae7dd16dc4951d679f917f SHA512 9f7cab9bdd756cc49192379b8381f81d218d3201e071498f2f6fd0307b1c46ad1a8c8b9d4f27e62d5f469eb05603a57be54deb8a5e0dbc2cf542e436a7127b34
 DIST packaging-19.2.tar.gz 59110 BLAKE2B 8098538b8f48f4ff478eb13f3f4384d08c246b8a99711a48b2f412deaecd85faf13e24fd910a7a262c3407c5eb54939cd926e31e6f802deed0e28e0a92dfdb86 SHA512 af7312a85292f577d3e6e57154f10fb380bbdee749344ba4b226a09f22bf5ca664ed63c62cd5b4dea0be5eb5cff5c17ad04415aab8c925fa90dcae2e1c6dee5a
-EBUILD packaging-16.8.ebuild 1435 BLAKE2B 61f84076339e88b08b95241d9e6eacce5565640cb97f125b96ec08341aca855c180e795f42fe9c4711503e7f71b05ea2ccdcd5ffbc6334299ca72836a87cb3c5 SHA512 c42fae42b7d8710702b81c51621ca9eca811bb886396be93a65bc4f4c6f24a99a105946cae1d49e3b5adfc4f2e0e19b496959e0635a54f218da9d448173e6417
-EBUILD packaging-18.0.ebuild 1448 BLAKE2B 3a91497a8f4410accaa5d97c344bec224ba4a2ce1ad97f68300aa58e34e141b9d9039957b7c495f46a7ad50ef823439e0adc0044d40aa901ec0f05d5a47630e9 SHA512 b4fbeca1287b2167040e16f6c3816442ac661ac4d1fc1afe877889c04442b15be1244970fa3c3b0bd9f4b39bc4994d15a8ddbe51b684d4bb305b8ab3781aa735
-EBUILD packaging-19.2.ebuild 1422 BLAKE2B e90518be8ff2b9fe4e8ff924407b574b5aae1a920b738aacdc5273051e81ea96115772131ea390e0d6b006020d427076d174636bbd8f5f9769378169af327509 SHA512 8ecb4a1585660d663883e2bf54a053b7d884249ca35606214382da0ac535d4021b1afa2a43bc14fffeb8aaa42aa9ff4ed7cd480f48ea44c1c2d92032fae7af3a
+DIST packaging-20.0.tar.gz 72663 BLAKE2B 39fe2c52389978d1c6d7a0a0044b549a96fd386f83ece2dac65090b8ea55193fb2334102523c5119ef29050655d81bc015e3b02c6589088ef6f5bc8e97f3aa04 SHA512 f7d99700d27d5aebbb3343f1de6ee9ce1372750b805c55a40d1a1fbeb6cfcfe2184875db56de175c6cd46e17f1567c30a39d5527870902c3c69168d025447587
+EBUILD packaging-16.8.ebuild 1426 BLAKE2B 09f077436c392bdc57cb524e06927b1a1c5c1cff91a6be03422becef6f47a49a0a6b2830e929ef76e819ecac08042c2858d2aacd03dcd3094ca0b9218e6f5f0c SHA512 8a7004680a62d2fbb728527842f6aeaab2b2f576fc4471add0da08d62018ed66f3277e54ac5d6c6e4ef1ffe839bc4cac09c5debd377bc86b0779849751ad553b
+EBUILD packaging-19.2.ebuild 1415 BLAKE2B 712b60364c9dd21cc284ad9235e51d6066eeb8a2a93d4dbf191df826580b536186da67da20001b70fb0f68db1d2acfbe836ef6703f3504653bb4486cd397c662 SHA512 c44d324b43b3b9f3d0c4cfd75054c579371864dd40f5f038e419c39a7651a5b476499bec2121c3cfdce90a6fd7a5b47e71b6f2e19f7594b620d31b1ff9371a13
+EBUILD packaging-20.0.ebuild 1417 BLAKE2B 7eb668b201610d64b01a91d7eec7c8cd37b4fcefd0436efbff41092eac037c42fd49ec422903ee08729331f727d315cb4e35d3b5bcb4c493db3c46e3928a8e7a SHA512 a09d271d703344f9f655b4fed8827c48d2d1f026758aabf4a47440a1f83029b132c5e286c4f5c3f71cf7fb45f06865a1d9beb084015608318fd90521824a1ba5
 MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index 49fbf109beab..e5bbf4a21873 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_6 pypy3  )
 
 inherit distutils-r1
 
diff --git a/dev-python/packaging/packaging-19.2.ebuild b/dev-python/packaging/packaging-19.2.ebuild
index 46e822b150f8..2675f40b46c8 100644
--- a/dev-python/packaging/packaging-19.2.ebuild
+++ b/dev-python/packaging/packaging-19.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3  )
 
 inherit distutils-r1
 
diff --git a/dev-python/packaging/packaging-18.0.ebuild b/dev-python/packaging/packaging-20.0.ebuild
index af75bdacd0d7..cbdf1bd94389 100644
--- a/dev-python/packaging/packaging-18.0.ebuild
+++ b/dev-python/packaging/packaging-20.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3  )
 
 inherit distutils-r1
 
@@ -33,7 +33,7 @@ PATCHES=(
 )
 
 python_test() {
-	py.test --capture=no --strict -v || die
+	pytest --capture=no --strict -vv || die
 }
 
 pkg_preinst() {
@@ -44,8 +44,7 @@ pkg_preinst() {
 		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
 		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
 		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
+			rm -rv "${egginfo}" || die "Failed to remove egg-info directory"
 		fi
 	}
 	python_foreach_impl _cleanup