gentoo resync : 02.06.2019

3 files changed, 73 insertions, 0 deletions

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 3f3836fcbd40..717ad3e0abd7 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,8 @@
+AUX pyicu-2.3.1-testSurrogatePairs_workaround.patch 1474 BLAKE2B 7b9ab4f4c0021f8e987830966551cfd2a128a0dc964f0c45c80d74a171c6093d2cda4b9a18baddf40c264bb66c2d8765e1d78603a75db4be1af4044b817be767 SHA512 59f54524b0d8dbe6c146685901db30f50fe04f2438ca64c824cb97e737eaa74c831e736ec90f376b66a1d8c69e0cdd76d0743a940a374dda342322e70210246a
 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
 EBUILD pyicu-2.0.2.ebuild 798 BLAKE2B b014a5d1e6f71ba326121adf1456622a6d0747725a799dea851b5dbcb6be25b0e20164f7c6d39ea760004578969b636c25c37d4b853bde377484dc7a3634e36f SHA512 4f76c7e878bffd3976c8e2395208ec065b80b7c36fa35a159ae5d8d09db97c0fec23c91e804fdbca7561401e80e8de5a6bdd5f587a456b2da5f45b47067bc669
+EBUILD pyicu-2.3.1.ebuild 759 BLAKE2B c61cb5f74a3d86f9dd7e3a854684a272ec74a4c11f8c407ee566a3c1563ad2c127a1d37cd26516b94f96faffba65998ce2d86143168149f582d65b670be310fb SHA512 10c0654ae29ab091b0e496010b13a82f1960094a789d9d6d0cbc161e84cb0540afa4d3b90e50f01866044895d62cc20b6191cc6b019ed4d1257127cdb45f4b8a
 EBUILD pyicu-2.3.ebuild 821 BLAKE2B 67d8621c6f96db9580ecd62123fd2c41ef127b6042856d473a2d2ae911a6d9126f4adace4ddb2d32abd71332c0f0fa4f1fbfaf94eb6299c823f598ad9b89dc62 SHA512 c67f7bd407977b46b83bc2f0c76db926a1dc87da9035f4c666185464574c6e6b8bf61b08e362fc13f4b0349089c81e302253b722215c579a9e49e9af31f38ab6
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
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
+}