gentoo resync : 30.09.2018

3 files changed, 46 insertions, 1 deletions

diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index 8694a7cfa401..f739cd278862 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,3 +1,4 @@
+AUX b1a5f925527093b0b5c11507f379a908e3354820.patch 1339 BLAKE2B 0dc159ac56179f13c528a13ad617d1ac52e65b4cc9be59bf6374adcb1ce787ffdc960bc70cc5dcd6287bd9bde4157f0ed1bb1511d2021a476ac61ce9428c2dd1 SHA512 477fc02354cacc75bfc341257caaac23501381c1e233a84a1e0973c98eba350c7cfa1a15503130f3059c0a239c20d5bb5fbde40b754785581c287fadc0183701
 DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
-EBUILD citeproc-py-0.4.0.ebuild 474 BLAKE2B 07a3dae0cacfefc6ea5a805b7d762f6690fdb014d765aa714249cb48d0a12430da77c1703dce3d8692b9427d5287b56b1b6b3c13349ea1847c9d13677749f7cf SHA512 7f1097290dc6692005f7a4d5af2cf11818bbda1ce66767bbfd1f9e3cc5fc6da200e332981f3540b37c4797b52b31dc6eba8ce72668765881c83d04f3bdf33d73
+EBUILD citeproc-py-0.4.0.ebuild 548 BLAKE2B b2c7cb67570a9c1e36ef48d3ab77d85773ae7a17e28b97579434637cda9fdff5f554460333b424366778a58ab662060ecdc7870622e87b13a65e72c9fa57b68d SHA512 249d1fb7f67ec1c59959d39ce1d4dc2e41b003b8ff9e559c58c654dca4aa44e056ede9c52cfd9c24e114df58432637ee7d4324eec2f724efc43b9325c87de803
 MISC metadata.xml 433 BLAKE2B f512298eb65cda00ae88968b103a176640dd993d5e1815a1b414167f90014a74957b2043f7177d3f9ffb7b58cabbfae42cf06894e3247ab65d6ce11ec362477b SHA512 375292332cd82155673005e0a0d189120fadacf98e81f181b9540f40915147e895b7ce5fa3bcf1e924c08619944b65b28745f9b76ee520877abf3c6d94a690fd
diff --git a/dev-python/citeproc-py/citeproc-py-0.4.0.ebuild b/dev-python/citeproc-py/citeproc-py-0.4.0.ebuild
index 47823b835241..56f3fc4dce87 100644
--- a/dev-python/citeproc-py/citeproc-py-0.4.0.ebuild
+++ b/dev-python/citeproc-py/citeproc-py-0.4.0.ebuild
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/b1a5f925527093b0b5c11507f379a908e3354820.patch" )
+
 DEPEND="
 	dev-python/rnc2rng[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]"
diff --git a/dev-python/citeproc-py/files/b1a5f925527093b0b5c11507f379a908e3354820.patch b/dev-python/citeproc-py/files/b1a5f925527093b0b5c11507f379a908e3354820.patch
new file mode 100644
index 000000000000..b3b6e0fe074a
--- /dev/null
+++ b/dev-python/citeproc-py/files/b1a5f925527093b0b5c11507f379a908e3354820.patch
@@ -0,0 +1,42 @@
+From b1a5f925527093b0b5c11507f379a908e3354820 Mon Sep 17 00:00:00 2001
+From: Brecht Machiels <brecht@mos6581.org>
+Date: Tue, 22 May 2018 12:57:47 +0200
+Subject: [PATCH] rnc2rng 2.6.1 handles rnc file encoding (fixes #81)
+
+---
+ setup.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index dbaad6d..774932b 100755
+--- a/setup.py
++++ b/setup.py
+@@ -9,6 +9,7 @@
+ import sys
+ 
+ from datetime import datetime
++from io import open
+ from subprocess import Popen, PIPE
+ from setuptools import setup, find_packages
+ from setuptools.command.build_py import build_py
+@@ -63,9 +64,8 @@ def convert_rnc():
+     import rnc2rng
+ 
+     filename_root, _ = os.path.splitext(CSL_SCHEMA_RNC)
+-    with open(CSL_SCHEMA_RNC, 'r') as rnc:
+-        root = rnc2rng.load(rnc)
+-    with open(filename_root + '.rng', 'w') as rng:
++    root = rnc2rng.load(CSL_SCHEMA_RNC)
++    with open(filename_root + '.rng', 'w', encoding='utf-8') as rng:
+         rnc2rng.dump(root, rng)
+ 
+ 
+@@ -91,7 +91,7 @@ def run(self):
+                             'data/schema/*.rng',
+                             'data/styles/*.csl']},
+     scripts=['bin/csl_unsorted'],
+-    setup_requires=['rnc2rng>=2.2'],
++    setup_requires=['rnc2rng>=2.6.1'],
+     install_requires=['lxml'],
+     provides=[PACKAGE],
+     #test_suite='nose.collector',