py-keyring: update to 10.4.0

10.4.0
In Kwallet, pass mainloop to SessionBus.
Unpin pywin32-ctypes, but blacklist known incompatible versions.

3 files changed, 30 insertions, 77 deletions

diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index 76b21ecd203..6f8d570818c 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.18 2017/01/03 13:23:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2017/10/18 07:22:53 adam Exp $
 
-DISTNAME=	keyring-5.3
+DISTNAME=	keyring-10.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
-CATEGORIES=	security
+CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=k/keyring/}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc.gnome@gmail.com
-HOMEPAGE=	https://pypi.python.org/pypi/keyring
+HOMEPAGE=	https://github.com/jaraco/keyring
 COMMENT=	Store and access your passwords safely
 LICENSE=	python-software-foundation
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-hgtools>=5.0:../../devel/py-hgtools
+BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
+
+USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	keyring/cli.py
 
 post-install:
-	${MV} ${DESTDIR}${PREFIX}/bin/keyring ${DESTDIR}${PREFIX}/bin/keyring-${PYVERSSUFFIX} || ${TRUE}
+	cd ${DESTDIR}${PREFIX}/bin && ${MV} keyring keyring-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/security/py-keyring/PLIST b/security/py-keyring/PLIST
index c6499fb320c..754a7985a2e 100644
--- a/security/py-keyring/PLIST
+++ b/security/py-keyring/PLIST
@@ -1,23 +1,21 @@
-@comment $NetBSD: PLIST,v 1.3 2015/01/11 20:59:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/10/18 07:22:53 adam Exp $
 bin/keyring-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/namespace_packages.txt
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/keyring/__init__.py
 ${PYSITELIB}/keyring/__init__.pyc
 ${PYSITELIB}/keyring/__init__.pyo
+${PYSITELIB}/keyring/__main__.py
+${PYSITELIB}/keyring/__main__.pyc
+${PYSITELIB}/keyring/__main__.pyo
 ${PYSITELIB}/keyring/backend.py
 ${PYSITELIB}/keyring/backend.pyc
 ${PYSITELIB}/keyring/backend.pyo
-${PYSITELIB}/keyring/backends/Gnome.py
-${PYSITELIB}/keyring/backends/Gnome.pyc
-${PYSITELIB}/keyring/backends/Gnome.pyo
-${PYSITELIB}/keyring/backends/Google.py
-${PYSITELIB}/keyring/backends/Google.pyc
-${PYSITELIB}/keyring/backends/Google.pyo
 ${PYSITELIB}/keyring/backends/OS_X.py
 ${PYSITELIB}/keyring/backends/OS_X.pyc
 ${PYSITELIB}/keyring/backends/OS_X.pyo
@@ -27,27 +25,18 @@ ${PYSITELIB}/keyring/backends/SecretService.pyo
 ${PYSITELIB}/keyring/backends/Windows.py
 ${PYSITELIB}/keyring/backends/Windows.pyc
 ${PYSITELIB}/keyring/backends/Windows.pyo
+${PYSITELIB}/keyring/backends/_OS_X_API.py
+${PYSITELIB}/keyring/backends/_OS_X_API.pyc
+${PYSITELIB}/keyring/backends/_OS_X_API.pyo
 ${PYSITELIB}/keyring/backends/__init__.py
 ${PYSITELIB}/keyring/backends/__init__.pyc
 ${PYSITELIB}/keyring/backends/__init__.pyo
-${PYSITELIB}/keyring/backends/_win_crypto.py
-${PYSITELIB}/keyring/backends/_win_crypto.pyc
-${PYSITELIB}/keyring/backends/_win_crypto.pyo
-${PYSITELIB}/keyring/backends/file.py
-${PYSITELIB}/keyring/backends/file.pyc
-${PYSITELIB}/keyring/backends/file.pyo
-${PYSITELIB}/keyring/backends/keyczar.py
-${PYSITELIB}/keyring/backends/keyczar.pyc
-${PYSITELIB}/keyring/backends/keyczar.pyo
+${PYSITELIB}/keyring/backends/fail.py
+${PYSITELIB}/keyring/backends/fail.pyc
+${PYSITELIB}/keyring/backends/fail.pyo
 ${PYSITELIB}/keyring/backends/kwallet.py
 ${PYSITELIB}/keyring/backends/kwallet.pyc
 ${PYSITELIB}/keyring/backends/kwallet.pyo
