From 8ebadd33332be3e9bc6f7ff71d9753f15f5eb6ec Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 11 Dec 2022 08:58:11 +0000
Subject: [PATCH] py-vdirsyncer: revert upgrade to 0.19

because of
https://github.com/pimutils/vdirsyncer/issues/1015
---
 time/py-vdirsyncer/Makefile | 18 +++++++-----------
 time/py-vdirsyncer/PLIST    |  8 ++++----
 time/py-vdirsyncer/distinfo |  8 ++++----
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/time/py-vdirsyncer/Makefile b/time/py-vdirsyncer/Makefile
index 924440fc4669..e9b9729b28ec 100644
--- a/time/py-vdirsyncer/Makefile
+++ b/time/py-vdirsyncer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2022/12/06 20:40:08 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2022/12/11 08:58:11 wiz Exp $
 
-DISTNAME=	vdirsyncer-0.19.0
+DISTNAME=	vdirsyncer-0.18.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	2
 CATEGORIES=	time python
 MASTER_SITES=	${MASTER_SITE_PYPI:=v/vdirsyncer/}
 
@@ -17,24 +18,22 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 DEPENDS+=	${PYPKGPREFIX}-atomicwrites>=0.1.7:../../devel/py-atomicwrites
 DEPENDS+=	${PYPKGPREFIX}-click>=5.0:../../devel/py-click
 DEPENDS+=	${PYPKGPREFIX}-click-log>=0.3.0:../../devel/py-click-log
+DEPENDS+=	${PYPKGPREFIX}-click-threading>=0.5:../../devel/py-click-threading
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.20.0:../../devel/py-requests
+DEPENDS+=	${PYPKGPREFIX}-requests-oauthlib-[0-9]*:../../security/py-requests-oauthlib
 DEPENDS+=	${PYPKGPREFIX}-requests-toolbelt>=0.4.0:../../devel/py-requests-toolbelt
-DEPENDS+=	${PYPKGPREFIX}-aiohttp>=3.8.0:../../www/py-aiohttp
-DEPENDS+=	${PYPKGPREFIX}-aiostream>=0.4.3:../../devel/py-aiostream
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 TEST_DEPENDS+=	${PYPKGPREFIX}-hypothesis>=5.0.0:../../devel/py-hypothesis
-TEST_DEPENDS+=	${PYPKGPREFIX}-aioresponses-[0-9]*:../../net/py-aioresponses
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-asyncio-[0-9]*:../../devel/py-test-asyncio
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-httpserver-[0-9]*:../../devel/py-test-httpserver
-TEST_DEPENDS+=	${PYPKGPREFIX}-trustme-[0-9]*:../../security/py-trustme
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver
 
 USE_LANGUAGES=		# none
 INSTALLATION_DIRS=	share/examples/${PKGBASE} ${PKGMANDIR}/man1
 PLIST_SUBST+=		PKGBASE=${PKGBASE}
 
 PYTHON_SELF_CONFLICT=	yes
+PYSETUPTESTTARGET=	pytest
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
@@ -48,9 +47,6 @@ post-build:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/_build/man/vdirsyncer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-do-test:
-	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
 # needed due to py-click
diff --git a/time/py-vdirsyncer/PLIST b/time/py-vdirsyncer/PLIST
index 6d08a5514ab6..e513b44a7491 100644
--- a/time/py-vdirsyncer/PLIST
+++ b/time/py-vdirsyncer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2022/12/06 20:40:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2022/12/11 08:58:11 wiz Exp $
 bin/vdirsyncer
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -51,15 +51,15 @@ ${PYSITELIB}/vdirsyncer/storage/base.pyo
 ${PYSITELIB}/vdirsyncer/storage/dav.py
 ${PYSITELIB}/vdirsyncer/storage/dav.pyc
 ${PYSITELIB}/vdirsyncer/storage/dav.pyo
+${PYSITELIB}/vdirsyncer/storage/etesync.py
+${PYSITELIB}/vdirsyncer/storage/etesync.pyc
+${PYSITELIB}/vdirsyncer/storage/etesync.pyo
 ${PYSITELIB}/vdirsyncer/storage/filesystem.py
 ${PYSITELIB}/vdirsyncer/storage/filesystem.pyc
 ${PYSITELIB}/vdirsyncer/storage/filesystem.pyo
 ${PYSITELIB}/vdirsyncer/storage/google.py
 ${PYSITELIB}/vdirsyncer/storage/google.pyc
 ${PYSITELIB}/vdirsyncer/storage/google.pyo
-${PYSITELIB}/vdirsyncer/storage/google_helpers.py
-${PYSITELIB}/vdirsyncer/storage/google_helpers.pyc
-${PYSITELIB}/vdirsyncer/storage/google_helpers.pyo
 ${PYSITELIB}/vdirsyncer/storage/http.py
 ${PYSITELIB}/vdirsyncer/storage/http.pyc
 ${PYSITELIB}/vdirsyncer/storage/http.pyo
diff --git a/time/py-vdirsyncer/distinfo b/time/py-vdirsyncer/distinfo
index 7e91b74a0d4d..c145ec6ba5a5 100644
--- a/time/py-vdirsyncer/distinfo
+++ b/time/py-vdirsyncer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.47 2022/12/06 20:40:08 wiz Exp $
+$NetBSD: distinfo,v 1.48 2022/12/11 08:58:11 wiz Exp $
 
-BLAKE2s (vdirsyncer-0.19.0.tar.gz) = f2bcb41a8d77b327676e65c85524f3faa7e6d7de28a3774cc07600fa3ea27f19
-SHA512 (vdirsyncer-0.19.0.tar.gz) = 9b8e467bdc9daf6d50981bfec1f67a1c990b07bc62a6e2d3ede35712fde60206672af53d53aca6587daee132ab74bf74f04d8bb4dbaa804dfe97dca9370b323c
-Size (vdirsyncer-0.19.0.tar.gz) = 122533 bytes
+BLAKE2s (vdirsyncer-0.18.0.tar.gz) = 75ef21cdefe1b91319bdcef6e783ad2ab26d21d6cb4c0db7e1300f2c0237e0a5
+SHA512 (vdirsyncer-0.18.0.tar.gz) = 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
+Size (vdirsyncer-0.18.0.tar.gz) = 115125 bytes