gentoo resync : 18.11.2019

6 files changed, 21 insertions, 21 deletions

diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 231c98e3a49b..f2ee453c59bb 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -2,12 +2,12 @@ AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e95
 AUX pluggy-0.7.1-disable-broken-tests.patch 506 BLAKE2B 9f01f31d9b78254c662e15e2580ca78636ebfb7d902828054ada96857863917938f78f8af292549bdfa0ff1bd71cea9ff6e5309bcbb99a00c65ad52290fc23a8 SHA512 bb959e084e388599b468727afd0ed94e445ba65a5e6dd8840470ab7f0c56aed57bde3ab389a48c49dbc5f4bdeb6a60a77cd70c28c778a952bdb1910c362d456a
 DIST pluggy-0.11.0.tar.gz 56897 BLAKE2B 2d40ca953fa0ead7516dd81007ef6f1f88b0ebe45512b031fda9ed69c953bca08109f157676ba2ed545ffb1f8f7bb18fa1b8532635d6fc929c62bf0b5de45128 SHA512 8808f5015fa6f33fcb07047c644706bf3acceed1e107dd617395e61aa9765a45e3a641e49c610ab817ebaa2c4f3b32a15bf347579206e979fe6b844ba2f684b5
 DIST pluggy-0.12.0.tar.gz 57658 BLAKE2B 53c35f16fa73ffd115c7988032593e925e538f1a49a36a0db4db406b013f6f68f293ebbe3673243748d5707e72520192775e59cb8e1bbe4f9a448a5f3ba64651 SHA512 a3a64caefc797334b73b0614e467613b99909037a62dcbfbb0cf917788ee8d12af4f43d7c371634ac6eb6f32a5aa08e51aa8179e70b5998d4d055cd7f535129f
+DIST pluggy-0.13.0.tar.gz 57726 BLAKE2B bbf473271c1ea6520d71a6dbbf145a2c3b1a2f2a58e4427b0584f5cb9e3cafc7dba9fcc3c8480211ca0c9ddc721288e49bfbf57bcae1320c667b7c7324cdddea SHA512 82cf7d8aa4a0e09f8ba5048cd7ce038f34ca1453fe0c5a7926a2113e64528d0861955f8544035b4ffd61f0227e3d30d8d4180a05bf80e0de4809546e990bd4c7
 DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
-DIST pluggy-0.6.0.tar.gz 19678 BLAKE2B 79db59c5f0ce0dd157630d039ec50643f615789b6b993d84e9ab1bdc9ce04b32df336d88df13f13a16a1f0bd4acb7b900208e98c84f007bdc3654f9a1d5f19a2 SHA512 dd58dabe2e65eee64d62c8748c2bbd99457288e99b819eb12312f2acdb0740ac46fd08f83522bc992297b9f14eec14c216c2c9688580f68393bf6fc609e65812
 DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff756a59f080e79e70465d48dbbc6e6100305e8b32031cefb0ba06bb10494f29bc8ddd38d4296016ecebaafccc1 SHA512 e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697
