gentoo resync : 15.12.2019

9 files changed, 194 insertions, 6 deletions

diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index f979f3bfafec..c9984297985f 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,8 +1,14 @@
+AUX keyring-19.1.0-tests.patch 978 BLAKE2B f5ffbef3fbda93c4f1ac4373129931b4986209cb0898c363e2ce82c8b08b530ba15f6409f59e99f68d7bd06547c3e00b2f5dfd3957319485ab3db74dbadad1bb SHA512 aa33abc4ccb4bece799add8a766665f0405a69f3c5485b3ffffb5116365b10d965ba5f9458ad1006c36132b6a83f26fe9a6d83f118e46ae59a76af84c6acefb1
+AUX keyring-19.3.0-tests.patch 939 BLAKE2B 8537c22ba56a24e5f8fee3907023098dbbdaf208a5e3edfff27c0a9537214caba2d4383efd79ab8ea0d02ed6ef3ebfb3630e53f7846a1af993d440407a3f20c8 SHA512 4aa8ed401181fe14e98e855d537aec5dcf5e413728df52edfbaa16cb0babaed68f29402f0a83143248e51cbc2e3f6211b68efaf4b54d76dcf8b5ee2748f46d55
 DIST keyring-13.2.1.tar.gz 43140 BLAKE2B 74272b93ff80a03615879a5f416ad6be1012f22862972a7f400609ea3fb984c45ed2ccb44eca30d253d0d39e0876f1ce25ab9aa6267a06a7c67a17aac27cd31e SHA512 3c15c3415ba4b657b041d2395536fc92ba656dc71f28669235f13a630946ad1b332d1f5b031a55776ce8a2120d3d2601462708f00ee105f46a27cf043c1bd906
 DIST keyring-15.0.0.tar.gz 42547 BLAKE2B b9200f61fcf227ce82ed05db15b8a03754a2d2f0ee7a32afe4a99a6bb4c511e311d7c529d5173756173622e225ae4fa2fcef6409b21dc3d8735b5e8fab73bd1a SHA512 58001d61bdd442196ec4891000cc532d1dd9b85b18d100d8dde38cf1cf733ef6d6541513d73435dfe41e9cd26c6e34332d518a06a7fbc498b1b8971df6640212
 DIST keyring-18.0.1.tar.gz 48559 BLAKE2B fb9e8df5ae04b4c1d646b4129cf34d420fd05783724dc2d10fccfaf11ddf1a17048c2695477bc1f4cfcd6d08ed48b6d552d19862a0510d8e12fef4e17b13087b SHA512 62091fc304ff0d4a1dd5db3e1fbae7e02edcb60442f19d7408ba2f115226a8282ff67df55334f019da3cccae858cd5e4b0c0ece22a7c66768bbb85018728be30
