gentoo resync : 20.10.2021

4 files changed, 0 insertions, 150 deletions

diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 91fb587eeb3b..d6c8e1e73d34 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,8 +1,4 @@
-AUX vdirsyncer-0.16.8-click-7-compat.patch 1192 BLAKE2B 33dd29de4c8497977a11052e4dc98290a981f470bdcd936f7dfc57e61a408332317805edbb0ecf50fdeb6256b91ece21f3b9582748cc5dc63cc687a68e9ecae1 SHA512 3de4131b447f789da4ae0da99f7f9f2d62dfb37b01b68db5b1c2ea68477425038681b4428024c3d743e18e2f0c3a069552066ff8743b85d2ce9bb31a4e850e9f
 AUX vdirsyncer-0.18.0-no-cov.patch 533 BLAKE2B 08f6d9dd09aeeb057bfa17fcd8a590ccef68bb9bed8c84c6682471ba53886bc80011990086c9b51673e272ce15fd9096847dab6bb9a6087670e5b01417cbc981 SHA512 00d4f334e1def6295f2b1aacfc2a7fd33f250a0bee39957288fe83a5179c0461f71273051687b53435b0cdd78a3ece618b1dec5a8e253cec3f3c3733528dba10
-DIST vdirsyncer-0.16.8.tar.gz 115819 BLAKE2B e0140718a1b41875421a7094e02cdeb865c500935e0c97bc18a614551586d79682641726df1a96e17a158604ed309f713f4caf4a484025eca5fbc6acbbe18f97 SHA512 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada
 DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
-EBUILD vdirsyncer-0.16.8-r1.ebuild 1665 BLAKE2B 174aa65ac2b9177810b81bb22c7411e93599f91f2c624aa12fa2279e645280c800bc1b847dc7c096a67cfd4fb118788195905fa8a39c6588fe5803c553ad92ad SHA512 b3f8a0a58a3020f3870709c12f3125f87f2812c0883944204b065f1137a97f7ded95bfa9a33f887588404ab8e71f2bd7c0ce305a85590df978cd8b5722227cfa
 EBUILD vdirsyncer-0.18.0-r2.ebuild 1664 BLAKE2B 8fe1cc11994e6041efc716a7a09a0964496a1e0dc6ced3063196243f893bfbbbe2f3a4b903d26c582c55f9b637b00eda7c4396917c26d99b1c56b578a7a719e7 SHA512 10388b153f0415962b204ac238c01f89b6bba06c30aece50cb93ab48144548c099a6660ae0020a16759fbf7f6dd928fc4e5c593013959c28a17233af04d5a5eb
-EBUILD vdirsyncer-0.18.0.ebuild 1502 BLAKE2B 4934fee920fc9aa7c9f54fc2afb7c96654009e2baae8a05629d45b44955e86ea57892ceced4109b4bf1ab1c29aba03785f5eb530e4522f13d47f7599ef6650dd SHA512 74781a7582a99b4731a15143cdd15b90c70b4aef609984561705e9558c4824e39846727103a5345966decbfa6a4b7f42a8cb89a6c529e26c38b5b592509ea985
 MISC metadata.xml 475 BLAKE2B 368524aa96e63a09f0bb25a2d2cfd0a20fd80a7723faa3c076e0a3a10f4fc0e06be1c0521afedbcfd39fc99e2e726627c7ad13622ceefa2fd90d317756386e3e SHA512 5a4150a6e7f0ad92c1b80291e5700f875e619b6b155903189a97ca7f820fff2b656309a27fcd7bae94d5fe6a7cd36cb93633ff0cc0ae7fcaac1399a3f132bb99
diff --git a/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch b/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch
deleted file mode 100644
index c0ee62f959f9..000000000000
--- a/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 3eb9ce5ae4320d52e6c876874511ff96a8a45f51
-Author: Hugo Osvaldo Barrera <hugo@barrera.io>
-Date:   Tue Jun 9 14:45:02 2020 +0200
-
-    Add compatibility with latest click
-
-diff --git a/setup.py b/setup.py
-index 59549f16842a..d584b95dd297 100644
---- a/setup.py
-+++ b/setup.py
-@@ -11,7 +11,7 @@ from setuptools import setup
- 
- requirements = [
-     # https://github.com/mitsuhiko/click/issues/200
--    'click>=5.0,<6.0',
-+    'click>=5.0',
-     'click-log>=0.3.0, <0.4.0',
- 
-     # https://github.com/pimutils/vdirsyncer/issues/478
-diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py
-index f242376417f3..43d35dd8541e 100644
---- a/tests/system/cli/test_sync.py
-+++ b/tests/system/cli/test_sync.py
-@@ -123,7 +123,10 @@ def test_verbosity(tmpdir, runner):
-     runner.write_with_general('')
-     result = runner.invoke(['--verbosity=HAHA', 'sync'])
-     assert result.exception
--    assert 'invalid value for "--verbosity"' in result.output.lower()
-+    assert (
-+        'invalid value for "--verbosity"' in result.output.lower()
-+        or "invalid value for '--verbosity'" in result.output.lower()
-+    )
- 
- 
- def test_collections_cache_invalidation(tmpdir, runner):
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild
deleted file mode 100644
index 8888f31e1aa8..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${PN}-0.16.8-click-7-compat.patch" )
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
-	dev-python/click-threading[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${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 )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Replace getiterator with iter for python3.9.
-	# See https://github.com/pimutils/vdirsyncer/issues/880.
-	sed -i "s/rv.extend(item.getiterator())/rv.extend(iter(item))/" \
-		vdirsyncer/storage/dav.py || die
-}
-
-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
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
deleted file mode 100644
index d902fe2f289b..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-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="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${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 )
-
-distutils_enable_tests pytest
-
-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
-
-	local deselect=(
-		# test CA is too weak for modern python
-		tests/system/utils/test_main.py::test_request_ssl
-		tests/system/utils/test_main.py::test_request_ssl_fingerprints
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}