-EBUILD pluggy-0.11.0.ebuild 838 BLAKE2B d008f636e6705259586609f9a73222d3d4d4fa867a6337f2bc91c711423597c0fa3b595321fecb0bc3983f35c0b0c0f8c6401d7b38ecaa9087161f90cf711f12 SHA512 a5d8dcf74d46a2c145db23155833134b3e034a48875eaa7637f0b8699265dd4258133125e4711ffab98552b99657baaaf9e44afc20de46152e1a54bf0fb60a4a
-EBUILD pluggy-0.12.0.ebuild 763 BLAKE2B e7b32eedcb2a092730a01e24253c4f249640dbe65bc90727a711afae7a802f1f1b94815158c29c717463c89a9df3cca8722d339ee58cf42b84a29e9c9f3e7f2d SHA512 e98823b2be4b8300dcb68571598aa22b3027eeee1334c5339c3c0c8d29fe81282c2d038ae6c6f4ec4a96b43a97d4ab001b8045731ea8fb921599605cdf931eab
-EBUILD pluggy-0.5.2.ebuild 728 BLAKE2B 7f818f66b4c4254a8401a4b7fc3fa95f2fd81c513ef0739ce9f3621a64c1305d788a8823108df85451d1047f7a1150e637ac37b53cc786c5bc9e512e99d7e419 SHA512 4baa9757b32121e6ac4afd80c94f96f608d4151abfeb4a925f7c04a77513190efffdb519740d655d6f83c730406eb200bdaff26997a88d597ea279dca9fcbb30
-EBUILD pluggy-0.6.0.ebuild 747 BLAKE2B f1b9f9c08f7f3daf5e6cf747f34a0da8324eca08f486d3203bf9fd774d1531519ac711ac7efee26bf8b2c20ecdfb7d14d91a4e58aa894861b2e1f9ce2c89f159 SHA512 94a5216ac4a6e09c766e8fc8b55a475e289300a22e1fff00d6d4de30efd98c3822e86a0605e9143d0209420e9f01d7e7f81204c68a8164010892fbc44d7ab0c1
-EBUILD pluggy-0.7.1.ebuild 894 BLAKE2B 074ed504e9f566da7637ba82d0fcf6755890481f76e239e188b126bc8f4b5e2106959b7a4cb8f70f4c85e841c0a14fd5d5a517bfd7e63b0d5fd643d7cc28d289 SHA512 9eb104585bd1fe08cbb0a8bd0c1b46bc06215a89ee05b14b2f277b3836bbfd51d1b9e41095913176af33714f7e07b4c2172ad56951a716528114eca56de5042f
+EBUILD pluggy-0.11.0.ebuild 865 BLAKE2B 9b4288dbdc6a582db4e143a9ba5499dd1a68db5620def7a82d3aec8c59c0f6a2fd0d9e79f5f81febd33c0523ffd531769ae7de0f4873bcbf63410709ca6ea3df SHA512 ff2a2aae62d21f3940ce888339165e76c39be655cb59378df93b15efe9d6eaeb72f360b6d90723943f599deb2585bc311c095c8a20b34358c275614782b0414a
+EBUILD pluggy-0.12.0.ebuild 790 BLAKE2B fa8b4f5139df04a88e9cd623a99743308a6dd7624f1ab4cd05f50f9e5c0b822830b0a2e808469e7b6b38ad47ae09635ee0548a9bc6df737033a6410a6fcbf2fb SHA512 2abf0f8501ad802fe15e0c56e0b01e44b3bb6b3503f3526e4da207895d618dc6d77e1b8e8a9720c3f979b7c1ab732c235d604235803bf8e4c28775956a356dbc
+EBUILD pluggy-0.13.0.ebuild 689 BLAKE2B a5379c80edfde04a228a56865f816703627293d5bc71fd4f1dc0b1835a12cd4871a03d20e18497e8c7f9699b094690180a1277d7aee4bf05f1d3bf07d6242708 SHA512 9d5ca7c794bc98b709c891ebb22ab669816879ad117bebfc99a2085e120f1465dbbc707b999052b9d246ee6f0503c44f272147c1bc472f29f0ba786e79196e69
+EBUILD pluggy-0.5.2.ebuild 755 BLAKE2B 157077803394e3f1d4d2b050c75a5220ea7a3ec8a1fc48fc60c338a20cd5495c917e87d62c496cb29f2884b7bfab06e380ed8755f5503ef920942dcdd2b922f4 SHA512 26b629a0f49e26ff802e9b7ec1dfaf9e7401a75e37bd277a111d7d83bbc01254dcc59cd3508e008bffa30b3ab40ce4e0a5fe370c90410614342e09c8151ddf63
+EBUILD pluggy-0.7.1.ebuild 921 BLAKE2B 2008e1c6be1628a52af26b05d446bb289d3d932983ba04602170ba5ab2565feb9666362518c8f728bf01d9645fae82b8fe11ac7799f245b738e0b5379b201fe1 SHA512 59f82bb2baed2c244afdd2188764c71112522db91a4782c75f6e534f984d709941c00de1416bc0b385bb9b797b98827e75879ee3826184b7fda85da9ab84b0b9
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.11.0.ebuild b/dev-python/pluggy/pluggy-0.11.0.ebuild
index d1d68d4ca7fb..b02d326e0895 100644
--- a/dev-python/pluggy/pluggy-0.11.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.11.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/pluggy/pluggy-0.12.0.ebuild b/dev-python/pluggy/pluggy-0.12.0.ebuild
index 9f802dd8e770..d8ce296fc171 100644
--- a/dev-python/pluggy/pluggy-0.12.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.12.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/importlib_metadata[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pluggy/pluggy-0.6.0.ebuild b/dev-python/pluggy/pluggy-0.13.0.ebuild
index 63f1dd813ea2..d2d28b6fca6d 100644
--- a/dev-python/pluggy/pluggy-0.6.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.0.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=( python{2_7,3_{5,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,16 +13,12 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="$(python_gen_cond_dep \
+	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-0.12.0-strip-setuptools_scm.patch )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
index ebe067fe4766..9c077692884c 100644
--- a/dev-python/pluggy/pluggy-0.5.2.ebuild
+++ b/dev-python/pluggy/pluggy-0.5.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/pluggy/pluggy-0.7.1.ebuild b/dev-python/pluggy/pluggy-0.7.1.ebuild
index 1e3dc2e42fb9..f2d0a1584808 100644
--- a/dev-python/pluggy/pluggy-0.7.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.7.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}