Antoine Jacoutot <ajacou...@bsdfrog.org> writes:
> On Fri, Sep 10, 2021 at 07:54:03AM +0200, Antoine Jacoutot wrote:
>> On Thu, Sep 09, 2021 at 10:53:56PM +0100, Stuart Henderson wrote:
>> > On 2021/09/09 21:52, Omar Polo wrote:
>> > > Hello,
>> > >
>> > > I've updated to the current snapshot and packages yesterday after a week
>> > > and I noticed that gajim doesn't start anymore. The culprit seems to be
>> > > a wrong version for importlib_metadata? I don't know python so I'm
>> > > clueless.
>> > >
>> > > I tried (in vain) to move ~/.local/share/gajim, but the same error
>> > > persist.
>> >
>> > +cc aja
>> >
>> > Antoine, do you have an uncommitted devel/py-importlib-metadata update
>> > that was meant to go with keyring?
>>
>> Hmm, that rings a bell, but I don't see anything in my tree.
>> I will have a look.
>>
>> Thanks for the report and sorry for the regression.
no problem :)
> How about this, ok?
with this gajim works, thanks!
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-importlib-metadata/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 2 Sep 2021 08:38:03 -0000 1.4
> +++ Makefile 10 Sep 2021 06:16:35 -0000
> @@ -2,10 +2,9 @@
>
> COMMENT = library providing an API for accessing packages metadata
>
> -MODPY_EGG_VERSION = 1.5.0
> +MODPY_EGG_VERSION = 4.8.1
> DISTNAME = importlib_metadata-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 1
>
> HOMEPAGE = http://importlib-metadata.readthedocs.io/
>
> @@ -16,7 +15,8 @@ MAINTAINER = Renaud Allard <renaud@alla
> # Apache Software License
> PERMIT_PACKAGE = Yes
>
> -BUILD_DEPENDS = devel/py-setuptools_scm${MODPY_FLAVOR}
> +BUILD_DEPENDS = textproc/py-toml${MODPY_FLAVOR} \
> + devel/py-setuptools_scm${MODPY_FLAVOR}
>
> RUN_DEPENDS = devel/py-zipp${MODPY_FLAVOR}
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-importlib-metadata/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 9 Mar 2020 12:03:05 -0000 1.2
> +++ distinfo 10 Sep 2021 06:16:35 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (importlib_metadata-1.5.0.tar.gz) =
> BvWzqZApxxNCB92IJCimaZKp3ivvfCtpm1ZB+YhsMwI=
> -SIZE (importlib_metadata-1.5.0.tar.gz) = 26738
> +SHA256 (importlib_metadata-4.8.1.tar.gz) =
> 8oSz4RJWrR5dA6uGuyzNb1M5aI/xek15eg/n3zJvI7E=
> +SIZE (importlib_metadata-4.8.1.tar.gz) = 41779
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-importlib-metadata/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 8 Mar 2020 16:28:41 -0000 1.1.1.1
> +++ pkg/PLIST 10 Sep 2021 06:16:35 -0000
> @@ -9,34 +9,36 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/importlib_metadata/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/importlib_metadata/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/importlib_metadata/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/${MODPY_PYCACHE}_adapters.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/${MODPY_PYCACHE}_collections.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/importlib_metadata/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/${MODPY_PYCACHE}_functools.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/${MODPY_PYCACHE}_itertools.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/${MODPY_PYCACHE}_meta.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/${MODPY_PYCACHE}_text.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/_adapters.py
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/_collections.py
> lib/python${MODPY_VERSION}/site-packages/importlib_metadata/_compat.py
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/docs/
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/docs/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/importlib_metadata/docs/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/docs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/docs/${MODPY_PYCACHE}conf.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/docs/changelog.rst
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/docs/conf.py
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/docs/index.rst
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/docs/using.rst
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/${MODPY_PYCACHE}fixtures.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/${MODPY_PYCACHE}test_api.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/${MODPY_PYCACHE}test_integration.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/${MODPY_PYCACHE}test_main.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/${MODPY_PYCACHE}test_zip.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/data/
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/data/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/data/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/data/example-21.12-${MODPY_PY_PREFIX}none-any.whl
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/data/example-21.12-py3.6.egg
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/fixtures.py
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/test_api.py
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/test_integration.py
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/test_main.py
> -lib/python${MODPY_VERSION}/site-packages/importlib_metadata/tests/test_zip.py
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/_functools.py
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/_itertools.py
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/_meta.py
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/_text.py
> +lib/python${MODPY_VERSION}/site-packages/importlib_metadata/py.typed
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/${MODPY_PYCACHE}_adapters.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/${MODPY_PYCACHE}_collections.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/${MODPY_PYCACHE}_functools.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/${MODPY_PYCACHE}_itertools.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/${MODPY_PYCACHE}_meta.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/${MODPY_PYCACHE}_text.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/_adapters.py
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/_collections.py
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/_compat.py
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/_functools.py
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/_itertools.py
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/_meta.py
> +lib/python${MODPY_VERSION}/site-packages/lib/importlib_metadata/_text.py
