py-cookiecutter: use upstream fix for C locale.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Feb 25 23:30:50 2016 +0100
Changeset:	eff3b6694214537aa44d07ce71d1b1681ee880f2

Modified Files:
	py-cookiecutter/distinfo
	py-cookiecutter/patches/patch-setup.py

Log Message:
py-cookiecutter: use upstream fix for C locale.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eff3b6694214537aa44d07ce71d1b1681ee880f2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-cookiecutter/distinfo               |  2 +-
 py-cookiecutter/patches/patch-setup.py | 40 ++++++++++++++++++----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diffs:
diff --git a/py-cookiecutter/distinfo b/py-cookiecutter/distinfo
index 6972d91..9db59f1 100644
--- a/py-cookiecutter/distinfo
+++ b/py-cookiecutter/distinfo
@@ -5,4 +5,4 @@ RMD160 (cookiecutter-1.3.0.zip) = 0f402dee6e5dd85b689dcc8c473fc755cd7d029b
 SHA512 (cookiecutter-1.3.0.zip) = 540300e917b1f91c9936d799e2ac3afd61ff8eb95639dc31dc61fd9aece6f9f283dd688a3ac780c5cb6eae299a85fbb89e1cf78cdefdd14501a9debff83eddfe
 Size (cookiecutter-1.3.0.zip) = 274125 bytes
 SHA1 (patch-docs_Makefile) = c0451b26ea79a8ebd7ca0f733264806fea84857d
-SHA1 (patch-setup.py) = 0e0b5075e9775ea089a9780f61bea20a9efd8ef6
+SHA1 (patch-setup.py) = 1dd484db3ebb1202ead6a2bf48746751c5e1ab2b
diff --git a/py-cookiecutter/patches/patch-setup.py b/py-cookiecutter/patches/patch-setup.py
index dafcbc1..000ed4c 100644
--- a/py-cookiecutter/patches/patch-setup.py
+++ b/py-cookiecutter/patches/patch-setup.py
@@ -1,26 +1,28 @@
 $NetBSD$
 
-Remove history file to make this build in C locales.
-Waiting a workaround: https://github.com/audreyr/cookiecutter/pull/638
+Fix build with python-3.x and C locale.
+https://github.com/audreyr/cookiecutter/pull/639
 
---- setup.py.orig	2016-02-16 08:36:10.000000000 +0100
-+++ setup.py	2016-02-16 08:34:17.000000000 +0100
-@@ -23,9 +23,6 @@
- with open('README.rst') as readme_file:
+--- setup.py.orig	2015-11-10 22:47:32.000000000 +0000
++++ setup.py
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python
+ 
+ import os
++import io
+ import sys
+ 
+ try:
+@@ -20,10 +21,10 @@ if sys.argv[-1] == 'tag':
+     os.system("git push --tags")
+     sys.exit()
+ 
+-with open('README.rst') as readme_file:
++with io.open('README.rst', 'r', encoding='utf-8') as readme_file:
      readme = readme_file.read()
  
 -with open('HISTORY.rst') as history_file:
--    history = history_file.read().replace('.. :changelog:', '')
--
- requirements = [
-     'future>=0.15.2',
-     'binaryornot>=0.2.0',
-@@ -34,7 +31,7 @@
-     'whichcraft>=0.1.1'
- ]
- 
--long_description = readme + '\n\n' + history
-+long_description = readme
++with io.open('HISTORY.rst', 'r', encoding='utf-8') as history_file:
+     history = history_file.read().replace('.. :changelog:', '')
  
- if sys.argv[-1] == 'readme':
-     print(long_description)
+ requirements = [