3 files changed, 2 insertions, 55 deletions
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index ab6bbe6c1e9d..d39f76ccaaf9 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,7 +5,6 @@ AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
 AUX icu-63.1-CVE-2018-18928.patch 2813 BLAKE2B 21940b9c1f17eed7f056a8c60b5a8da3790955fe6bab02336b0c042d80d90afd02a54dbe441fa38a536b2a77f08fb629510186a0419ad6352b3bc461c7b9b9e3 SHA512 f55cc50673e33dfba4d213bb4f18dd905e9db372dde4c64c1f389c0cd19b31e5fd0aaa113778068758497b35667061659d55fafd0eae818624c9374e17a8d5c5
 AUX icu-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
-AUX icu-64.1-guard-memory-include.patch 1449 BLAKE2B bc255a8ef9a8d7fece5fb10ad2a51b67c28307aa1954a1c690c923b9695b946bc5aceafae39687f60563f62112672b60405d47c393755147568272678516f334 SHA512 7cb0142486d0162a7e9441c55225e010db5dfcd0a9b67f3f738de2a619388e4323b1314e9531537259403fbdd5a263e58576991b6e90629feacdee522f40cee5
 AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
 AUX icu-64.2-extern_c.patch 29978 BLAKE2B 398f371d256fd4e60fc069949d0d861e363c43889a762c9fffad176cb1164b069209a295475748c08a18a83b43abb561851f4d74359fc3fd683b97eb0cef2e50 SHA512 d45a8da416a573b69b76a615d11bf99f852cb1703cb0fd4ba35fe96411134fda97a29cddf3d14a23900a5099a930c32ff9d1865f02d07314268974c306832409
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
@@ -13,5 +12,5 @@ DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afb
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-63.1-r1.ebuild 3321 BLAKE2B b8e6b6ea9bb9379f0b09195382db18e7758fc919d626f49240f9b8a75b97c84833dc2741c528788348d090749229b18d610bcd5bb196506fec03803d3a78af3f SHA512 0efd9eeac3944f3ea14e20f99c3d3bf0f9a2ed22d62074a1d1342c8fb04f4bb76c30d51ca173a09a59abb832cdb134bd1120b065ce0c63536da08839f4abd2de
-EBUILD icu-64.2.ebuild 3452 BLAKE2B c155821d71318f0cc7f9d109f274e3bebdfde38cda04ec4278d377d47a65b8c65ff705c1db7f3475161b9eb1a1ac067467d76b952c72d90bb40d606ac00137d8 SHA512 add4911b736ecfcf00f56a9dd706bb9abb33e18725e295ace2fcb7f6c6b3d960823bc32487289f31385fff1deb0eed9482a51a2f19c532035a0381ffa8eeed31
+EBUILD icu-64.2.ebuild 3447 BLAKE2B 79683e5d5770c84e5f09e032d5f7a9c9dcab23e163358a93d4b60f1532e3698e5f4dbe5fa1efc9652d2de82f85e6e0ce02a6188818c1c7a2fd8c2e6ed9a4fbe9 SHA512 22d0c7e6ae62bd25ebf3e480b757624a50b9d831de54facb93d19e0f6a8cc763c2d0adfb997689235603d5b3b8b1fe5aaa3cea356828b480ae6f0d7c63bda672
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-64.1-guard-memory-include.patch b/dev-libs/icu/files/icu-64.1-guard-memory-include.patch
deleted file mode 100644
index 618a42541277..000000000000
--- a/dev-libs/icu/files/icu-64.1-guard-memory-include.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5ecd46bab07561758e0c37a9178e74175e989bdf Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 30 Mar 2019 09:59:46 +0300
-Subject: [PATCH] ICU-20530 Guard memory include for C++
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce by ICU-20357, commit b7a3571b adding <memory> include without guard.
-
-Fails when compiling within extern "C".
-
-a.cxx
----
-extern "C" {
- #include <unicode/localpointer.h>
-}
----
-In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/include/g++-v8/memory:84,
-                 from /tmp/icu/icu4c/source/common/unicode/localpointer.h:45,
-                 from a.cxx:4:
-/usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/include/g++-v8/backward/auto_ptr.h:325:3: error: template with C linkage
-   template<typename _Tp, typename _Dp>
-   ^~~~~~~~
-a.cxx:3:1: note: ‘extern "C"’ linkage started here
- extern "C" {
- ^~~~~~~~~~
----
-
-Found by usage of xmlsec.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- icu4c/source/common/unicode/localpointer.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/icu4c/source/common/unicode/localpointer.h b/icu4c/source/common/unicode/localpointer.h
-index e011688b1a5..8e35ded0b10 100644
---- a/common/unicode/localpointer.h
-+++ b/common/unicode/localpointer.h
-@@ -42,7 +42,11 @@
- 
- #if U_SHOW_CPLUSPLUS_API
- 
-+#ifdef __cplusplus
-+extern "C++" {
- #include <memory>
-+}
-+#endif
- 
- U_NAMESPACE_BEGIN
- 
diff --git a/dev-libs/icu/icu-64.2.ebuild b/dev-libs/icu/icu-64.2.ebuild
index 51285878f756..f2670562cf82 100644
--- a/dev-libs/icu/icu-64.2.ebuild
+++ b/dev-libs/icu/icu-64.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}