- Update to 3.2.1

- Support STAGEDIR
- While I'm here, convert to new options helper

Changes:	https://pypi.python.org/pypi/keyring#changes
PR:		ports/184270
Submitted by:	Douglas William Thrift <douglas@douglasthrift.net> (maintainer)

3 files changed, 10 insertions, 183 deletions

diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index fbf14fe3181b..486b9f1bef4e 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	keyring
-PORTVERSION=	1.6.1
+PORTVERSION=	3.2.1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,6 +19,7 @@ LATEST_LINK=	py-${PORTNAME}
 USE_ZIP=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_AUTOPLIST=	yes
 
 OPTIONS_DEFINE=		CRYPT_FILE GNOME_KEYRING KDE_KWALLET KEYCZAR PYFS \
 			SECRET_SERVICE
@@ -28,32 +29,11 @@ KDE_KWALLET_DESC=	Install KDE KWallet to support the kwallet backend
 KEYCZAR_DESC=		Install keyczar to support keyring encryption
 PYFS_DESC=		Install pyfilesystem to support the pyfs backend
 SECRET_SERVICE_DESC=	Install SecretStorage to support the SecretService backend
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCRYPT_FILE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
-.endif
-
-.if ${PORT_OPTIONS:MGNOME_KEYRING}
-USE_GNOME+=	pygobject3
-.endif
-
-.if ${PORT_OPTIONS:MKDE_KWALLET}
-USE_KDE4+=	pykde4
-.endif
-
-.if ${PORT_OPTIONS:MKEYCZAR}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:${PORTSDIR}/security/py-keyczar
-.endif
-
-.if ${PORT_OPTIONS:MPYFS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}fs>=0.4.0:${PORTSDIR}/devel/py-fs
-.endif
-
-.if ${PORT_OPTIONS:MSECRET_SERVICE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:${PORTSDIR}/security/py-SecretStorage
-.endif
+CRYPT_FILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
+GNOME_KEYRING_USE=	GNOME=pygobject3
+KDE_KWALLET_USE=	KDE4=pykde4
+KEYCZAR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:${PORTSDIR}/security/py-keyczar
+PYFS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fs>=0.4.0:${PORTSDIR}/devel/py-fs
+SECRET_SERVICE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:${PORTSDIR}/security/py-SecretStorage
 
 .include <bsd.port.mk>
diff --git a/security/py-keyring/distinfo b/security/py-keyring/distinfo
index 40c7e3d8b362..c2f63ef0683c 100644
--- a/security/py-keyring/distinfo
+++ b/security/py-keyring/distinfo
@@ -1,2 +1,2 @@
-SHA256 (keyring-1.6.1.zip) = 720a53234749edf0c103e61abe07a16b2ad48b46295c96f58fb804158a739a04
-SIZE (keyring-1.6.1.zip) = 80183
+SHA256 (keyring-3.2.1.zip) = 047962a774393e60b4cf9d119400c7e83b99fa57f1bda898b4f5b4f7a228ab59
+SIZE (keyring-3.2.1.zip) = 94807
diff --git a/security/py-keyring/pkg-plist b/security/py-keyring/pkg-plist
deleted file mode 100644
index d62ee5463701..000000000000
--- a/security/py-keyring/pkg-plist
+++ /dev/null
@@ -1,153 +0,0 @@
-bin/keyring
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backend.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backend.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backend.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Gnome.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Gnome.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Gnome.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Google.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Google.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Google.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/OS_X.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/OS_X.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/OS_X.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/SecretService.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/SecretService.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/SecretService.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Windows.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Windows.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Windows.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/_win_crypto.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/_win_crypto.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/_win_crypto.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/file.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/file.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/file.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/keyczar.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/keyczar.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/keyczar.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/kwallet.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/kwallet.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/kwallet.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/multi.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/multi.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/multi.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/pyfs.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/pyfs.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/pyfs.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/cli.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/cli.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/cli.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/core.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/core.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/core.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/credentials.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/credentials.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/credentials.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/errors.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/errors.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/errors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/getpassbackend.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/getpassbackend.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/getpassbackend.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py27compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py27compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py27compat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Gnome.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Gnome.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Gnome.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Google.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Google.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Google.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_OS_X.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_OS_X.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_OS_X.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_SecretService.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_SecretService.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_SecretService.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Windows.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Windows.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Windows.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_crypto.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_crypto.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_crypto.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_file.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_file.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_file.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_keyczar.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_keyczar.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_keyczar.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_kwallet.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_kwallet.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_kwallet.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_multi.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_multi.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_multi.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_pyfs.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_pyfs.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_pyfs.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/mocks.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/mocks.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/mocks.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/py30compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/py30compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/py30compat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_backend.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_backend.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_backend.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_cli.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_cli.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_cli.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_core.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_core.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_core.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/escape.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/escape.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/escape.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/platform.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/platform.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/platform.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/properties.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/properties.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/properties.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%