gentoo resync : 15.06.2021

4 files changed, 83 insertions, 15 deletions

diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 7b06f9db9987..56741125ae41 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,4 +1,6 @@
 AUX vdirsyncer-0.16.8-click-7-compat.patch 1192 BLAKE2B 33dd29de4c8497977a11052e4dc98290a981f470bdcd936f7dfc57e61a408332317805edbb0ecf50fdeb6256b91ece21f3b9582748cc5dc63cc687a68e9ecae1 SHA512 3de4131b447f789da4ae0da99f7f9f2d62dfb37b01b68db5b1c2ea68477425038681b4428024c3d743e18e2f0c3a069552066ff8743b85d2ce9bb31a4e850e9f
 DIST vdirsyncer-0.16.8.tar.gz 115819 BLAKE2B e0140718a1b41875421a7094e02cdeb865c500935e0c97bc18a614551586d79682641726df1a96e17a158604ed309f713f4caf4a484025eca5fbc6acbbe18f97 SHA512 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada
-EBUILD vdirsyncer-0.16.8.ebuild 1464 BLAKE2B b6278599faede40a85244c68e0a63ccd3538e88c880533d781053318730566fa323552e9c959baf2bca2cba2a295a116dad2d999e2f3536920f7b14b884f3e46 SHA512 ddfd72e5c1c6b289ae9bbe06bc691f7cf1427ce4807fa90f2636a30e599973baab9be6bf400792436e2571b2b284949d0840130cfb6df0c9a9baa6b69e03cc84
-MISC metadata.xml 349 BLAKE2B bfd548e2d3baf91dcabfb4bb6f22639236d5705e41e6bea9e698706fd34a56d0e4ddc67bf4e4c7e30a4ff66597ccd90846ab8af68bd52d565ef96463b82b7f36 SHA512 8868c2b8c017001f483d3f11d5064ce877662411ec053635953f125ae8a988ad8e83ac21b7b491a2be3d1a54eea2b85bb1b26f86955b2ebef3cd75ec8802272f
+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.ebuild 1502 BLAKE2B 4934fee920fc9aa7c9f54fc2afb7c96654009e2baae8a05629d45b44955e86ea57892ceced4109b4bf1ab1c29aba03785f5eb530e4522f13d47f7599ef6650dd SHA512 74781a7582a99b4731a15143cdd15b90c70b4aef609984561705e9558c4824e39846727103a5345966decbfa6a4b7f42a8cb89a6c529e26c38b5b592509ea985
+MISC metadata.xml 450 BLAKE2B cad35e027f59e15b7edb28640ee7c71cdde44c48f0ac43ffe89010a6e19433a91d0bd885bc785dfcd1c87c458d27d28dc38445a775f524fccdabc061f76bd7ee SHA512 5543159143e071a69bf27bef714608c0ccb8e67af2aa45b70524ae14d95d67997f7964934b0acb425c3b0289258154c4589bf7e42f760fe0b919502791c9a9b5
diff --git a/dev-python/vdirsyncer/metadata.xml b/dev-python/vdirsyncer/metadata.xml
index 06fce01547f7..f42dda4bb8ac 100644
--- a/dev-python/vdirsyncer/metadata.xml
+++ b/dev-python/vdirsyncer/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pimutils/vdirsyncer</remote-id>
 		<remote-id type="pypi">vdirsyncer</remote-id>
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild
new file mode 100644
index 000000000000..8888f31e1aa8
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild
@@ -0,0 +1,58 @@
+# 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.16.8.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
index 75a4bd75e520..d902fe2f289b 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.8.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -17,19 +16,17 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/${P}-click-7-compat.patch" )
-
-RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
+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.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
+	>=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-5.0.0[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest-localserver[${PYTHON_USEDEP}]
 		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
 	)"
@@ -45,5 +42,12 @@ python_test() {
 	# 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}"
+
+	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 }
 }