gentoo resync : 15.01.2020

5 files changed, 63 insertions, 6 deletions

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index ee53b4aa3f63..85f875bfec0c 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,6 +1,9 @@
 AUX pyicu-2.3.1-testSurrogatePairs_workaround.patch 1474 BLAKE2B 7b9ab4f4c0021f8e987830966551cfd2a128a0dc964f0c45c80d74a171c6093d2cda4b9a18baddf40c264bb66c2d8765e1d78603a75db4be1af4044b817be767 SHA512 59f54524b0d8dbe6c146685901db30f50fe04f2438ca64c824cb97e737eaa74c831e736ec90f376b66a1d8c69e0cdd76d0743a940a374dda342322e70210246a
+AUX pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch 489 BLAKE2B c88ffa0b90c8201450e6d404c25381ec04ea92bf4ca457e0268c03f18c7416cbe406206998f140d27b4975786dd1dd37e166d7de2848ddb34ced80db87a51651 SHA512 3bc754eb0fa70f5b4a88d5a547bc97a2813a78daf0afa1489842aee6e63d7d1933911b18ba88719208463ccd44f318d9f4bc850aef1e762e4d2bf35e20b36951
 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.3.1.ebuild 787 BLAKE2B 5c77298af5013e40380c5b7b5d9a180f108eba55991b53bdaf6ec8423f735c49e215faa3843f0c620ea9d65f460859f10c9f108ae9b6496f69a8cc18114f41e2 SHA512 89f81c7e830cca17ce56ce9b82f97fae1e45dcd7c5eda5a88350a344006b347f85f139cfc07d976a293529bd9fc189dac92fd6eec867b9e2a6e75b4c05e481be
-EBUILD pyicu-2.3.ebuild 847 BLAKE2B 9bc49ccf574413e41d528c6cb07479a779a3ba6f8ec75694bb4a090dcb4327160324599488538b992d82e5070fbc585992b277f06db104691879d50adde9649a SHA512 e5a27af0360143587d228926eaa2de29e8f9479d3ad112ac91c10877302bca5d57870818e9ee1c4057330599c9bdd9b2126dfe080e5f385966143646fb68fd3e
+DIST PyICU-2.4.2.tar.gz 219356 BLAKE2B dc6ad1e8944e43560314e9dbfcd37e58b52b50874656f7ca66497a317b03bb9bf988515417660be87bb2e73e0484e5870cd3db2c5eab47fda1223e7514935fb0 SHA512 3cd1f632c2551dce3d721c54190a19c2a46e2554ef54915c9e07b133fa4a499b1a8c49f406abe9777721903799eb23a2d55d3b1aadd758870f8bd591f143a05b
+EBUILD pyicu-2.3.1.ebuild 785 BLAKE2B 04bf55c6ae86a69e7a28ccb7f84a85c17c4db2dcbb80cd89f2dbf60dea13c49ae51494b011b5f50a8ce51bf7bebf20903c8934c4d13fcf4ef925e45ba645b79d SHA512 bb29584503c784ba7a88bcf8c7499a2a9a23c5888943107cd64c71343662e046ca7058f9d24afe191c98fd9a3b5a59f695650452a342ca897c161b029d8a7f4f
+EBUILD pyicu-2.3.ebuild 845 BLAKE2B d9da30f3d1a1b140fa57dc4141bf00c0dac63220cde34189192e997453d51865a33c460526fe6e8fe894c8daa1174738fad304ea093a2549508f82e90c76c9ee SHA512 356fc3125222240ea87ccb50c35daf695e33ce931592fc80077a0acb5c97c08fae00108373f6f81c77cf0c35c0fb42a84633176bf0c1079273480cbe65a05bd1
+EBUILD pyicu-2.4.2.ebuild 685 BLAKE2B 6a9b23736c5aeaa0538b5985c06baadb82f85e7cdad078217cdf2a5cbf2de5cd172addb8859ee81528890ce221e4f93f7149039983b5faf1ec28b09cc32fa50e SHA512 5a76d1b93d464f207684ab334444f418af9dfe16677750c47601bf12c444ef80ed06266ee9c162be4fb58ac89a841cb1d21712d2bd023dbf42ce7e1b56de981c
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch b/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch
new file mode 100644
index 000000000000..ab1fed8dc7f1
--- /dev/null
+++ b/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch
@@ -0,0 +1,17 @@
+--- a/test/test_LocaleMatcher.py
++++ b/test/test_LocaleMatcher.py
+@@ -21,11 +21,13 @@
+ # DEALINGS IN THE SOFTWARE.
+ # ====================================================================
+ 
+-import sys, os, six
++import sys, os, six, pytest
+ 
+ from unittest import TestCase, main
+ from icu import *
+ 
++@pytest.mark.skipif(ICU_VERSION < '65.0',
++                    reason='ICU too old for LocaleMatcher support')
+ class TestLocaleMatcher(TestCase):
+ 
+     def testSetSupportedLocales(self):
diff --git a/dev-python/pyicu/pyicu-2.3.1.ebuild b/dev-python/pyicu/pyicu-2.3.1.ebuild
index b4d01d5c5350..900deaced5b1 100644
--- a/dev-python/pyicu/pyicu-2.3.1.ebuild
+++ b/dev-python/pyicu/pyicu-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyicu/pyicu-2.3.ebuild b/dev-python/pyicu/pyicu-2.3.ebuild
index 5cb1c22282a1..d8979e1a150c 100644
--- a/dev-python/pyicu/pyicu-2.3.ebuild
+++ b/dev-python/pyicu/pyicu-2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyicu/pyicu-2.4.2.ebuild b/dev-python/pyicu/pyicu-2.4.2.ebuild
new file mode 100644
index 000000000000..f4acff57c10f
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.4.2.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=( python3_{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"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/icu:="
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+		${RDEPEND}
+		dev-python/six
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.2-testLocaleMatcher_pytest_old_icu.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+distutils_enable_tests pytest