3 files changed, 68 insertions, 50 deletions

diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index 27dad8782eed..0dd3bb75cd01 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	keyring
-PORTVERSION=	0.6.2
+PORTVERSION=	0.7.1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,8 +18,9 @@ LICENSE=	PSFL
 
 LATEST_LINK=	py-${PORTNAME}
 
+USE_ZIP=	yes
 USE_PYTHON=	2.5+
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 
 OPTIONS=	GNOME_KEYRING "GNOME Keyring backend" Off \
 		KDE_KWALLET "KDE KWallet backend" Off
diff --git a/security/py-keyring/distinfo b/security/py-keyring/distinfo
index c70d854ab95e..1865ac47dc09 100644
--- a/security/py-keyring/distinfo
+++ b/security/py-keyring/distinfo
@@ -1,2 +1,2 @@
-SHA256 (keyring-0.6.2.tar.gz) = 67958427296147bf66560627578857ad4202deca419576aacc2dd67939b17ef8
-SIZE (keyring-0.6.2.tar.gz) = 21765
+SHA256 (keyring-0.7.1.zip) = 11487ff2549adfdb1203c113fca56f778aee54e9a0cec2e5d8cbb7289179cf1f
+SIZE (keyring-0.7.1.zip) = 40304
diff --git a/security/py-keyring/pkg-plist b/security/py-keyring/pkg-plist
index b4c64f4f23d3..cadc4744a948 100644
--- a/security/py-keyring/pkg-plist
+++ b/security/py-keyring/pkg-plist
@@ -1,46 +1,63 @@
-%%PYTHON_SITELIBDIR%%/keyring/__init__.py
-%%PYTHON_SITELIBDIR%%/keyring/__init__.pyc
-%%PYTHON_SITELIBDIR%%/keyring/__init__.pyo
-%%PYTHON_SITELIBDIR%%/keyring/backend.py
-%%PYTHON_SITELIBDIR%%/keyring/backend.pyc
-%%PYTHON_SITELIBDIR%%/keyring/backend.pyo
-%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.py
-%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyc
-%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyo
-%%PYTHON_SITELIBDIR%%/keyring/cli.py
-%%PYTHON_SITELIBDIR%%/keyring/cli.pyc
-%%PYTHON_SITELIBDIR%%/keyring/cli.pyo
-%%PYTHON_SITELIBDIR%%/keyring/core.py
-%%PYTHON_SITELIBDIR%%/keyring/core.pyc
-%%PYTHON_SITELIBDIR%%/keyring/core.pyo
-%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.py
-%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyc
-%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyo
-%%PYTHON_SITELIBDIR%%/keyring/http.py
-%%PYTHON_SITELIBDIR%%/keyring/http.pyc
-%%PYTHON_SITELIBDIR%%/keyring/http.pyo
-%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.py
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyc
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyo
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_cli.py
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_cli.pyc
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_cli.pyo
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_core.py
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_core.pyc
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_core.pyo
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_util.py
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_util.pyc
-%%PYTHON_SITELIBDIR%%/keyring/tests/test_util.pyo
-%%PYTHON_SITELIBDIR%%/keyring/util/__init__.py
-%%PYTHON_SITELIBDIR%%/keyring/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/keyring/util/__init__.pyo
-%%PYTHON_SITELIBDIR%%/keyring/util/escape.py
-%%PYTHON_SITELIBDIR%%/keyring/util/escape.pyc
-%%PYTHON_SITELIBDIR%%/keyring/util/escape.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/keyring/backends
-@dirrm %%PYTHON_SITELIBDIR%%/keyring/tests
-@dirrm %%PYTHON_SITELIBDIR%%/keyring/util
-@dirrm %%PYTHON_SITELIBDIR%%/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/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/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/osx_keychain.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/osx_keychain.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/osx_keychain.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/win32_crypto.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/win32_crypto.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/win32_crypto.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/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/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/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/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/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
+@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%%