-EBUILD keyring-13.2.1-r1.ebuild 1184 BLAKE2B 96c4fda0e3a375cca0bce279edf12f44f5fad2164936928d049f77e720b969062e4c829cb097094c6ae3e138ca1086c179249162c33f8d2a7743a1d454c7f51b SHA512 b0b840ce19a4080a4e6eb56b70ee98d173b7086808e70ab631c041396956c5fdf7cadc8a1d1cd456527984cffd7d0e79191225fd5823f154eec266eaa1c10b18
-EBUILD keyring-13.2.1.ebuild 1016 BLAKE2B 234bc45648c5a0e282aeafc9cd26d4b43eca5450da3c722de24944685b6c410b90909caacdce544e58f26a254328facc33cca30aec28de0e9312a2f88858821b SHA512 04dcec5c51c820d10931b4dd89a10753f2c04f82c561cae7e03a84b8feecc8b30cfdf3a7d62fd69bf69782d3250cee821cba23d71f96b1d6e9859044023a9ef4
-EBUILD keyring-15.0.0.ebuild 1190 BLAKE2B 5c41f74fe95dec4d8bda37ef215f77e921472d2a204e25631e47b56823f73c0d1f742ed9bbff8f2d2f36efc2c73bc9be940a889609cb5b7d28a9b24cf05da4a6 SHA512 c05684ea5b24771c121c74ccb3b526d555baee2f707a0e95a0b5d731ccf0602b647dc8a58ab0fb0bb0779561eb619f69342098298c719bd0894fe9ba1cf2c297
-EBUILD keyring-18.0.1.ebuild 1204 BLAKE2B fc868e1e07bddf256dfb3c0a0dd34d3ecea76eeaf763295a85534af28e5b738984fa48f80b5fe1ac7ce3d6579d4a4705d5c02a80e1c31679a4dda13c378758e6 SHA512 75a1e512bb2a61140ed8d81e4e37e1929f4d972fe7d5e92ede23279374bbf359e20b8decf98107019e82fd1cce12d0cebd0bd45fb3f73fbed033ea820cccc501
+DIST keyring-19.2.0.tar.gz 41728 BLAKE2B 24a8f095f4009f37fa6d5e7bc2b12be816a5db2abfa4416fc18203a818296c775fe34a2936a71b191700ad511e01059974aec374aea5ee312507a27bd8be76b8 SHA512 5104423289b9e537e64760afed38e5851766b9c955c0659b078cdaba82813e93922e488b5465157cb930285416feef07c0b559fc49909f58bc85b6f30d55dd75
+DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
+EBUILD keyring-13.2.1-r1.ebuild 1208 BLAKE2B 7baff144faf1881ada3a5fa735d8821bba3149f32ff513e14c4280152c1ccebe1922c72ea01b584a2124988398a515c2713104d0363db31de26e2e39db2039f1 SHA512 4da8dbf0ec4ab152187a0a329d578f516ce625623f3158bc84200506c15b081eff8eb596a7f80586128c722f4bc3f27a26ad5486ff6308a198da7921306b7d2f
+EBUILD keyring-13.2.1.ebuild 1043 BLAKE2B 46003fb7415626e02055a61ff5d4b6b558c4271862386b68e08913ff6be4c1fccd1cbbac29701171f566fbebb156f997f47c54de6a63b23835b2513dba3a6093 SHA512 21bc3f2d24508e52b271839aa4770482a82fcfbe65d6b2d13138b92646e3e4e3464e0d072303f88d4eb0e2f1d78e7948b2f2b94cfbfde74f2266412b66971e5a
+EBUILD keyring-15.0.0.ebuild 1214 BLAKE2B 3a57aeb5a7a9bf7d2db6d39c552ddc8f8f3c0b7e3f13d4db506c3da230267fa08d2ee6b479a949855393e83521b1ebcdd99e96645d83f4a77e877877f4a70033 SHA512 c0ad72f8f91b47a0a6bf06e8be58dad6ff08a4403b2c28cded68133f0a6db921df3ae70c74af6b01d8ab17e50235467ba61450f3eeae63d80176f751dfff1881
+EBUILD keyring-18.0.1.ebuild 1231 BLAKE2B f3fb8a8f2e2a4cfae92f25330b8fb9f0965cfc3bdadcb44621675dfaa9e2c79f1a59f8574d61fb436fbc6155c8b0de595adf7f8d99aa2046986860cfecab61ba SHA512 b8a173dbbc57a49430c6bf80f762d91ab8b479a442e25263ea31aacb65529a9faddb1f869ccf6f2a5b0f2d4be97994eb126e8a1dbb7e03cbbb0030d0ed6a9bfa
+EBUILD keyring-19.2.0.ebuild 1481 BLAKE2B 4aaa4e04ab9c8619de9877c72196c809097cb767fc23777287a0a41e13f385ebded6cb90d045ca86076dba7c351cacc53f42e871a6bf4d1f93a4d37e4887326e SHA512 516a56534d88be20f6785634bd01372935e78033b21add2d090826b47b666c95e27f27f1832b24bce8be3a1c8271205dae727269445c5aea5a81c03bc415f17a
+EBUILD keyring-19.3.0.ebuild 1713 BLAKE2B 3a40ddf8eefb0931ec666c4358825e67d4525915e13184302eb1533ce10e30badc1f2257ea91030821587283dcde17b406190b735fd1d634f73118a1ac30d1cf SHA512 48c40d3eb07daae1abbe7a3449aea1df7b72dc4175b3e8940be9e4c696c621dcd6d03a77929b672713be2fc854cc962f9e75a52593d4b13fb3bfadddb47b60eb
 MISC metadata.xml 773 BLAKE2B 0a0957f622a38547688b83092b5961f3fa8f3c7a71cb628c6e5525b0a95f37345b5de0cdb5f5a80ce30a96150c6409920dcc391e230d8fbc6ea385b055a30add SHA512 939015ee7c67aa097663ef547b0726f7c7fc95d659b5f71f414b503e61f28604c05a252a084b65044ee2fc331005c10b5c8af4b4b361527b4a42e061e88b5018
