gentoo resync : 19.01.2018

4 files changed, 10 insertions, 40 deletions

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index c040da27a64d..da07dc9a5294 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,9 +1,7 @@
 DIST PyICU-1.9.5.tar.gz 181878 BLAKE2B 519f507ef44ae7dead0b88ae048eb6bc47c0acd069590185cf72e558e3bd9712574e20319c3a5246c1cf0400bc6ccff1a6c7df7ffa4f94d7194f08069440e2cc SHA512 19fb3222a68cc67e92ea4171257d00c9a322f993f1303a4432b5c3c4efda32ff4c2372027cf9f3fd31d3dc3cf3bcbcb957dfa420039591044812f0213684e885
-DIST PyICU-1.9.7.tar.gz 183235 BLAKE2B c5ac7294f7769f3228a00b7bd4608b078355032c6780e2a70dd719de9eb59e0df067b7d332252ae48dda276537e9575c1f7fa9d33a7655e25030051e8e646b57 SHA512 ac4b9fa6e73eac9e223d4d3758a80611e4e4d78812b88b6ffb20f4b26012dc794cc242a0307cf16597677a552987dbfec3d047cf836f039721bbebab468c76f2
 DIST PyICU-1.9.8.tar.gz 183432 BLAKE2B c2e28a123e56ea99ed90160c1bf91f6e779481929e968b5ed1e692fa1f66045225dfad09aa0b88980d4c9417e462bafa334e4957dce3d73e947ec4a6640e44ac SHA512 87a539168ef89c0b77219e9373fb304e95088a5410c64f7939c382d840bc021af0edfffce89d3212cc9642c31cff7e508b7f70ee83466bc84793287a8661f4e1
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
-EBUILD pyicu-1.9.5.ebuild 1253 BLAKE2B 7775db4e2c13c1e794924b2dc3d428fda9fa6c61719ecf07c1759879f8e1d8d73ada60d4d230e8e56a9e2d87b11d20afbcc65c879dd71a0f59a5b87a73ca1775 SHA512 105b89e547c99052fd4caa9cdeba88edb451fa0de4e49f2fa1cf91b938396383b12a7ebed42d05ae01e1e34506afe13dc8e183189d5bbc3afcd72a8d5580869d
-EBUILD pyicu-1.9.7.ebuild 669 BLAKE2B 63694b24ad73b8ac5e1eeffc4a338d6d4cad4c1bcf7f46a1c034c536ef9c7ac14423418fdfd3b694fe5e165447da13abd9b1baba2d8ec0d53f23cd230fc5456f SHA512 6bf242216967d27bcb6fc4b54f1cf63b68dfeede3c398225a84db064159e7a6c0f769bacec4f6a87e1c61f57a9d842e262a06f374ec1b2beb9b2372169d8eee8
+EBUILD pyicu-1.9.5.ebuild 1257 BLAKE2B 72b335e3842b3bf99c397f3aea2e9e4a9c84d61c9aefd82648a74a6cea3e779f92384c74ae9a62d1351cf54cea06fd628996dbdd9bdbc4143eaabb1f2b657116 SHA512 3a90ca2a55c0a0c9dc2f6de4b03b146604a3cf2343f258101c28801498215abc274807851ca6da52b21b8b5d899096c02cbc3ecc83582d3721ced65561bebee5
 EBUILD pyicu-1.9.8.ebuild 669 BLAKE2B 63694b24ad73b8ac5e1eeffc4a338d6d4cad4c1bcf7f46a1c034c536ef9c7ac14423418fdfd3b694fe5e165447da13abd9b1baba2d8ec0d53f23cd230fc5456f SHA512 6bf242216967d27bcb6fc4b54f1cf63b68dfeede3c398225a84db064159e7a6c0f769bacec4f6a87e1c61f57a9d842e262a06f374ec1b2beb9b2372169d8eee8
-EBUILD pyicu-2.0.2.ebuild 666 BLAKE2B ba6ab29b12a52cc35fad6e81b0fdd68f73cc055f4bf17231206c773adaa521685e36f7697e6e6f7f38af14530bbdf54ce57bde90367f451734e8edcc8fcc1ce2 SHA512 b22f9bccf54a0a2722df28cc19dcadb3f54db9e62dda2bfa561429510535ac82735d6d0e3f4dd8f095fa26e4da0e72e7f781d154b6c1e77f5dfcf5dfce3217a2
+EBUILD pyicu-2.0.2.ebuild 807 BLAKE2B 2f934c2d50eb185e37ef969978dd34deb4f52b79874d26774c67e800c8819587c56d5409a0a02a776a1dcf48ff74a7f5cfaeaf90eaf8a602bbed488df72ae873 SHA512 61687a7c54d95143770b31b4c14e2728dc820e3a2880c25c0f9a4be0fbe60d9cbde1826148c5412e5b8941013d49bdef9c8bd5970d0cbd3fd70a63dbb9097ab0
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-1.9.5.ebuild b/dev-python/pyicu/pyicu-1.9.5.ebuild
index a6ccb72671c8..df826c4fe4c9 100644
--- a/dev-python/pyicu/pyicu-1.9.5.ebuild
+++ b/dev-python/pyicu/pyicu-1.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/icu
+	<dev-libs/icu-59
 "
 # epydoc supports only python2*
 DEPEND="${RDEPEND}
diff --git a/dev-python/pyicu/pyicu-1.9.7.ebuild b/dev-python/pyicu/pyicu-1.9.7.ebuild
deleted file mode 100644
index 887fb5aa2957..000000000000
--- a/dev-python/pyicu/pyicu-1.9.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
-
-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}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyicu/pyicu-2.0.2.ebuild b/dev-python/pyicu/pyicu-2.0.2.ebuild
index 1e6ff018f986..4dc247fee2d4 100644
--- a/dev-python/pyicu/pyicu-2.0.2.ebuild
+++ b/dev-python/pyicu/pyicu-2.0.2.ebuild
@@ -31,5 +31,10 @@ S="${WORKDIR}/${MY_P}"
 DOCS=(CHANGES CREDITS README.md)
 
 python_test() {
-	esetup.py test
+	if [[ ${EPYTHON} == python2* ]]; then
+		# See Bug #644226
+		ewarn "Skipping tests for ${EPYTHON} because they are known to fail"
+	else
+		esetup.py test
+	fi
 }