The changelog for vdirsyncer 0.16.8 lists one item:
"Support Python 3. and 3.8"
The patch kmos@ added to this port is now also included in upstream and
can be removed.
The two new patches are needed for vdirsyncer to work with new versions of
click. They are in upstream's master branch but not in a release yet.
I verified that productivity/khal which has a dependency on vdirsyncer works.
OK?
Remi
Index: Makefile
===================================================================
RCS file: /cvs/ports/productivity/vdirsyncer/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 3 Jul 2020 21:13:04 -0000 1.13
+++ Makefile 11 Aug 2020 14:46:03 -0000
@@ -2,9 +2,8 @@
COMMENT = synchronize calendars and contacts
-MODPY_EGG_VERSION = 0.16.7
+MODPY_EGG_VERSION = 0.16.8
DISTNAME = vdirsyncer-${MODPY_EGG_VERSION}
-REVISION = 3
CATEGORIES = productivity
Index: distinfo
===================================================================
RCS file: /cvs/ports/productivity/vdirsyncer/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 11 Aug 2018 09:28:30 -0000 1.5
+++ distinfo 11 Aug 2020 14:56:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (vdirsyncer-0.16.7.tar.gz) =
bJvPubywEkbIO6b4VRz1TFivMyMhB1VIX8I7t4SFEu8=
-SIZE (vdirsyncer-0.16.7.tar.gz) = 112786
+SHA256 (vdirsyncer-0.16.8.tar.gz) =
v9tCL1Lh1NYL0GNdID+1n6f2Ezl9B5Zh60jnlGS6E8U=
+SIZE (vdirsyncer-0.16.8.tar.gz) = 115819
Index: patches/patch-docs_conf_py
===================================================================
RCS file: patches/patch-docs_conf_py
diff -N patches/patch-docs_conf_py
--- patches/patch-docs_conf_py 3 Aug 2019 17:08:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-docs_conf_py,v 1.1 2019/08/03 17:08:45 kmos Exp $
-
-From https://github.com/pimutils/vdirsyncer/pull/799/
-
-Index: docs/conf.py
---- docs/conf.py.orig
-+++ docs/conf.py
-@@ -3,7 +3,7 @@
- import datetime
- import os
-
--import setuptools_scm
-+from pkg_resources import get_distribution
-
- extensions = ['sphinx.ext.autodoc']
-
-@@ -16,7 +16,7 @@ project = u'vdirsyncer'
- copyright = (u'2014-{}, Markus Unterwaditzer & contributors'
- .format(datetime.date.today().strftime('%Y')))
-
--release = setuptools_scm.get_version(root='..', relative_to=__file__)
-+release = get_distribution('vdirsyncer').version
- version = '.'.join(release.split('.')[:2]) # The short X.Y version.
-
- rst_epilog = '.. |vdirsyncer_version| replace:: %s' % release
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py 11 Aug 2020 18:54:35 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Compatibility with latest click
+https://github.com/pimutils/vdirsyncer/commit/3eb9ce5ae4320d52e6c876874511ff96a8a45f51
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -11,7 +11,7 @@ from setuptools import Command, find_packages, 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
Index: patches/patch-tests_system_cli_test_sync_py
===================================================================
RCS file: patches/patch-tests_system_cli_test_sync_py
diff -N patches/patch-tests_system_cli_test_sync_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_system_cli_test_sync_py 11 Aug 2020 18:53:57 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Compatibility with latest click
+https://github.com/pimutils/vdirsyncer/commit/3eb9ce5ae4320d52e6c876874511ff96a8a45f51
+
+Index: tests/system/cli/test_sync.py
+--- tests/system/cli/test_sync.py.orig
++++ 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):
