Correctly build as Python Egg.

4 files changed, 76 insertions, 75 deletions

diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile
index d50f7c571ed..0acbbec71fb 100644
--- a/security/py-oauthlib/Makefile
+++ b/security/py-oauthlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/05/08 15:18:10 imil Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:44 joerg Exp $
 
 DISTNAME=	oauthlib-0.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,5 +12,5 @@ LICENSE=	original-bsd
 
 USE_LANGUAGES=	# none
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-oauthlib/PLIST b/security/py-oauthlib/PLIST
index 044d09d49b1..a76dc49a038 100644
--- a/security/py-oauthlib/PLIST
+++ b/security/py-oauthlib/PLIST
@@ -1,138 +1,138 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/08 15:18:10 imil Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2014/05/13 17:08:44 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/oauthlib/__init__.py
 ${PYSITELIB}/oauthlib/__init__.pyc
 ${PYSITELIB}/oauthlib/__init__.pyo
+${PYSITELIB}/oauthlib/common.py
 ${PYSITELIB}/oauthlib/common.pyc
 ${PYSITELIB}/oauthlib/common.pyo
-${PYSITELIB}/oauthlib/uri_validate.pyc
-${PYSITELIB}/oauthlib/uri_validate.pyo
-${PYSITELIB}/oauthlib/common.py
 ${PYSITELIB}/oauthlib/oauth1/__init__.py
 ${PYSITELIB}/oauthlib/oauth1/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth1/__init__.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/__init__.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/__init__.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.pyc
-${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/__init__.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/__init__.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/access_token.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/access_token.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/access_token.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/authorization.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/authorization.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/authorization.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/base.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/base.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/base.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/pre_configured.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/pre_configured.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/request_token.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/request_token.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/request_token.pyo
+${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/resource.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/resource.pyc
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/resource.pyo
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/access_token.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/authorization.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/base.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/request_token.py
-${PYSITELIB}/oauthlib/oauth1/rfc5849/endpoints/resource.py
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/errors.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/parameters.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/request_validator.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/signature.pyo
 ${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.py
+${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.pyc
+${PYSITELIB}/oauthlib/oauth1/rfc5849/utils.pyo
 ${PYSITELIB}/oauthlib/oauth2/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/__init__.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/__init__.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.pyc
-${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/__init__.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/backend_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/backend_application.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/backend_application.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/base.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/base.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/base.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/legacy_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/legacy_application.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/legacy_application.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/mobile_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/mobile_application.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/mobile_application.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/web_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/web_application.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/web_application.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/backend_application.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/base.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/legacy_application.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/mobile_application.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/clients/web_application.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/__init__.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/authorization.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/authorization.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/authorization.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/base.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/base.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/base.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/pre_configured.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/pre_configured.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/resource.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/resource.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/resource.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/revocation.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/revocation.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/revocation.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/token.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/token.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/token.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/authorization.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/base.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/resource.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/revocation.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/endpoints/token.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/errors.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/__init__.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/__init__.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/__init__.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/authorization_code.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/authorization_code.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/base.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/base.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/base.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/client_credentials.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/client_credentials.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/implicit.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/implicit.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/implicit.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/refresh_token.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/refresh_token.pyo
+${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.pyc
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.pyo
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/base.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/implicit.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
-${PYSITELIB}/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/parameters.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/request_validator.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/tokens.pyo
 ${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.py
+${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.pyc
+${PYSITELIB}/oauthlib/oauth2/rfc6749/utils.pyo
 ${PYSITELIB}/oauthlib/uri_validate.py
+${PYSITELIB}/oauthlib/uri_validate.pyc
+${PYSITELIB}/oauthlib/uri_validate.pyo
diff --git a/security/py-requests-oauthlib/Makefile b/security/py-requests-oauthlib/Makefile
index 43a8bb92d3a..fa3917e341f 100644
--- a/security/py-requests-oauthlib/Makefile
+++ b/security/py-requests-oauthlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/05/08 15:25:54 imil Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/13 17:08:45 joerg Exp $
 
 DISTNAME=	requests-oauthlib-0.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+EGG_NAME=	${DISTNAME:S,-,_,}
 CATEGORIES=	security
 MASTER_SITES=	https://pypi.python.org/packages/source/r/requests-oauthlib/
 
@@ -15,5 +16,5 @@ USE_LANGUAGES=	# none
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.2.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-oauthlib>=0.6.1:../../security/py-oauthlib
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-requests-oauthlib/PLIST b/security/py-requests-oauthlib/PLIST
index b5a09da501b..bfd432bca1c 100644
--- a/security/py-requests-oauthlib/PLIST
+++ b/security/py-requests-oauthlib/PLIST
@@ -1,34 +1,34 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/08 15:25:54 imil Exp $
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/PKG-INFO
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/SOURCES.txt
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/dependency_links.txt
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/not-zip-safe
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/requires.txt
-${PYSITELIB}/requests_oauthlib-${PKGVERSION}-py3.3.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2014/05/13 17:08:45 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/requests_oauthlib/__init__.py
 ${PYSITELIB}/requests_oauthlib/__init__.pyc
 ${PYSITELIB}/requests_oauthlib/__init__.pyo
-${PYSITELIB}/requests_oauthlib/oauth1_auth.pyc
-${PYSITELIB}/requests_oauthlib/oauth1_auth.pyo
-${PYSITELIB}/requests_oauthlib/oauth1_session.pyc
-${PYSITELIB}/requests_oauthlib/oauth1_session.pyo
-${PYSITELIB}/requests_oauthlib/oauth2_auth.pyc
-${PYSITELIB}/requests_oauthlib/oauth2_auth.pyo
-${PYSITELIB}/requests_oauthlib/oauth2_session.pyc
-${PYSITELIB}/requests_oauthlib/oauth2_session.pyo
-${PYSITELIB}/requests_oauthlib/utils.pyc
-${PYSITELIB}/requests_oauthlib/utils.pyo
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/__init__.py
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/__init__.pyc
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/__init__.pyo
+${PYSITELIB}/requests_oauthlib/compliance_fixes/facebook.py
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/facebook.pyc
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/facebook.pyo
+${PYSITELIB}/requests_oauthlib/compliance_fixes/linkedin.py
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/linkedin.pyc
 ${PYSITELIB}/requests_oauthlib/compliance_fixes/linkedin.pyo
-${PYSITELIB}/requests_oauthlib/compliance_fixes/facebook.py
-${PYSITELIB}/requests_oauthlib/compliance_fixes/linkedin.py
 ${PYSITELIB}/requests_oauthlib/oauth1_auth.py
+${PYSITELIB}/requests_oauthlib/oauth1_auth.pyc
+${PYSITELIB}/requests_oauthlib/oauth1_auth.pyo
 ${PYSITELIB}/requests_oauthlib/oauth1_session.py
+${PYSITELIB}/requests_oauthlib/oauth1_session.pyc
+${PYSITELIB}/requests_oauthlib/oauth1_session.pyo
 ${PYSITELIB}/requests_oauthlib/oauth2_auth.py
+${PYSITELIB}/requests_oauthlib/oauth2_auth.pyc
+${PYSITELIB}/requests_oauthlib/oauth2_auth.pyo
 ${PYSITELIB}/requests_oauthlib/oauth2_session.py
+${PYSITELIB}/requests_oauthlib/oauth2_session.pyc
+${PYSITELIB}/requests_oauthlib/oauth2_session.pyo
 ${PYSITELIB}/requests_oauthlib/utils.py
+${PYSITELIB}/requests_oauthlib/utils.pyc
+${PYSITELIB}/requests_oauthlib/utils.pyo