Import of pkgsrc-2015Q1

www/py-flask-security/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:28 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/31 13:57:33 wiz Exp $
 
-DISTNAME=	Flask-Security-1.7.1
+DISTNAME=	Flask-Security-1.7.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www python
 MASTER_SITES=	http://pypi.python.org/packages/source/F/Flask-Security/
@@ -20,8 +20,6 @@ DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6.1:../../security/py-passlib
 
 USE_LANGUAGES=	# empty
 
-EGG_NAME=	${DISTNAME:S/-/_/}
-
 post-extract:
 	${FIND} ${WRKSRC} -type f -name .DS_Store -exec ${RM} {} \;
 

www/py-flask-security/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2014/01/24 09:49:34 kleink Exp $
+$NetBSD: distinfo,v 1.7 2014/10/23 14:34:42 kleink Exp $
 
-SHA1 (Flask-Security-1.7.1.tar.gz) = 2cfb80585b4021b79aabbe5998d4e240e37cf063
-RMD160 (Flask-Security-1.7.1.tar.gz) = 99548b9853db5d5a40ff6ff543b199b6f9210a26
-Size (Flask-Security-1.7.1.tar.gz) = 35202 bytes
-SHA1 (patch-flask_security_script.py) = b5991ce1bb272a4242c3e3b1a86b5f2e4bc3eb84
+SHA1 (Flask-Security-1.7.4.tar.gz) = 1e6f0ab0af8b62d6f63976eaa4bf72458b2807b7
+RMD160 (Flask-Security-1.7.4.tar.gz) = 88a032ccbc8df0c7361e7e5d24d4e2ca0286d39a
+Size (Flask-Security-1.7.4.tar.gz) = 41467 bytes

www/py-flask-security/patches/patch-flask_security_script.py

@@ -1,78 +0,0 @@
-$NetBSD: patch-flask_security_script.py,v 1.1 2014/01/24 09:49:34 kleink Exp $
-
---- flask_security/script.py.orig	2013-07-22 18:36:22.000000000 +0200
-+++ flask_security/script.py	2014-01-24 10:40:19.000000000 +0100
-@@ -8,6 +8,8 @@
-     :copyright: (c) 2012 by Matt Wright.
-     :license: MIT, see LICENSE for more details.
- """
-+from __future__ import print_function
-+
- try:
-     import simplejson as json
- except ImportError:
-@@ -26,7 +28,7 @@ _datastore = LocalProxy(lambda: current_
- 
- 
- def pprint(obj):
--    print json.dumps(obj, sort_keys=True, indent=4)
-+    print(json.dumps(obj, sort_keys=True, indent=4))
- 
- 
- def commit(fn):
-@@ -59,11 +61,11 @@ class CreateUserCommand(Command):
-         if form.validate():
-             kwargs['password'] = encrypt_password(kwargs['password'])
-             _datastore.create_user(**kwargs)
--            print 'User created successfully.'
-+            print('User created successfully.')
-             kwargs['password'] = '****'
-             pprint(kwargs)
-         else:
--            print 'Error creating user'
-+            print('Error creating user')
-             pprint(form.errors)
- 
- 
-@@ -78,7 +80,7 @@ class CreateRoleCommand(Command):
-     @commit
-     def run(self, **kwargs):
-         _datastore.create_role(**kwargs)
--        print 'Role "%(name)s" created successfully.' % kwargs
-+        print('Role "%(name)s" created successfully.' % kwargs)
- 
- 
- class _RoleCommand(Command):
-@@ -94,7 +96,7 @@ class AddRoleCommand(_RoleCommand):
-     @commit
-     def run(self, user_identifier, role_name):
-         _datastore.add_role_to_user(user_identifier, role_name)
--        print "Role '%s' added to user '%s' successfully" % (role_name, user_identifier)
-+        print("Role '%s' added to user '%s' successfully" % (role_name, user_identifier))
- 
- 
- class RemoveRoleCommand(_RoleCommand):
-@@ -103,7 +105,7 @@ class RemoveRoleCommand(_RoleCommand):
-     @commit
-     def run(self, user_identifier, role_name):
-         _datastore.remove_role_from_user(user_identifier, role_name)
--        print "Role '%s' removed from user '%s' successfully" % (role_name, user_identifier)
-+        print("Role '%s' removed from user '%s' successfully" % (role_name, user_identifier))
- 
- 
- class _ToggleActiveCommand(Command):
-@@ -118,7 +120,7 @@ class DeactivateUserCommand(_ToggleActiv
-     @commit
-     def run(self, user_identifier):
-         _datastore.deactivate_user(user_identifier)
--        print "User '%s' has been deactivated" % user_identifier
-+        print("User '%s' has been deactivated" % user_identifier)
- 
- 
- class ActivateUserCommand(_ToggleActiveCommand):
-@@ -127,4 +129,4 @@ class ActivateUserCommand(_ToggleActiveC
-     @commit
-     def run(self, user_identifier):
-         _datastore.activate_user(user_identifier)
--        print "User '%s' has been activated" % user_identifier
-+        print("User '%s' has been activated" % user_identifier)