dev-python/pyicu: bump to 2.3.1

Includes backported upstream workaround for python2.7 test failure.

Bug: https://bugs.gentoo.org/644226
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

3 files changed, 71 insertions, 0 deletions

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 4696f3235b78..e1dfe1b8f09c 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,2 +1,3 @@
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
+DIST PyICU-2.3.1.tar.gz 214761 BLAKE2B 6571f1c10b6fa15b0b6fde76c16b2e1a1fa99af83db615aa7f7a172844183ca2a818747749b38e36162ff297c3e99311cd3328333880374c1c151955fe983f78 SHA512 edb60320ffe649f257d4d691ad9cc8287a7611de6a970d33a25a6e12a14c1faa591023d99d0b10619b0860bba70d1b67af2eff5cf146381afcaa872f0af1be29
 DIST PyICU-2.3.tar.gz 214710 BLAKE2B ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c SHA512 2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94
diff --git a/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch b/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
new file mode 100644
index 000000000000..3525cc16e966
--- /dev/null
+++ b/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
@@ -0,0 +1,33 @@
+--- a/test/test_Script.py
++++ b/test/test_Script.py
+@@ -40,12 +40,16 @@ class TestScript(TestCase):
+         if unicode_32bit:
+             self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
+         else:
+-            self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++            self.assertTrue(
++                (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++                (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+         pairs = UnicodeString(pairs)
+         # iterating UChar, not codepoints
+         names = [Script.getScript(c).getShortName() for c in pairs]
+-        self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++        self.assertTrue(
++            (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++            (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+         # iterating codepoints not UChar
+         names = [Script.getScript(cp).getShortName()
+@@ -53,7 +57,9 @@ class TestScript(TestCase):
+         if unicode_32bit:
+             self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
+         else:
+-            self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++            self.assertTrue(
++                (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++                (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+         # iterating codepoints, not UChar
+         names = [Script.getScript(pairs.char32At(i)).getShortName()
+
diff --git a/dev-python/pyicu/pyicu-2.3.1.ebuild b/dev-python/pyicu/pyicu-2.3.1.ebuild
new file mode 100644
index 000000000000..2e9d029a29e4
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/icu:="
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest
+		dev-python/six )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+# This will no longer be necessary in the next release
+PATCHES=( "${FILESDIR}"/${PN}-2.3.1-testSurrogatePairs_workaround.patch )
+
+python_test() {
+	esetup.py test
+}