gentoo Easter resync : 12.04.2020

5 files changed, 2 insertions, 125 deletions

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 14376da7653f..e02fb228efe7 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,9 +1,4 @@
-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
 DIST PyICU-2.4.2.tar.gz 219356 BLAKE2B dc6ad1e8944e43560314e9dbfcd37e58b52b50874656f7ca66497a317b03bb9bf988515417660be87bb2e73e0484e5870cd3db2c5eab47fda1223e7514935fb0 SHA512 3cd1f632c2551dce3d721c54190a19c2a46e2554ef54915c9e07b133fa4a499b1a8c49f406abe9777721903799eb23a2d55d3b1aadd758870f8bd591f143a05b
-EBUILD pyicu-2.3.1.ebuild 775 BLAKE2B 2f178c3ee4067460bd5a49d29ae9cc47bf6e78b614d17deb19caa6b652979d140cbf78a0bf7faae06ff2ae850116c6525feb8606ee4bc5620b8a6c8d2256524c SHA512 f7540a0c72afa119f7b212349239cd607f2ba95dc99d8c29aedb27a022406f52eb7d15ede90c0cab6bc8aa63164eb37584cf03e360263129f21a1ef3e6bfea12
-EBUILD pyicu-2.3.ebuild 835 BLAKE2B 52e39c7d72a82109a49f0d62eb0abf93deffff2ced36eea6de727100bf317e7db9e33c9ae8d9702ee2ad7c4f3f4cf12246ca6b09ff11827b38d7f5c901deff83 SHA512 15b1ca8d15cba3519fd489c006acfc1f40a01fcf8d53b6afb39607fb670a80dcc8c2758b30fca93fbd5de729eaf33c0f6c71edadf33a53ed659b94506698779e
-EBUILD pyicu-2.4.2.ebuild 687 BLAKE2B df7b23c0cde6640b834213ff3bafa424e781a50d13ef6b3481239fb9e6153301d932ea68c512a96bf11444ee3d57e6cb75e22acd9b821a6d8c32bce7ed8dbaba SHA512 a9ab9c9bf93e6c99b91041c2b53f8d1eb872e4fe610a36f4541c767cc1d107b0fbef4184d3861dc116f4f120c481c9fc4dbc9a726fa958d26f349104057dede0
+EBUILD pyicu-2.4.2.ebuild 634 BLAKE2B 16f4959e8b3584654c22d191318b43b347cdd78d76edbfee25e834bc687a68805a39d05340641bf7b286419b9e91a10f25feddc40e2dc64ff0e6178e58fc1e79 SHA512 3f9926f85534618794aa533fd6e99b76403dbcfcd06ced1c7fb61905727ea360269d014bb877f56efcc3c651ba8e882a3d09573a9f247378647b113a3a525ecd
 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
deleted file mode 100644
index 3525cc16e966..000000000000
--- a/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
deleted file mode 100644
index de37a355455e..000000000000
--- a/dev-python/pyicu/pyicu-2.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 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"
-IUSE="test"
-
-RESTRICT="!test? ( 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
-}
diff --git a/dev-python/pyicu/pyicu-2.3.ebuild b/dev-python/pyicu/pyicu-2.3.ebuild
deleted file mode 100644
index 0be3b18deef7..000000000000
--- a/dev-python/pyicu/pyicu-2.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 flag-o-matic
-
-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"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/icu:="
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest
-		dev-python/six )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-python_test() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		# See Bug #644226
-		ewarn "Skipping tests for ${EPYTHON} because they are known to fail"
-	else
-		esetup.py test
-	fi
-}
diff --git a/dev-python/pyicu/pyicu-2.4.2.ebuild b/dev-python/pyicu/pyicu-2.4.2.ebuild
index 598eb718fded..330fe964470e 100644
--- a/dev-python/pyicu/pyicu-2.4.2.ebuild
+++ b/dev-python/pyicu/pyicu-2.4.2.ebuild
@@ -16,15 +16,11 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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