diff --git a/dev-python/keyring/files/keyring-19.1.0-tests.patch b/dev-python/keyring/files/keyring-19.1.0-tests.patch
new file mode 100644
index 000000000000..0e4bdfd1960e
--- /dev/null
+++ b/dev-python/keyring/files/keyring-19.1.0-tests.patch
@@ -0,0 +1,34 @@
+diff --git a/keyring/tests/test_errors.py b/keyring/tests/test_errors.py
+index a90905f..1d5f568 100644
+--- a/keyring/tests/test_errors.py
++++ b/keyring/tests/test_errors.py
+@@ -1,5 +1,8 @@
++import platform
++import unittest
+ from unittest import mock
+ 
++import pytest
+ from keyring import errors
+ 
+ 
+@@ -13,6 +16,7 @@ class DeletionDetector:
+ 
+ 
+ class TestExceptionInfo:
++    @pytest.mark.skipif("pypy" in platform.python_implementation().lower(), reason="broken on pypy")
+     def test_traceback_not_referenced(self):
+         """
+         Ensure that an ExceptionInfo does not keep a reference
+diff --git a/tests/test_packaging.py b/tests/test_packaging.py
+index 3ede719..4bdfa25 100644
+--- a/tests/test_packaging.py
++++ b/tests/test_packaging.py
+@@ -1,6 +1,7 @@
+ import pkg_resources
++import pytest
+ 
+-
++@pytest.mark.skip("for some reason we are getting 2 of the same entry point")
+ def test_entry_point():
+     """
+     Keyring provides exactly one 'keyring' console script
diff --git a/dev-python/keyring/files/keyring-19.3.0-tests.patch b/dev-python/keyring/files/keyring-19.3.0-tests.patch
new file mode 100644
index 000000000000..82cef178c6cb
--- /dev/null
+++ b/dev-python/keyring/files/keyring-19.3.0-tests.patch
@@ -0,0 +1,26 @@
+diff --git a/keyring/tests/test_multiprocess.py b/keyring/tests/test_multiprocess.py
+index 49af222..8fdd1a3 100644
+--- a/keyring/tests/test_multiprocess.py
++++ b/keyring/tests/test_multiprocess.py
+@@ -11,6 +11,11 @@ def subprocess_get():
+     keyring.get_password('test_app', 'test_user')
+ 
+ 
++pytestmark = pytest.mark.xfail(
++    platform.system() == 'Linux', reason="#410: keyring discovery fails intermittently"
++)
++
++
+ def test_multiprocess_get():
+     proc1 = multiprocessing.Process(target=subprocess_get)
+     proc1.start()
+@@ -23,9 +28,6 @@ def test_multiprocess_get():
+     sys.version_info < (3, 8) and platform.system() == 'Darwin',
+     reason="#281: Prior to 3.8, multiprocess invocation fails",
+ )
+-@pytest.mark.xfail(
+-    platform.system() == 'Linux', reason="#410: tests fail intermittently"
+-)
+ def test_multiprocess_get_after_native_get():
+     keyring.get_password('test_app', 'test_user')
+     test_multiprocess_get()
diff --git a/dev-python/keyring/keyring-13.2.1-r1.ebuild b/dev-python/keyring/keyring-13.2.1-r1.ebuild
index 0cd6bdea71df..a2ddfdf7306f 100644
--- a/dev-python/keyring/keyring-13.2.1-r1.ebuild
+++ b/dev-python/keyring/keyring-13.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="PSF-2"
 KEYWORDS="~amd64"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-13.2.1.ebuild b/dev-python/keyring/keyring-13.2.1.ebuild
index 7601c3a8c00f..3d2fd4e8a798 100644
--- a/dev-python/keyring/keyring-13.2.1.ebuild
+++ b/dev-python/keyring/keyring-13.2.1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="PSF-2"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-15.0.0.ebuild b/dev-python/keyring/keyring-15.0.0.ebuild
index 7a402c3f56ed..9db3a228e23a 100644
--- a/dev-python/keyring/keyring-15.0.0.ebuild
+++ b/dev-python/keyring/keyring-15.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="PSF-2"
 KEYWORDS="~amd64"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-18.0.1.ebuild b/dev-python/keyring/keyring-18.0.1.ebuild
index b66ea9909c0c..28be4645a8a2 100644
--- a/dev-python/keyring/keyring-18.0.1.ebuild
+++ b/dev-python/keyring/keyring-18.0.1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="PSF-2"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-19.2.0.ebuild b/dev-python/keyring/keyring-19.2.0.ebuild
new file mode 100644
index 000000000000..452524c6e5d9
--- /dev/null
+++ b/dev-python/keyring/keyring-19.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="https://github.com/jaraco/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/keyring-19.1.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging dev-python/rst-linker
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
+		setup.cfg || die
+
+	# avoid other deps
+	sed -i -r "$(printf -- 's:[[:space:]]*--%s::;' --doctest-modules --flake8 --black --cov)" \
+		pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	# Skip an interactive test
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		--ignore ${PN}/tests/backends/test_kwallet.py \
+		|| die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/keyring/keyring-19.3.0.ebuild b/dev-python/keyring/keyring-19.3.0.ebuild
new file mode 100644
index 000000000000..73c4ca0d8931
--- /dev/null
+++ b/dev-python/keyring/keyring-19.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{5,6,7})
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/keyring-19.1.0-tests.patch"
+	# https://github.com/jaraco/keyring/commit/411204df606bdf02c99f3360ec033e3c235d5f67
+	"${FILESDIR}/keyring-19.3.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
+
+python_prepare_all() {
+	# avoid setuptools_scm and a bunch of style checker dependencies
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r \
+		-e "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
+		-e "/pytest-checkdocs/ d" \
+		-e "/pytest-flake8/ d" \
+		-e "/pytest-black-multipy/ d" \
+		-e "/pytest-cov/ d" \
+		-i setup.cfg || die
+
+	# avoid other deps
+	local -a pytest_params=(doctest-modules flake8 black cov)
+	sed -r -e "$(printf -- 's:[[:space:]]*--%s:: ;' "${pytest_params[@]}")" \
+		-i pytest.ini || die
+
+	rm ${PN}/tests/backends/test_kwallet.py || die
+
+	distutils-r1_python_prepare_all
+}