-${PYSITELIB}/keyring/backends/multi.py
-${PYSITELIB}/keyring/backends/multi.pyc
-${PYSITELIB}/keyring/backends/multi.pyo
-${PYSITELIB}/keyring/backends/pyfs.py
-${PYSITELIB}/keyring/backends/pyfs.pyc
-${PYSITELIB}/keyring/backends/pyfs.pyo
 ${PYSITELIB}/keyring/cli.py
 ${PYSITELIB}/keyring/cli.pyc
 ${PYSITELIB}/keyring/cli.pyo
@@ -57,6 +46,9 @@ ${PYSITELIB}/keyring/core.pyo
 ${PYSITELIB}/keyring/credentials.py
 ${PYSITELIB}/keyring/credentials.pyc
 ${PYSITELIB}/keyring/credentials.pyo
+${PYSITELIB}/keyring/devpi_client.py
+${PYSITELIB}/keyring/devpi_client.pyc
+${PYSITELIB}/keyring/devpi_client.pyo
 ${PYSITELIB}/keyring/errors.py
 ${PYSITELIB}/keyring/errors.pyc
 ${PYSITELIB}/keyring/errors.pyo
@@ -69,18 +61,15 @@ ${PYSITELIB}/keyring/http.pyo
 ${PYSITELIB}/keyring/py27compat.py
 ${PYSITELIB}/keyring/py27compat.pyc
 ${PYSITELIB}/keyring/py27compat.pyo
+${PYSITELIB}/keyring/py33compat.py
+${PYSITELIB}/keyring/py33compat.pyc
+${PYSITELIB}/keyring/py33compat.pyo
 ${PYSITELIB}/keyring/tests/__init__.py
 ${PYSITELIB}/keyring/tests/__init__.pyc
 ${PYSITELIB}/keyring/tests/__init__.pyo
 ${PYSITELIB}/keyring/tests/backends/__init__.py
 ${PYSITELIB}/keyring/tests/backends/__init__.pyc
 ${PYSITELIB}/keyring/tests/backends/__init__.pyo
-${PYSITELIB}/keyring/tests/backends/test_Gnome.py
-${PYSITELIB}/keyring/tests/backends/test_Gnome.pyc
-${PYSITELIB}/keyring/tests/backends/test_Gnome.pyo
-${PYSITELIB}/keyring/tests/backends/test_Google.py
-${PYSITELIB}/keyring/tests/backends/test_Google.pyc
-${PYSITELIB}/keyring/tests/backends/test_Google.pyo
 ${PYSITELIB}/keyring/tests/backends/test_OS_X.py
 ${PYSITELIB}/keyring/tests/backends/test_OS_X.pyc
 ${PYSITELIB}/keyring/tests/backends/test_OS_X.pyo
@@ -90,51 +79,15 @@ ${PYSITELIB}/keyring/tests/backends/test_SecretService.pyo
 ${PYSITELIB}/keyring/tests/backends/test_Windows.py
 ${PYSITELIB}/keyring/tests/backends/test_Windows.pyc
 ${PYSITELIB}/keyring/tests/backends/test_Windows.pyo
-${PYSITELIB}/keyring/tests/backends/test_crypto.py
-${PYSITELIB}/keyring/tests/backends/test_crypto.pyc
-${PYSITELIB}/keyring/tests/backends/test_crypto.pyo
-${PYSITELIB}/keyring/tests/backends/test_file.py
-${PYSITELIB}/keyring/tests/backends/test_file.pyc
-${PYSITELIB}/keyring/tests/backends/test_file.pyo
-${PYSITELIB}/keyring/tests/backends/test_keyczar.py
-${PYSITELIB}/keyring/tests/backends/test_keyczar.pyc
-${PYSITELIB}/keyring/tests/backends/test_keyczar.pyo
 ${PYSITELIB}/keyring/tests/backends/test_kwallet.py
 ${PYSITELIB}/keyring/tests/backends/test_kwallet.pyc
 ${PYSITELIB}/keyring/tests/backends/test_kwallet.pyo
