gentoo resync : 18.11.2019

4 files changed, 13 insertions, 11 deletions

diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index e2f39dc93561..d30385672259 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-17.1.tar.gz 49849 BLAKE2B ceea74025c55c832cdd36b8464bb15862d8ee60387de973d7453d5cb8ec0b430d1e49a1b13c9dccb8b9c4c898cb07829f6fd04ca700d8cb2c5ba2b7abc0d160e SHA512 52d2f482ae5cd0f8e7b3ac35c4b270ca736bc4f7ebaa569631d1dcb8ea024ee6f75127ca2aa3c95e686ebbd427de2ef4bc01bcd839591f7b4c1e26f9b8d9acb0
 DIST packaging-18.0.tar.gz 48018 BLAKE2B 3c7082a6cd6ba697f8b2c036062c7020b3b6417ba5492abee3b57b6a14bd8895168f6d6ab385458d08561fdf37230eb9d79ce82a8eae7dd16dc4951d679f917f SHA512 9f7cab9bdd756cc49192379b8381f81d218d3201e071498f2f6fd0307b1c46ad1a8c8b9d4f27e62d5f469eb05603a57be54deb8a5e0dbc2cf542e436a7127b34
-EBUILD packaging-16.8.ebuild 1408 BLAKE2B 568268563507a0a8926ce55b4d761ed842cca639deb7f85b4c751118ae94bbe0da5003e7e774bd9754b066a62fee502aea65b66dbc523a0b3de20c431596036e SHA512 27f34192bed1ebe948a588e214c735d3cc9ddd9a2ec0582535b96a2a514003c2f252ebbf210db09a97ea88225269e2c480d4e783ed126fb5e64353b2e5ca8586
-EBUILD packaging-17.1.ebuild 1423 BLAKE2B 0ec2484a2f6c120b9de45f30cccb8fbc1a6b90c9a4a70856a351382887ec10668a13a39f7cd4efae1ef0a0abce5e56c76dfae04ea551314fd34170be8531fd46 SHA512 3ca9feb9c58a34b340c5dfe58c64e59171950fee02b2105673de1c69b6d8690e550af9557ac995591b41c738fe2ed9961fbcb20d2858c7278c4cc7ffc50e14db
-EBUILD packaging-18.0.ebuild 1423 BLAKE2B 690abf2528eb4e623b530ca0195ea414521c4f9f0d1e45653ffaab71e0d74c048b095807635011e50f7fdd3d751e476dcb1969e4adf0c77676ddc261bbc0d710 SHA512 26c7b5170a15f31b222c7f5bcf5dba7a25bf7f72b4c345c2ca64e0da47bf33571de0dfd9788ef35dfe23823c01bada8278f14b2c84af98f8428236d965807b73
+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 1424 BLAKE2B b37f5d02c4ffaac5f02fe69336f534ccdca8aff843ed89aed0f7ff20d26db8829dd1adccf53afc600729afc5b7fafc95d119f3176e200f0ad31ab536bd3406e4 SHA512 e911d83754fa8b894a98c3c6003a15ce9446ae8480e3d86fe31324f3772eb5bbe86859b876c09e84ac11a06f093185a6ccb64f281d7625876b7e46a58499a713
 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 51ab5134dd58..49fbf109beab 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
diff --git a/dev-python/packaging/packaging-18.0.ebuild b/dev-python/packaging/packaging-18.0.ebuild
index 6e30f354ed10..af75bdacd0d7 100644
--- a/dev-python/packaging/packaging-18.0.ebuild
+++ b/dev-python/packaging/packaging-18.0.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
@@ -41,7 +42,7 @@ pkg_preinst() {
 
 	_cleanup() {
 		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"
+		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"
diff --git a/dev-python/packaging/packaging-17.1.ebuild b/dev-python/packaging/packaging-19.2.ebuild
index c33fd8aaf8ff..f41f99d3fa6e 100644
--- a/dev-python/packaging/packaging-17.1.ebuild
+++ b/dev-python/packaging/packaging-19.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3  )
 
 inherit distutils-r1
 
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
@@ -32,7 +33,7 @@ PATCHES=(
 )
 
 python_test() {
-	py.test --capture=no --strict -v || die
+	pytest --capture=no --strict -vv || die
 }
 
 pkg_preinst() {
@@ -41,10 +42,9 @@ pkg_preinst() {
 
 	_cleanup() {
 		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"
+		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