gentoo resync : 28.04.2019

4 files changed, 5 insertions, 47 deletions

diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 886e71ba739a..f979f3bfafec 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,10 +1,8 @@
-DIST keyring-12.2.1.tar.gz 42242 BLAKE2B b821f17a671e89a28bd2953456bd0406e4f7fd142f1abf2e1f752e8f74f072c8fa995b90de62ac34586dd50a4dab47dff3bbb19157d76bb2f93a61e176dc3188 SHA512 8806b4433bc9085ae133300e68bc614281beea70de547f75afafdf6de2ee1b436f3a4cd13d7684cb6e4d5aef0a2eb9119d9cebbaf239a9ee1997ece4a56a7371
 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-12.2.1.ebuild 1017 BLAKE2B 568cc5619b1b2645c999d3175720469157ee2d55955b8364422a2bf72c8d4631c24e9bc71e0ed3db1ae625810e8a5cb0c33fe6ade88a4859b1e4b8447336fb4e SHA512 172ef757531fcc524676747080b0a383c11c54dfb48180aecc6d82dabed7f803766804703aa726a4755b4c5df108ce6babb56096ad4cd325d71a17a877af242e
 EBUILD keyring-13.2.1-r1.ebuild 1184 BLAKE2B 96c4fda0e3a375cca0bce279edf12f44f5fad2164936928d049f77e720b969062e4c829cb097094c6ae3e138ca1086c179249162c33f8d2a7743a1d454c7f51b SHA512 b0b840ce19a4080a4e6eb56b70ee98d173b7086808e70ab631c041396956c5fdf7cadc8a1d1cd456527984cffd7d0e79191225fd5823f154eec266eaa1c10b18
-EBUILD keyring-13.2.1.ebuild 1019 BLAKE2B bc4e761d749dbaded425683e054028ef234bcf7ed33722b0dcea89eec54f6a58dc6d065657df8af185795651ca1c5e6b01b23b2fb964aee8ae4554c771196f50 SHA512 ac5b4ce8872dcc73b36ba8429dee0af9282e3fda7ea7f33661809b033ccaff9e064562071402fa6e43bd8bffb07cb1dcbe08277eda1b15b96aa86da74b9ec8fd
+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 1206 BLAKE2B c0dc73a01848272014ea98f38e02dfb45f272c126952f6f561356e15a6f20d596e70e388fef61db866e3277395542d10769fce65aff1e4a207484bb6385e6f2a SHA512 b3de38dc1b61139771ffc7fddef303be3c04f459d4af5358496c72dd381b35782f2682a11e25be52dd17912658cf9816db413d41122f8281b997359477eb568b
+EBUILD keyring-18.0.1.ebuild 1204 BLAKE2B fc868e1e07bddf256dfb3c0a0dd34d3ecea76eeaf763295a85534af28e5b738984fa48f80b5fe1ac7ce3d6579d4a4705d5c02a80e1c31679a4dda13c378758e6 SHA512 75a1e512bb2a61140ed8d81e4e37e1929f4d972fe7d5e92ede23279374bbf359e20b8decf98107019e82fd1cce12d0cebd0bd45fb3f73fbed033ea820cccc501
 MISC metadata.xml 773 BLAKE2B 0a0957f622a38547688b83092b5961f3fa8f3c7a71cb628c6e5525b0a95f37345b5de0cdb5f5a80ce30a96150c6409920dcc391e230d8fbc6ea385b055a30add SHA512 939015ee7c67aa097663ef547b0726f7c7fc95d659b5f71f414b503e61f28604c05a252a084b65044ee2fc331005c10b5c8af4b4b361527b4a42e061e88b5018
diff --git a/dev-python/keyring/keyring-12.2.1.ebuild b/dev-python/keyring/keyring-12.2.1.ebuild
deleted file mode 100644
index 7ac4ada424c1..000000000000
--- a/dev-python/keyring/keyring-12.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-flake8[${PYTHON_USEDEP}]
-		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-src_unpack() {
-	unpack $A
-	# This is an interactive test.
-	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
-}
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-13.2.1.ebuild b/dev-python/keyring/keyring-13.2.1.ebuild
index 458f8acd5a08..7601c3a8c00f 100644
--- a/dev-python/keyring/keyring-13.2.1.ebuild
+++ b/dev-python/keyring/keyring-13.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/keyring-18.0.1.ebuild b/dev-python/keyring/keyring-18.0.1.ebuild
index 8dbccefd2219..b66ea9909c0c 100644
--- a/dev-python/keyring/keyring-18.0.1.ebuild
+++ b/dev-python/keyring/keyring-18.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="