gentoo resync : 29.05.2018

3 files changed, 6 insertions, 53 deletions

diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index a9a3707bd6cb..e29ebb6a7939 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,7 +1,5 @@
-DIST vdirsyncer-0.14.0.tar.gz 105839 BLAKE2B a096088dd7ade7b4b4bba5a703ec7e1a178f31a31b38b53bc11dd22c3b1d3774be56071035e5c3f736b65e8b3775ad9ba817003593f448f2480ab086c0f27a13 SHA512 e8a9f74032bc625db60206a210d7c00fad224b7eccfd1caeabbb97b443fd90ae8a00e2fdfabfd6118864dd9b6d8922eb9906091a8e341334848f66e55ed5fcdd
-DIST vdirsyncer-0.16.0.tar.gz 113408 BLAKE2B 40672130f4933a46c74e0b75656e474366fd876e3d25cfe064cff65ad42b5831edca80f64f2b8cc3bcac40a57ce436037545811b4c44b7e009c3c879a0dd5752 SHA512 d15a78d49da8ec033be85a3b127d5a788d34ba160207068f9cbd038efd950df809222da9b26ded46f53898b59c8e22049ca003c593e5ce4153ba744e9cf94dd4
 DIST vdirsyncer-0.16.3.tar.gz 113327 BLAKE2B 9d293562962bb121b7dc48d7bd7585cd660fd368b70bd7a33d226cbef4a5a5135794d0a3e999202a40b710e7338fb55f5616680dcd4885832643565a3d9ed386 SHA512 8f71cc71527d68836405722b4be03695b9010f72729c1c9b6d0199996bcf6821628a26297ff2d3a45047910618d570566e00edefccc428d29ba9fc9033caddff
-EBUILD vdirsyncer-0.14.0.ebuild 1397 BLAKE2B 3f3a7679da3711a3dfcc320cc09eea48d1b56b1b31006b2e5fc4d0e12f8566431f0a0264216d1ddbe7fddd57f97527a89593c9a54e0478a116afb06fad3766b8 SHA512 0a18373f7d61fe94e5127e52b184b4ef91c1fd732c97b42b882e23556e25013289fef081c1b9dde249b203c46a99cef6f91f3838b2039f3f6e82115023bdeff7
-EBUILD vdirsyncer-0.16.0-r1.ebuild 1421 BLAKE2B 61b62455496a12c13377e26768c387cfc320c1a8a583eb737463ad7deb6ba636d42a918c70a92b4522584b069cfbcc8ede654fe33636013252ef86433628fd01 SHA512 9c6f479884147b1cb9f4483495d70157de7cdd24353e3af382c69461ec39837a3e08c0817db0ba9f869307a4ba41f20218ac90e35ac4467f7315452f43004232
+DIST vdirsyncer-0.16.4.tar.gz 113368 BLAKE2B 6d3419456cb16dd10b9af19f7912a2a1e95af6d45e8fb3898f40f3c140ad26023556dd579de236850056cc6b78ffcbb95a45cfb427dc48f5425d0a40863f7aca SHA512 c01bf6bc5144629b82a3a60934fa6b89b0c24c55b09b98c54cba0a85d1e97f1c2ea157e159221ddfe4f11309cd5944eb2696ebc40b9d3ee95ea0801aa1eb9709
 EBUILD vdirsyncer-0.16.3.ebuild 1474 BLAKE2B 3a6ff6382d98277754cdf8d4859e4cb6023b2ef062edd456dc7832e6924c9f2d3b08ef1f0639299bd51a3b2a1f008cc2602812220570db4baff9b3f5d4773618 SHA512 c3b510ce12d91643dfa0caf5f5f5b9b5b0e8d8b28979e9532e5eb7e624f1fc3c3d501fd40ed4ca9448ca19f9a19cd480c0d3024c96795f02937c9acbbf6193ec
+EBUILD vdirsyncer-0.16.4.ebuild 1474 BLAKE2B 3a6ff6382d98277754cdf8d4859e4cb6023b2ef062edd456dc7832e6924c9f2d3b08ef1f0639299bd51a3b2a1f008cc2602812220570db4baff9b3f5d4773618 SHA512 c3b510ce12d91643dfa0caf5f5f5b9b5b0e8d8b28979e9532e5eb7e624f1fc3c3d501fd40ed4ca9448ca19f9a19cd480c0d3024c96795f02937c9acbbf6193ec
 MISC metadata.xml 349 BLAKE2B 20ad2ded190f80b37283e6ef064168094e9edeec5ca6ba262e9e6d977bd28d1538056b21efa7fecc090b63424a23f87c54ec1e2e2dcd02a2f4c5ab7b4b82abe1 SHA512 5e2d7f27428065740bdee11e59053519c83054c19156f77ec03fc6e416ca44ea0b74178844ac8ef84d1993927bcf3ba0b80d84296a152a006681ed77e87ed14f
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.14.0.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.14.0.ebuild
deleted file mode 100644
index b224f165d05e..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.14.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.1[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.0-r1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.4.ebuild
index a20a3aec23a3..84bec03e3bb2 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.0-r1.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,8 +17,9 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="test"
 
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/click-threading-0.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
 	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]