gentoo resync : 16.06.2018

4 files changed, 2 insertions, 51 deletions

diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 929f8448e1b2..e9a0169cb8b4 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,9 +1,5 @@
-DIST cachetools-1.1.5.tar.gz 13378 BLAKE2B 68fadc9a3807e28a623671417bad192222120d408e204159956c31d2c285e7debea166c1298e9d6cc6f3ecc7c6a05bcf4a5270f303872925e0f5603a2da51bc3 SHA512 2565fa8666dffe5cbc349f80e719e0ae0df3ec36de3843f368fa67777b4e957c81f8c32f7d6eb704ea1fda5c2851bf57d68e563afa63ed0f7664d3615671f998
-DIST cachetools-2.0.0.tar.gz 18592 BLAKE2B edf075b10dfcd9da9416141e8341b06ab93c88d9af59df3b960dd666e305aa94cebc46bc4290f324369a8ffd81853136b9d8318f20257d234f7e0fef7784e41a SHA512 b1e7a6ed87a82a981f6c9b27bc96f26fdae241a12db85ff890538935e957d7ea88688e20a000691466bdb7db053f8c2145385dfcec6f5f4d84dd812ca419752d
 DIST cachetools-2.0.1.tar.gz 18790 BLAKE2B 48ce160117086306f5dd7fa7d74b12cd05db76089a1b98e78fa77b81e0f99516523fcef1d43c434137689b45e988ba7471469009049337f8e4a9a8aa6bb2e2b8 SHA512 4caad0676dab2a2ab922138c8305c7e40ac671aaec59ce502428608217976045af7a714c51567ff020987d3bf90f0c9c51645a59bb4f68d377e1f8dbed24bade
 DIST cachetools-2.1.0.tar.gz 20051 BLAKE2B 87c0839352a82fa2e531c6e4fe4da3ea7038ab9f09ce0b537f16deebf63de36a49ffd563790d42a1f07962841cf07431f1287de114f9e8d148c1413eedf1ff42 SHA512 6536afae48bad99465709860fd57c8c66d3b203ecf79a922e117a2c004a33b7ab2ac895f87596cbf4be377f6655d1deddc80b6500daa4d529eef7c1ca0adbd8d
-EBUILD cachetools-1.1.5.ebuild 459 BLAKE2B 916faf37389cd4299ef32218aa52b1b8473068a5956621a4b13a4dc25aa25ab20b20e1dcdbe70a9afa084aabb5703137761310f19d9c7f691c4cf269a8129b8f SHA512 8e75968aeccda3c114e7b1ed78c1b577275fc3b363971aafd3464e6ac3eb9a028a419696b6ddc9ec3eedd63116a4dca9b6250c43c104763b699f846a7fc8fcf4
-EBUILD cachetools-2.0.0.ebuild 609 BLAKE2B 9b6e8950d51c08909022af77dd281ba52d7aa25e04dbd23c2bdbec2c7aa368cd1cf4849a9ef4c8bfd2e4924c2ba5db71c8a84a745d5a7a1caae4aaede31882c3 SHA512 6a6e620a075c8922e7933195b15c7dc811006b5918fa69cf81d42297091c56b297f7a684d5401b8e9d9c58c958f6096f134956f83ddd58bffde2dd2ebb277ce3
 EBUILD cachetools-2.0.1.ebuild 609 BLAKE2B 9b6e8950d51c08909022af77dd281ba52d7aa25e04dbd23c2bdbec2c7aa368cd1cf4849a9ef4c8bfd2e4924c2ba5db71c8a84a745d5a7a1caae4aaede31882c3 SHA512 6a6e620a075c8922e7933195b15c7dc811006b5918fa69cf81d42297091c56b297f7a684d5401b8e9d9c58c958f6096f134956f83ddd58bffde2dd2ebb277ce3
-EBUILD cachetools-2.1.0.ebuild 611 BLAKE2B d9b61d4319d4d74a1b7b1996b5873974d490cdf5a700579c8736f68ce951f2da40cf343cf5686cfa168b57cfa8ad31ccfd64942989a54527ea9a25152fa8127a SHA512 d2c001186b3be782d2b8ecdfac8b171e01b34f9814a0c5a5c450ce3944f8a6bbfb696891836fd4e588dfc3cb9ca5f31ba81529939076b0a0344f7f0b0110d42b
+EBUILD cachetools-2.1.0.ebuild 609 BLAKE2B b33430c1f7562dbef7dcf04fd96b2ef44ad29a0429c5e6b7d3c7225d3c48c464deb0da00806cba7756faa4aaac76de0b9c07adf6f97d8cd8851136ff1ddbee6f SHA512 16c1431358f652a92fe2954bfc69871a5fb5945b4ce58b3f6776be7b622006732bb1cba119e2cb97681f1aff8ea5f99b9ac8a5c2d4773f6413065bc6319a9d47
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-1.1.5.ebuild b/dev-python/cachetools/cachetools-1.1.5.ebuild
deleted file mode 100644
index e8c2e2194b21..000000000000
--- a/dev-python/cachetools/cachetools-1.1.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cachetools/cachetools-2.0.0.ebuild b/dev-python/cachetools/cachetools-2.0.0.ebuild
deleted file mode 100644
index 26e716820ade..000000000000
--- a/dev-python/cachetools/cachetools-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/cachetools/cachetools-2.1.0.ebuild b/dev-python/cachetools/cachetools-2.1.0.ebuild
index 29ec2b11fd87..43782bae2530 100644
--- a/dev-python/cachetools/cachetools-2.1.0.ebuild
+++ b/dev-python/cachetools/cachetools-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND=""