-${PYSITELIB}/keyring/tests/backends/test_multi.py
-${PYSITELIB}/keyring/tests/backends/test_multi.pyc
-${PYSITELIB}/keyring/tests/backends/test_multi.pyo
-${PYSITELIB}/keyring/tests/backends/test_pyfs.py
-${PYSITELIB}/keyring/tests/backends/test_pyfs.pyc
-${PYSITELIB}/keyring/tests/backends/test_pyfs.pyo
-${PYSITELIB}/keyring/tests/mocks.py
-${PYSITELIB}/keyring/tests/mocks.pyc
-${PYSITELIB}/keyring/tests/mocks.pyo
-${PYSITELIB}/keyring/tests/py30compat.py
-${PYSITELIB}/keyring/tests/py30compat.pyc
-${PYSITELIB}/keyring/tests/py30compat.pyo
-${PYSITELIB}/keyring/tests/test_XDG.py
-${PYSITELIB}/keyring/tests/test_XDG.pyc
-${PYSITELIB}/keyring/tests/test_XDG.pyo
 ${PYSITELIB}/keyring/tests/test_backend.py
 ${PYSITELIB}/keyring/tests/test_backend.pyc
 ${PYSITELIB}/keyring/tests/test_backend.pyo
-${PYSITELIB}/keyring/tests/test_cli.py
-${PYSITELIB}/keyring/tests/test_cli.pyc
-${PYSITELIB}/keyring/tests/test_cli.pyo
-${PYSITELIB}/keyring/tests/test_core.py
-${PYSITELIB}/keyring/tests/test_core.pyc
-${PYSITELIB}/keyring/tests/test_core.pyo
-${PYSITELIB}/keyring/tests/test_util.py
-${PYSITELIB}/keyring/tests/test_util.pyc
-${PYSITELIB}/keyring/tests/test_util.pyo
 ${PYSITELIB}/keyring/tests/util.py
 ${PYSITELIB}/keyring/tests/util.pyc
 ${PYSITELIB}/keyring/tests/util.pyo
-${PYSITELIB}/keyring/util/XDG.py
-${PYSITELIB}/keyring/util/XDG.pyc
-${PYSITELIB}/keyring/util/XDG.pyo
 ${PYSITELIB}/keyring/util/__init__.py
 ${PYSITELIB}/keyring/util/__init__.pyc
 ${PYSITELIB}/keyring/util/__init__.pyo
diff --git a/security/py-keyring/distinfo b/security/py-keyring/distinfo
index 02e1a5f741b..2a0dbb2b794 100644
--- a/security/py-keyring/distinfo
+++ b/security/py-keyring/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:18:04 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/10/18 07:22:53 adam Exp $
 
-SHA1 (keyring-5.3.zip) = 0c55f45144181adc634ce20309a5a60dfd0cd54b
-RMD160 (keyring-5.3.zip) = 44596ec4d492c662675a07110046284c0a350731
-SHA512 (keyring-5.3.zip) = d7e028471dd52fece857788ac21adc202ea2a1545d97487f39bedeb4e72cbd51f717a015b31b64ee7c27c447c9dcaddf83f24698ed0fc9a2b357c7ce033c160b
-Size (keyring-5.3.zip) = 87921 bytes
+SHA1 (keyring-10.4.0.tar.gz) = 485136b7b239c69b75c26524de20cbce5a61e759
+RMD160 (keyring-10.4.0.tar.gz) = 2fcd27c2cb600cbf8ec551517af842113de350e8
+SHA512 (keyring-10.4.0.tar.gz) = 34b1503588fedd480b2031d5557349bc6cd70108e68205a38338e091d2865df512f9a9aa3525fb11fbbb9bc06b2cfa759685495ca94b4044ec034070aa3dc0bb
+Size (keyring-10.4.0.tar.gz) = 39632 bytes