gentoo resync : 16.01.2021

3 files changed, 44 insertions, 3 deletions

diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index b7791de66738..13d81090cf87 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -2,8 +2,9 @@ AUX icu-64.2-darwin.patch 2136 BLAKE2B 3c54a15e351a97f7c423128e493ed158e56191738
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
 AUX icu-69.1-fix-ub-units.patch 866 BLAKE2B 29b849c08bd0ddb19ee03c37f34873819307a0daa53c00724ea27842829acc895a9a9fffd7a0ef03d5629d17f15399be3df7a2f0270dbbf65512dbfc0f41f66e SHA512 d3d72909643ffb2d3f4407d6e9259b661f7ee033bcc8b35a7a771d8c2c6295a7bf1139ad8b6aee14f3a2291d15c3dfbbc847aeeb1fe60c64c4f2dc202e34d88b
+AUX icu-70.1-fix-ucptrietest.patch 1086 BLAKE2B a61919181c015c5f4673ba7ca6513f50e3f6ac3b5a3fc4541ace854cd44b8d77fc4752c91c90c0275647a65b83f56061619726c714296dee7db6906a5f4b7e8d SHA512 57c08fc2fab69050b338f3830581087d69311ae1a622b1b48e7986822219fc728c981b1434c30fa15bd21c528a64672ebf5dcfbedbfb0f8ab401c3d1278dd4a1
 DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9f0ba335f071817198238de21fcd77dfe3e86ea1394790e2a3b6d96772d1b98cb7dccd6462a9dd05c0ab7bdef0 SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
 EBUILD icu-69.1-r1.ebuild 3636 BLAKE2B 86f03e2aec9ae9b1e490b1a306ed444433c541e93f0e6901733de3e2085b6925657e0ef94433c3f9df493f22ae8767383d4eae2fffa7ae351792c57b2b272cc7 SHA512 fc3d55b1aa6e18e4294c0606665fa92b90e31ecfb9129be5aad301bfa97bf63fe628e3a1ca145cbc0376a70b4264330d31d62efd1df21ba5943e714cec2d7651
-EBUILD icu-70.1.ebuild 3621 BLAKE2B 90bf917c245747cc67a05cfd295459b6f708dcec4060ec15e2c4ed8cf1e06e140ae932fe8bd437592317f4fd93f171c0bcc6ae6c600730a10d9eba634ddfc37c SHA512 7a81e69eb4c5563546eea457d3104763097f5a2d897f49565b94707560d77e36156e74981c49b02f33686292ca717ba263e6576902273d04bb33b8ab25fa7093
+EBUILD icu-70.1-r1.ebuild 3702 BLAKE2B 88a064a23b0688bb5dcbcb2077e4cddf18aaa7b1d52fb04a6cfd01f1a9635540ccd07bdf3a9c86c03f1221d86ddb7310d2f8a5b67c8bf139cf59545b3342463e SHA512 a251ec63476acce63356667b8939db19c971c4c7ce1f2709bb9a8d62d3bccf764f9f246b37229c2463b0c114607d08f9093de9830ec915b81cb5a1660440d27b
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch b/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch
new file mode 100644
index 000000000000..05d390a1284a
--- /dev/null
+++ b/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch
@@ -0,0 +1,38 @@
+Fixes test failure on arm.
+
+https://github.com/unicode-org/icu/pull/1925
+https://unicode-org.atlassian.net/browse/ICU-21793
+
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
+Date: Wed, 3 Nov 2021 02:31:18 +0100
+Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff
+
+--- a/tools/toolutil/toolutil.cpp
++++ b/tools/toolutil/toolutil.cpp
+@@ -228,18 +228,19 @@ uprv_compareGoldenFiles(
+     std::ifstream ifs(goldenFilePath, std::ifstream::in);
+     int32_t pos = 0;
+     char c;
+-    while ((c = ifs.get()) != std::char_traits<char>::eof() && pos < bufferLen) {
++    while (ifs.get(c) && pos < bufferLen) {
+         if (c != buffer[pos]) {
+             // Files differ at this position
+-            return pos;
++            break;
+         }
+         pos++;
+     }
+-    if (pos < bufferLen || c != std::char_traits<char>::eof()) {
+-        // Files are different lengths
+-        return pos;
++    if (pos == bufferLen && ifs.eof()) {
++        // Files are same lengths
++        pos = -1;
+     }
+-    return -1;
++    ifs.close();
++    return pos;
+ }
+
+ /*U_CAPI UDate U_EXPORT2
+
diff --git a/dev-libs/icu/icu-70.1.ebuild b/dev-libs/icu/icu-70.1-r1.ebuild
index 83163eaec2b6..c2095a985a40 100644
--- a/dev-libs/icu/icu-70.1.ebuild
+++ b/dev-libs/icu/icu-70.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
+	sys-devel/autoconf-archive
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )
 "
@@ -29,9 +30,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
 	"${FILESDIR}/${PN}-64.2-darwin.patch"
 	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
-	# Should be in the next rleease, but check
+	# Should both be in the next release, but check
 	# https://bugs.gentoo.org/788112
 	"${FILESDIR}/${PN}-69.1-fix-ub-units.patch"
+	"${FILESDIR}/${PN}-70.1-fix-ucptrietest.patch"
 )
 
 src_prepare() {