gentoo resync : 17.01.2010

36 files changed, 321 insertions, 1667 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index af2973c81bb6..964fb1eba3c8 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 32949a583700..811584eeb9b7 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -7,5 +7,5 @@ AUX boost-1.72.0-revert-cease-dependence-on-range.patch 1687 BLAKE2B 9419cf7b503
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
 EBUILD boost-1.71.0.ebuild 10426 BLAKE2B 9981f0056288a926da95ee05130e99b34506805d049d4b027de2e5a12af21e952606366844990af3d973437b91189539d4f6834188cd669ed69d05b82f3f0c91 SHA512 cdee407c8cd9d71ee115c44ec1801b65a89bf1a595c3d2a069db41c5f1697b9ebb289561a92ba29cf81b3dc3c114450127735e8aa707d8fa5db87a276895e627
-EBUILD boost-1.72.0.ebuild 11352 BLAKE2B 948ca70aed3fbfa4d3009a12ce7922f5cd04bc191ada41e468072c06927303ff009decc98a4dd0d61a04e52aeb27749b2657f987a9040a4c5e662c6070479ceb SHA512 6163885383a07ff6f3edd553ecdb0bc4cbf0ed030c4f4622fd3d653d4df375fb7d99ce409db13c0b5d979d898a16f653eea3a3848a3139f0bfd1a6f126f571f9
+EBUILD boost-1.72.0.ebuild 11348 BLAKE2B 6d0e00dc500f0d5453ffb4df842b9ee817097980678a1eea87d65d5d3434c7f654190e7b5b7fbad60317986edc2a4a3085959ed8bdbb37c0c37e18ccb1caa775 SHA512 86f3a08ec51f0936be91000d734ef64673364e12840f4cdf6ee44459689a38c985fc80b0a0657bbbf7d5076f09353a81d41386fd852cd40c70516135c4f4b248
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.72.0.ebuild b/dev-libs/boost/boost-1.72.0.ebuild
index 94c8315ddc3e..7646a4403d19 100644
--- a/dev-libs/boost/boost-1.72.0.ebuild
+++ b/dev-libs/boost/boost-1.72.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index ac2ae8451fdc..c933d5f58fd5 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -2,5 +2,5 @@ AUX 0.3.2-fix-pkgconfig.patch 935 BLAKE2B cc769ecd649c5ee39a5f934268cd55b031bc64
 DIST gom-0.3.2.tar.xz 410300 BLAKE2B c0c79c1c3f8a28a0ee992fa4c316538eb87ec26c77def353e8b2038e32f30f9daed433c6d6f6c81069e05e46a980f7d944c955182d973d42f3bd84a341c5a34d SHA512 a7bfb263e5ff6f89768d8fcbdcc949d4ec9b82ecbb80952becd357a3d5781a60e52a327e865e39e46d542b2a2c5e5c861e5302d7ae3c3a2258d3c3f698263675
 DIST gom-0.3.3.tar.xz 101580 BLAKE2B 08e0abb9eaf23ba3bbbca54289ebaa695af705e65b9b612f125e72c62f337baec899d16e657d3de51baeb4ffb79b583716a01d74067e256d59e1dcb63723273e SHA512 152924e704c92f39c493a8becc73fac1f7fe396f4f9e7c154dccec2b4413476821e43abf3c108cc1304de471e61f56c265f124710379ad8568b68f8902064e03
 EBUILD gom-0.3.2-r1.ebuild 1591 BLAKE2B 2c29de492c91663ebc682ecb8baa7d59f0aa62baf913a31d972c4a7450275ff9c2689465eec7bfe21ce91fa2b1c7b273b1832f7799d305d826109f16017316b7 SHA512 c6ea43c72be19c8162a37891b56a2f1563ae2aea5dc076125d5286b577c2a633b54a50863ec5f532190d2772afed82f15db4b0537bdbef075ed18c4bb0a959e1
-EBUILD gom-0.3.3.ebuild 1317 BLAKE2B 01adf6ced6671233a58154b937535947cd0cae1bcee892df09c69cdfd56cd41745481b2742f5a982daaf0d658e49c38e0a5f1a0cd3693eba1118f2b77bf1f566 SHA512 4d3b3c6161f7059bd2b40f89f738c0ea7319e173a18b4a8a33b718411c20b52e0f2981f18d21f0ddc77655f17772de6e1275e06211fe44d5c456f5172ddd1fcb
+EBUILD gom-0.3.3.ebuild 1251 BLAKE2B 9544d6663cf2c8398e29299f695bcf3f8f12bfe109756d604762d37a815107919204cc4a7e12fce8fb413342ba8b0a3b3fe2de0bdc05be910479328facc7c845 SHA512 d452f257a3fe2f054f890d8f5cd029ad5bfaecb8e7f375696355054602a3ff8be26ef1f92501a5a7e9d3ea1af6b63b797d75f2d14a7b4fe96baef006f6640534
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gom/gom-0.3.3.ebuild b/dev-libs/gom/gom-0.3.3.ebuild
index 9a9ca3dfec62..b9062d9606a6 100644
--- a/dev-libs/gom/gom-0.3.3.ebuild
+++ b/dev-libs/gom/gom-0.3.3.ebuild
@@ -27,9 +27,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40.0
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( x11-libs/gdk-pixbuf:2 )
+	x11-libs/gdk-pixbuf:2
 "
-# TODO: make gdk-pixbuf properly optional with USE=test
 
 pkg_setup() {
 	python_setup
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index 8db1188f332f..1cef9141f76c 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,4 +1,4 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8-r1.ebuild 754 BLAKE2B 2c6240d85a6db00ca7eeaebae83ce32baabd16947305e0d93ad3e34b2cd0505dbca3f8c2f9cfa2b36bb62ce8e03f83729556ec2706a47198a953af2904d08152 SHA512 797f7da247a0c6f9f4ba519df875ea73036acb7a2fe433f712cd0a5a4789ff91df6bc5399326d554266350f7eabad6da854ae64359de4d5babd040c50262804d
+EBUILD hyphen-2.8.8-r1.ebuild 752 BLAKE2B af7fb60bf5f1f5a343c987e00424c8d6c8126be687b25acbf5f8de4b0e205041679dee2c9db2570665e5b5e5ce33fc7ac8465c20dd2ceed8aa1c85342d0412f6 SHA512 3d60e62b7868c9f206950391c4eaeb782d0c02b5953742b3257c63be9325fb5eeee95515b953853e8f55f3acc2f70f16ed0fa0cd7632433d7d824c569f2fa361
 EBUILD hyphen-2.8.8.ebuild 721 BLAKE2B 973906a5054ac995bd0a4c0604050cdd41b4397004bcd224f5b536246fcd902b685aecddd014f97f98c2adf6d131fff66797dcc2a090ab7cd2b59527c02d6612 SHA512 02691d1c40723bb7d559402008cbdf689dc0ba2247ab463e5e628c9edc4651e82c832b9054d3dc7fb428feff92d942653310250e3aeacb032cbc48a89696cc7c
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
index 706fa84f9a5f..c376d8477941 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 8cad4559a04a..1902ab11857d 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,8 +1,5 @@
-AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
 AUX icu-layoutex-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
-DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
-EBUILD icu-layoutex-64.2.ebuild 2557 BLAKE2B bf296e4c6aeb9efa43289ae335dc5a821480694c9ec45f0a5d4241c5611892bf70b7e55982398d6f583a1ac18dafa1d1addc1c8c0b9708f4b629ce5a03793cdd SHA512 0621a4c9e5da886127fad73dddbf6ba5be4eda63069e8287133569c830ba728089c308167042eea20001ecf72c5286caf76cc9d4d62d3d8acc3a7a6b32ade903
 EBUILD icu-layoutex-65.1.ebuild 2576 BLAKE2B 5c61418aaa55f4c16fa4548d6ecb8ad90bf9aa82e67f93221f8ab7874f0ce4d78d437461520086abadcc9ddb32777b73fd6585ffd614227b001223a81f57fa9f SHA512 4732ca4b043cf25ea6e6b2cf8e97827d9c01bbe9d4ef271652d68cc9cdd94101ef79aa3e7f417a503b936bbdfc5d23291868a709fd7b678ca71b3f917c7c7067
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/files/icu-layoutex-58.1-remove-bashisms.patch b/dev-libs/icu-layoutex/files/icu-layoutex-58.1-remove-bashisms.patch
deleted file mode 100644
index ef60ce4569b8..000000000000
--- a/dev-libs/icu-layoutex/files/icu-layoutex-58.1-remove-bashisms.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in
---- a/config/Makefile.inc.in	2016-09-09 23:28:18.000000000 +0200
-+++ b/config/Makefile.inc.in	2016-11-05 19:43:07.688466668 +0100
-@@ -124,12 +124,6 @@
- # with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
- ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 
- 
--# Proper echo newline handling is needed in icu-config
--ECHO_N=@ICU_ECHO_N@
--ECHO_C=@ICU_ECHO_C@
--# Not currently being used but good to have for proper tab handling
--ECHO_T=@ICU_ECHO_T@
--
- ##################################################################
- ##################################################################
- #
-diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom
---- a/config/icu-config-bottom	2016-09-09 23:28:18.000000000 +0200
-+++ b/config/icu-config-bottom	2016-11-05 19:49:00.854481361 +0100
-@@ -218,65 +218,65 @@
- 	    ;;
- 
- 	--cflags)
--	    echo $ECHO_N "${CFLAGS} ${ECHO_C}"
-+	    printf "%s" "${CFLAGS} "
- 	    ;;
- 
- 	--cc)
--	    echo $ECHO_N "${CC} ${ECHO_C}"
-+	    printf "%s" "${CC} "
- 	    ;;
- 
- 	--cxx)
--	    echo $ECHO_N "${CXX} ${ECHO_C}"
-+	    printf "%s" "${CXX} "
- 	    ;;
- 
- 	--cxxflags)
--	    echo $ECHO_N "${CXXFLAGS} ${ECHO_C}"
-+	    printf "%s" "${CXXFLAGS} "
- 	    ;;
- 
- 	--cppflags)
- 	    # Don't echo the -I. - it's unneeded.
--	    echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //'
-+	    printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //'
- 	    ;;
- 
- 	--cppflags-searchpath)
--	    echo $ECHO_N "-I${prefix}/include ${ECHO_C}"
-+	    printf "%s" "-I${prefix}/include "
- 	    ;;
- 
- 	--cppflags-dynamic)
--	    echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}"
-+	    printf "%s" "${SHAREDLIBCPPFLAGS} "
- 	    ;;
- 
- 	--cxxflags-dynamic)
--	    echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}"
-+	    printf "%s" "${SHAREDLIBCXXFLAGS} "
- 	    ;;
- 
- 	--cflags-dynamic)
--	    echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}"
-+	    printf "%s" "${SHAREDLIBCFLAGS} "
- 	    ;;
- 
- 	--ldflags-system)
--	    echo $ECHO_N "${LIBS} ${ECHO_C}"
-+	    printf "%s" "${LIBS} "
- 	    ;;
- 
- 	--ldflags)
--	    echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}"
-+	    printf "%s" "${LDFLAGS} ${ICULIBS} "
- # $RPATH_LDFLAGS
- 	    ;;
- 
- 	--ldflags-libsonly)
--	    echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}"
-+	    printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
- 	    ;;
- 
- 	--ldflags-icuio)
--	    echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"
-+	    printf "%s" " ${ICULIBS_ICUIO} "
- 	    ;;
- 
- 	--ldflags-obsolete)
--	    echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"
-+	    printf "%s" "${ICULIBS_OBSOLETE} "
- 	    ;;
- 
- 	--ldflags-toolutil)
--	    echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"
-+	    printf "%s" " ${ICULIBS_TOOLUTIL} "
- 	    ;;
- 
- 	--ldflags-layout)
-@@ -285,7 +285,7 @@
- 	    ;;
- 
- 	--ldflags-searchpath)
--	    echo $ECHO_N "-L${libdir} ${ECHO_C}"
-+	    printf "%s" "-L${libdir} "
- 	    ;;
- 
- 	--detect-prefix)
-@@ -321,47 +321,47 @@
- 	    ;;
- 
- 	--shared-datadir)
--	    echo $ECHO_N "${datadir} ${ECHO_C}"
-+	    printf "%s" "${datadir} "
- 	    ;;
- 
-         --incfile)
--	    echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}"
-+	    printf "%s" "${pkglibdir}/Makefile.inc "
- 	    ;;
- 
- 	--incpkgdatafile)
--	    echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}"
-+	    printf "%s" "${pkglibdir}/pkgdata.inc "
- 	    ;;
- 
- 	--icudata)
--	    echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}"
-+	    printf "%s" "${ICUDATA_NAME} "
- 	    ;;
- 
- 	--icudata-mode)
--	    echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}"
-+	    printf "%s" "${PKGDATA_MODE} "
- 	    ;;
- 
- 	--icudata-install-dir)
--        echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}"
-+        printf "%s" "${ICUPKGDATA_DIR} "
- 	    ;;
- 
- 	--icudatadir)
--	    echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}"
-+	    printf "%s" "${ICUDATA_DIR} "
- 	    ;;
- 
- 	--shlib-c)
--	    echo $ECHO_N "${SHLIB_c} ${ECHO_C}"
-+	    printf "%s" "${SHLIB_c} "
- 	    ;;
- 
- 	--shlib-cc)
--	    echo $ECHO_N "${SHLIB_cc} ${ECHO_C}"
-+	    printf "%s" "${SHLIB_cc} "
- 	    ;;
- 
- 	--version)
--	    echo $ECHO_N $VERSION
-+	    printf "%s" "$VERSION"
- 	    ;;
- 
- 	--unicode-version)
--	    echo $ECHO_N $UNICODE_VERSION
-+	    printf "%s" "$UNICODE_VERSION"
- 	    ;;
- 
- 	--host)
-diff -ruN a/configure.ac b/configure.ac
---- a/configure.ac	2016-10-04 21:30:20.000000000 +0200
-+++ b/configure.ac	2016-11-05 19:43:07.688466668 +0100
-@@ -22,24 +22,6 @@
- PACKAGE="icu"
- AC_SUBST(PACKAGE)
- 
--# Use custom echo test for newline option
--# Current autoconf (2.65) gives incorrect echo newline option
--# for icu-config
--# This may be removed later - mow (June 17, 2010)
--ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
--case `/bin/sh -c "echo -n x"` in
---n*)
--  case `/bin/sh -c "echo 'x\c'"` in
--  *c*) ICU_ECHO_T=' ';;     # ECHO_T is single tab character.
--  *)   ICU_ECHO_C='\c';;
--  esac;;
--*)
--  ICU_ECHO_N='-n';;
--esac
--AC_SUBST(ICU_ECHO_N)
--AC_SUBST(ICU_ECHO_C)
--AC_SUBST(ICU_ECHO_T)
--
- AC_MSG_CHECKING(for ICU version numbers)
- 
- # Get the ICU version from uversion.h or other headers
-diff -ruN a/icudefs.mk.in b/icudefs.mk.in
---- a/icudefs.mk.in	2016-09-09 23:28:18.000000000 +0200
-+++ b/icudefs.mk.in	2016-11-05 19:43:07.688466668 +0100
-@@ -157,11 +157,6 @@
- ENABLE_STATIC = @ENABLE_STATIC@
- ENABLE_SHARED = @ENABLE_SHARED@
- 
--# Echo w/o newline
--
--#ECHO_N = @ICU_ECHO_N@
--#ECHO_C = @ICU_ECHO_C@
--
- # Commands to compile
- COMPILE.c=    $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
- COMPILE.cc=   $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c
-diff -ruN a/test/hdrtst/Makefile.in b/test/hdrtst/Makefile.in
---- a/test/hdrtst/Makefile.in	2016-09-28 06:17:24.000000000 +0200
-+++ b/test/hdrtst/Makefile.in	2016-11-05 19:43:07.688466668 +0100
-@@ -35,9 +35,6 @@
- include $(shell icu-config --incfile)
- DIRS=$(prefix)/include/unicode
- LDIRS=$(prefix)/include/layout
--ECHO_T=@ECHO_T@
--ECHO_C=@ECHO_C@
--ECHO_N=@ECHO_N@
- 
- all: 
- 	@echo Please read this Makefile for more information.
diff --git a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
deleted file mode 100644
index 1d7fda5ab6fb..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.1-data_archive_generation.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 17baaff384ee..f5b772cc7f1a 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,10 +1,6 @@
-AUX icu-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
 AUX icu-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
 AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
-AUX icu-64.2-extern_c.patch 29978 BLAKE2B 398f371d256fd4e60fc069949d0d861e363c43889a762c9fffad176cb1164b069209a295475748c08a18a83b43abb561851f4d74359fc3fd683b97eb0cef2e50 SHA512 d45a8da416a573b69b76a615d11bf99f852cb1703cb0fd4ba35fe96411134fda97a29cddf3d14a23900a5099a930c32ff9d1865f02d07314268974c306832409
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
-DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
-EBUILD icu-64.2.ebuild 3422 BLAKE2B a277c1e83caed5e48bd4b3fa78caeec2f29b45c49079f6e77436e2e0772e33bae625aecfa174655baa87c7310541329740193886d2a03e3736417f5c2adb429b SHA512 c832930330efb5ecc013a407a1731f1d0d42a84214a37297812b5637292524126d2f7cac86603f27793fe5f90bfa96e5a5d7eeb61af68947902e77b4585501e0
 EBUILD icu-65.1.ebuild 3389 BLAKE2B c50e11638de130474229373c97ca1cf7bee5188f10bde06a2ac1d857ad01355f11c70fec05d19a873af644e8d3b433a72b273f3bd68b55f698045d70ee6b77c6 SHA512 1a0f39459656e8f6de59182546079be62107e58da641803b7a1217037488020267de1c89cd64d4e5605da8e304b0a505b6d4ed1a12988d02d36c34dede13cab4
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-58.1-remove-bashisms.patch b/dev-libs/icu/files/icu-58.1-remove-bashisms.patch
deleted file mode 100644
index ef60ce4569b8..000000000000
--- a/dev-libs/icu/files/icu-58.1-remove-bashisms.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in
---- a/config/Makefile.inc.in	2016-09-09 23:28:18.000000000 +0200
-+++ b/config/Makefile.inc.in	2016-11-05 19:43:07.688466668 +0100
-@@ -124,12 +124,6 @@
- # with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
- ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 
- 
--# Proper echo newline handling is needed in icu-config
--ECHO_N=@ICU_ECHO_N@
--ECHO_C=@ICU_ECHO_C@
--# Not currently being used but good to have for proper tab handling
--ECHO_T=@ICU_ECHO_T@
--
- ##################################################################
- ##################################################################
- #
-diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom
---- a/config/icu-config-bottom	2016-09-09 23:28:18.000000000 +0200
-+++ b/config/icu-config-bottom	2016-11-05 19:49:00.854481361 +0100
-@@ -218,65 +218,65 @@
- 	    ;;
- 
- 	--cflags)
--	    echo $ECHO_N "${CFLAGS} ${ECHO_C}"
-+	    printf "%s" "${CFLAGS} "
- 	    ;;
- 
- 	--cc)
--	    echo $ECHO_N "${CC} ${ECHO_C}"
-+	    printf "%s" "${CC} "
- 	    ;;
- 
- 	--cxx)
--	    echo $ECHO_N "${CXX} ${ECHO_C}"
-+	    printf "%s" "${CXX} "
- 	    ;;
- 
- 	--cxxflags)
--	    echo $ECHO_N "${CXXFLAGS} ${ECHO_C}"
-+	    printf "%s" "${CXXFLAGS} "
- 	    ;;
- 
- 	--cppflags)
- 	    # Don't echo the -I. - it's unneeded.
--	    echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //'
-+	    printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //'
- 	    ;;
- 
- 	--cppflags-searchpath)
--	    echo $ECHO_N "-I${prefix}/include ${ECHO_C}"
-+	    printf "%s" "-I${prefix}/include "
- 	    ;;
- 
- 	--cppflags-dynamic)
--	    echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}"
-+	    printf "%s" "${SHAREDLIBCPPFLAGS} "
- 	    ;;
- 
- 	--cxxflags-dynamic)
--	    echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}"
-+	    printf "%s" "${SHAREDLIBCXXFLAGS} "
- 	    ;;
- 
- 	--cflags-dynamic)
--	    echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}"
-+	    printf "%s" "${SHAREDLIBCFLAGS} "
- 	    ;;
- 
- 	--ldflags-system)
--	    echo $ECHO_N "${LIBS} ${ECHO_C}"
-+	    printf "%s" "${LIBS} "
- 	    ;;
- 
- 	--ldflags)
--	    echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}"
-+	    printf "%s" "${LDFLAGS} ${ICULIBS} "
- # $RPATH_LDFLAGS
- 	    ;;
- 
- 	--ldflags-libsonly)
--	    echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}"
-+	    printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
- 	    ;;
- 
- 	--ldflags-icuio)
--	    echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"
-+	    printf "%s" " ${ICULIBS_ICUIO} "
- 	    ;;
- 
- 	--ldflags-obsolete)
--	    echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"
-+	    printf "%s" "${ICULIBS_OBSOLETE} "
- 	    ;;
- 
- 	--ldflags-toolutil)
--	    echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"
-+	    printf "%s" " ${ICULIBS_TOOLUTIL} "
- 	    ;;
- 
- 	--ldflags-layout)
-@@ -285,7 +285,7 @@
- 	    ;;
- 
- 	--ldflags-searchpath)
--	    echo $ECHO_N "-L${libdir} ${ECHO_C}"
-+	    printf "%s" "-L${libdir} "
- 	    ;;
- 
- 	--detect-prefix)
-@@ -321,47 +321,47 @@
- 	    ;;
- 
- 	--shared-datadir)
--	    echo $ECHO_N "${datadir} ${ECHO_C}"
-+	    printf "%s" "${datadir} "
- 	    ;;
- 
-         --incfile)
--	    echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}"
-+	    printf "%s" "${pkglibdir}/Makefile.inc "
- 	    ;;
- 
- 	--incpkgdatafile)
--	    echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}"
-+	    printf "%s" "${pkglibdir}/pkgdata.inc "
- 	    ;;
- 
- 	--icudata)
--	    echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}"
-+	    printf "%s" "${ICUDATA_NAME} "
- 	    ;;
- 
- 	--icudata-mode)
--	    echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}"
-+	    printf "%s" "${PKGDATA_MODE} "
- 	    ;;
- 
- 	--icudata-install-dir)
--        echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}"
-+        printf "%s" "${ICUPKGDATA_DIR} "
- 	    ;;
- 
- 	--icudatadir)
--	    echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}"
-+	    printf "%s" "${ICUDATA_DIR} "
- 	    ;;
- 
- 	--shlib-c)
--	    echo $ECHO_N "${SHLIB_c} ${ECHO_C}"
-+	    printf "%s" "${SHLIB_c} "
- 	    ;;
- 
- 	--shlib-cc)
--	    echo $ECHO_N "${SHLIB_cc} ${ECHO_C}"
-+	    printf "%s" "${SHLIB_cc} "
- 	    ;;
- 
- 	--version)
--	    echo $ECHO_N $VERSION
-+	    printf "%s" "$VERSION"
- 	    ;;
- 
- 	--unicode-version)
--	    echo $ECHO_N $UNICODE_VERSION
-+	    printf "%s" "$UNICODE_VERSION"
- 	    ;;
- 
- 	--host)
-diff -ruN a/configure.ac b/configure.ac
---- a/configure.ac	2016-10-04 21:30:20.000000000 +0200
-+++ b/configure.ac	2016-11-05 19:43:07.688466668 +0100
-@@ -22,24 +22,6 @@
- PACKAGE="icu"
- AC_SUBST(PACKAGE)
- 
--# Use custom echo test for newline option
--# Current autoconf (2.65) gives incorrect echo newline option
--# for icu-config
--# This may be removed later - mow (June 17, 2010)
--ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
--case `/bin/sh -c "echo -n x"` in
---n*)
--  case `/bin/sh -c "echo 'x\c'"` in
--  *c*) ICU_ECHO_T=' ';;     # ECHO_T is single tab character.
--  *)   ICU_ECHO_C='\c';;
--  esac;;
--*)
--  ICU_ECHO_N='-n';;
--esac
--AC_SUBST(ICU_ECHO_N)
--AC_SUBST(ICU_ECHO_C)
--AC_SUBST(ICU_ECHO_T)
--
- AC_MSG_CHECKING(for ICU version numbers)
- 
- # Get the ICU version from uversion.h or other headers
-diff -ruN a/icudefs.mk.in b/icudefs.mk.in
---- a/icudefs.mk.in	2016-09-09 23:28:18.000000000 +0200
-+++ b/icudefs.mk.in	2016-11-05 19:43:07.688466668 +0100
-@@ -157,11 +157,6 @@
- ENABLE_STATIC = @ENABLE_STATIC@
- ENABLE_SHARED = @ENABLE_SHARED@
- 
--# Echo w/o newline
--
--#ECHO_N = @ICU_ECHO_N@
--#ECHO_C = @ICU_ECHO_C@
--
- # Commands to compile
- COMPILE.c=    $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
- COMPILE.cc=   $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c
-diff -ruN a/test/hdrtst/Makefile.in b/test/hdrtst/Makefile.in
---- a/test/hdrtst/Makefile.in	2016-09-28 06:17:24.000000000 +0200
-+++ b/test/hdrtst/Makefile.in	2016-11-05 19:43:07.688466668 +0100
-@@ -35,9 +35,6 @@
- include $(shell icu-config --incfile)
- DIRS=$(prefix)/include/unicode
- LDIRS=$(prefix)/include/layout
--ECHO_T=@ECHO_T@
--ECHO_C=@ECHO_C@
--ECHO_N=@ECHO_N@
- 
- all: 
- 	@echo Please read this Makefile for more information.
diff --git a/dev-libs/icu/files/icu-64.2-extern_c.patch b/dev-libs/icu/files/icu-64.2-extern_c.patch
deleted file mode 100644
index 9a757e12037b..000000000000
--- a/dev-libs/icu/files/icu-64.2-extern_c.patch
+++ /dev/null
@@ -1,789 +0,0 @@
-From 26bdef634585eb24946dba035611266e9431873b 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 Fix header issues based on test/hdrtst
-
-Remove explicit extern "C++" scope.
-
-Remove C++ macros in C mode.
-
-Fix issues detected by make -C test/hdrtst.
-
-Run test/hdrtest during CI to detect future breakage.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
-Closes: https://github.com/unicode-org/icu/pull/613
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-diff --git a/icu4c/source/common/unicode/ucptrie.h b/icu4c/source/common/unicode/ucptrie.h
-index 2718c984e4..ce7340b890 100644
---- a/icu4c/source/common/unicode/ucptrie.h
-+++ b/icu4c/source/common/unicode/ucptrie.h
-@@ -216,25 +216,6 @@ ucptrie_openFromBinary(UCPTrieType type, UCPTrieValueWidth valueWidth,
- U_CAPI void U_EXPORT2
- ucptrie_close(UCPTrie *trie);
- 
--#if U_SHOW_CPLUSPLUS_API
--
--U_NAMESPACE_BEGIN
--
--/**
-- * \class LocalUCPTriePointer
-- * "Smart pointer" class, closes a UCPTrie via ucptrie_close().
-- * For most methods see the LocalPointerBase base class.
-- *
-- * @see LocalPointerBase
-- * @see LocalPointer
-- * @draft ICU 63
-- */
--U_DEFINE_LOCAL_OPEN_POINTER(LocalUCPTriePointer, UCPTrie, ucptrie_close);
--
--U_NAMESPACE_END
--
--#endif
--
- /**
-  * Returns the trie type.
-  *
-@@ -642,5 +623,25 @@ ucptrie_internalU8PrevIndex(const UCPTrie *trie, UChar32 c,
- U_CDECL_END
- 
- #endif  // U_IN_DOXYGEN
-+
-+#if U_SHOW_CPLUSPLUS_API
-+
-+U_NAMESPACE_BEGIN
-+
-+/**
-+ * \class LocalUCPTriePointer
-+ * "Smart pointer" class, closes a UCPTrie via ucptrie_close().
-+ * For most methods see the LocalPointerBase base class.
-+ *
-+ * @see LocalPointerBase
-+ * @see LocalPointer
-+ * @draft ICU 63
-+ */
-+U_DEFINE_LOCAL_OPEN_POINTER(LocalUCPTriePointer, UCPTrie, ucptrie_close);
-+
-+U_NAMESPACE_END
-+
-+#endif  // U_SHOW_CPLUSPLUS_API
-+
- #endif  // U_HIDE_DRAFT_API
- #endif
-diff --git a/icu4c/source/common/unicode/udata.h b/icu4c/source/common/unicode/udata.h
-index a0286e1e42..325ffcf17d 100644
---- a/icu4c/source/common/unicode/udata.h
-+++ b/icu4c/source/common/unicode/udata.h
-@@ -264,25 +264,6 @@ udata_openChoice(const char *path, const char *type, const char *name,
- U_STABLE void U_EXPORT2
- udata_close(UDataMemory *pData);
- 
--#if U_SHOW_CPLUSPLUS_API
--
--U_NAMESPACE_BEGIN
--
--/**
-- * \class LocalUDataMemoryPointer
-- * "Smart pointer" class, closes a UDataMemory via udata_close().
-- * For most methods see the LocalPointerBase base class.
-- *
-- * @see LocalPointerBase
-- * @see LocalPointer
-- * @stable ICU 4.4
-- */
--U_DEFINE_LOCAL_OPEN_POINTER(LocalUDataMemoryPointer, UDataMemory, udata_close);
--
--U_NAMESPACE_END
--
--#endif
--
- /**
-  * Get the pointer to the actual data inside the data memory.
-  * The data is read-only.
-@@ -434,4 +415,23 @@ udata_setFileAccess(UDataFileAccess access, UErrorCode *status);
- 
- U_CDECL_END
- 
-+#if U_SHOW_CPLUSPLUS_API
-+
-+U_NAMESPACE_BEGIN
-+
-+/**
-+ * \class LocalUDataMemoryPointer
-+ * "Smart pointer" class, closes a UDataMemory via udata_close().
-+ * For most methods see the LocalPointerBase base class.
-+ *
-+ * @see LocalPointerBase
-+ * @see LocalPointer
-+ * @stable ICU 4.4
-+ */
-+U_DEFINE_LOCAL_OPEN_POINTER(LocalUDataMemoryPointer, UDataMemory, udata_close);
-+
-+U_NAMESPACE_END
-+
-+#endif  // U_SHOW_CPLUSPLUS_API
-+
- #endif
-diff --git a/icu4c/source/common/unicode/uversion.h b/icu4c/source/common/unicode/uversion.h
-index 4aaa8b4d60..5700f62cbf 100644
---- a/icu4c/source/common/unicode/uversion.h
-+++ b/icu4c/source/common/unicode/uversion.h
-@@ -62,26 +62,22 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
- /* C++ namespace if supported. Versioned unless versioning is disabled.      */
- /*===========================================================================*/
- 
-+/* Define C++ namespace symbols. */
-+#ifdef __cplusplus
-+
- /**
-  * \def U_NAMESPACE_BEGIN
-- * This is used to begin a declaration of a public ICU C++ API.
-- * When not compiling for C++, it does nothing.
-- * When compiling for C++, it begins an extern "C++" linkage block (to protect
-- * against cases in which an external client includes ICU header files inside
-- * an extern "C" linkage block).
-+ * This is used to begin a declaration of a public ICU C++ API within
-+ * versioned-ICU-namespace block.
-  *
-- * It also begins a versioned-ICU-namespace block.
-  * @stable ICU 2.4
-  */
- 
- /**
-  * \def U_NAMESPACE_END
-  * This is used to end a declaration of a public ICU C++ API.
-- * When not compiling for C++, it does nothing.
-- * When compiling for C++, it ends the extern "C++" block begun by
-- * U_NAMESPACE_BEGIN.
-+ * It ends the versioned-ICU-namespace block begun by U_NAMESPACE_BEGIN.
-  *
-- * It also ends the versioned-ICU-namespace block begun by U_NAMESPACE_BEGIN.
-  * @stable ICU 2.4
-  */
- 
-@@ -89,9 +85,6 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
-  * \def U_NAMESPACE_USE
-  * This is used to specify that the rest of the code uses the
-  * public ICU C++ API namespace.
-- * This is invoked by default; we recommend that you turn it off:
-- * See the "Recommended Build Options" section of the ICU4C readme
-- * (http://source.icu-project.org/repos/icu/icu/trunk/readme.html#RecBuild)
-  * @stable ICU 2.4
-  */
- 
-@@ -105,8 +98,6 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
-  * @stable ICU 2.4
-  */
- 
--/* Define C++ namespace symbols. */
--#ifdef __cplusplus
- #   if U_DISABLE_RENAMING
- #       define U_ICU_NAMESPACE icu
-         namespace U_ICU_NAMESPACE { }
-@@ -116,8 +107,8 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
-         namespace icu = U_ICU_NAMESPACE;
- #   endif
- 
--#   define U_NAMESPACE_BEGIN extern "C++" { namespace U_ICU_NAMESPACE {
--#   define U_NAMESPACE_END } }
-+#   define U_NAMESPACE_BEGIN namespace U_ICU_NAMESPACE {
-+#   define U_NAMESPACE_END }
- #   define U_NAMESPACE_USE using namespace U_ICU_NAMESPACE;
- #   define U_NAMESPACE_QUALIFIER U_ICU_NAMESPACE::
- 
-@@ -133,12 +124,7 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
- #   if U_USING_ICU_NAMESPACE
-         U_NAMESPACE_USE
- #   endif
--#else
--#   define U_NAMESPACE_BEGIN
--#   define U_NAMESPACE_END
--#   define U_NAMESPACE_USE
--#   define U_NAMESPACE_QUALIFIER
--#endif
-+#endif /* __cplusplus */
- 
- /*===========================================================================*/
- /* General version helper functions. Definitions in putil.c                  */
-diff --git a/icu4c/source/i18n/unicode/reldatefmt.h b/icu4c/source/i18n/unicode/reldatefmt.h
-index 16ae91ad03..1e164a581a 100644
---- a/icu4c/source/i18n/unicode/reldatefmt.h
-+++ b/icu4c/source/i18n/unicode/reldatefmt.h
-@@ -246,6 +246,7 @@ class SharedPluralRules;
- class SharedBreakIterator;
- class NumberFormat;
- class UnicodeString;
-+class FormattedRelativeDateTime;
- class FormattedRelativeDateTimeData;
- 
- #ifndef U_HIDE_DRAFT_API
-diff --git a/icu4c/source/i18n/unicode/uspoof.h b/icu4c/source/i18n/unicode/uspoof.h
-index d15ba4b242..ceb8484b6b 100644
---- a/icu4c/source/i18n/unicode/uspoof.h
-+++ b/icu4c/source/i18n/unicode/uspoof.h
-@@ -353,6 +353,8 @@
-  * @stable ICU 4.6
-  */
- 
-+U_CDECL_BEGIN
-+
- struct USpoofChecker;
- /**
-  * @stable ICU 4.2
-@@ -674,25 +676,6 @@ uspoof_openFromSource(const char *confusables,  int32_t confusablesLen,
- U_STABLE void U_EXPORT2
- uspoof_close(USpoofChecker *sc);
- 
--#if U_SHOW_CPLUSPLUS_API
--
--U_NAMESPACE_BEGIN
--
--/**
-- * \class LocalUSpoofCheckerPointer
-- * "Smart pointer" class, closes a USpoofChecker via uspoof_close().
-- * For most methods see the LocalPointerBase base class.
-- *
-- * @see LocalPointerBase
-- * @see LocalPointer
-- * @stable ICU 4.4
-- */
--U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckerPointer, USpoofChecker, uspoof_close);
--
--U_NAMESPACE_END
--
--#endif
--
- /**
-  * Clone a Spoof Checker.  The clone will be set to perform the same checks
-  *   as the original source.
-@@ -901,54 +884,6 @@ U_STABLE const USet * U_EXPORT2
- uspoof_getAllowedChars(const USpoofChecker *sc, UErrorCode *status);
- 
- 
--#if U_SHOW_CPLUSPLUS_API
--/**
-- * Limit the acceptable characters to those specified by a Unicode Set.
-- *   Any previously specified character limit is
-- *   is replaced by the new settings.    This includes limits on
-- *   characters that were set with the uspoof_setAllowedLocales() function.
-- *
-- * The USPOOF_CHAR_LIMIT test is automatically enabled for this
-- * USoofChecker by this function.
-- *
-- * @param sc       The USpoofChecker
-- * @param chars    A Unicode Set containing the list of
-- *                 characters that are permitted.  Ownership of the set
-- *                 remains with the caller.  The incoming set is cloned by
-- *                 this function, so there are no restrictions on modifying
-- *                 or deleting the UnicodeSet after calling this function.
-- * @param status   The error code, set if this function encounters a problem.
-- * @stable ICU 4.2
-- */
--U_STABLE void U_EXPORT2
--uspoof_setAllowedUnicodeSet(USpoofChecker *sc, const icu::UnicodeSet *chars, UErrorCode *status);
--
--
--/**
-- * Get a UnicodeSet for the characters permitted in an identifier.
-- * This corresponds to the limits imposed by the Set Allowed Characters /
-- * UnicodeSet functions. Limitations imposed by other checks will not be
-- * reflected in the set returned by this function.
-- *
-- * The returned set will be frozen, meaning that it cannot be modified
-- * by the caller.
-- *
-- * Ownership of the returned set remains with the Spoof Detector.  The
-- * returned set will become invalid if the spoof detector is closed,
-- * or if a new set of allowed characters is specified.
-- *
-- *
-- * @param sc       The USpoofChecker
-- * @param status   The error code, set if this function encounters a problem.
-- * @return         A UnicodeSet containing the characters that are permitted by
-- *                 the USPOOF_CHAR_LIMIT test.
-- * @stable ICU 4.2
-- */
--U_STABLE const icu::UnicodeSet * U_EXPORT2
--uspoof_getAllowedUnicodeSet(const USpoofChecker *sc, UErrorCode *status);
--#endif
--
--
- /**
-  * Check the specified string for possible security issues.
-  * The text to be checked will typically be an identifier of some sort.
-@@ -1027,43 +962,6 @@ uspoof_checkUTF8(const USpoofChecker *sc,
-                  UErrorCode *status);
- 
- 
--#if U_SHOW_CPLUSPLUS_API
--/**
-- * Check the specified string for possible security issues.
-- * The text to be checked will typically be an identifier of some sort.
-- * The set of checks to be performed is specified with uspoof_setChecks().
-- *
-- * \note
-- *   Consider using the newer API, {@link uspoof_check2UnicodeString}, instead.
-- *   The newer API exposes additional information from the check procedure
-- *   and is otherwise identical to this method.
-- *
-- * @param sc      The USpoofChecker
-- * @param id      A identifier to be checked for possible security issues.
-- * @param position  Deprecated in ICU 51.  Always returns zero.
-- *                Originally, an out parameter for the index of the first
-- *                string position that failed a check.
-- *                This parameter may be NULL.
-- * @param status  The error code, set if an error occurred while attempting to
-- *                perform the check.
-- *                Spoofing or security issues detected with the input string are
-- *                not reported here, but through the function's return value.
-- * @return        An integer value with bits set for any potential security
-- *                or spoofing issues detected.  The bits are defined by
-- *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
-- *                will be zero if the input string passes all of the
-- *                enabled checks.
-- * @see uspoof_check2UnicodeString
-- * @stable ICU 4.2
-- */
--U_STABLE int32_t U_EXPORT2
--uspoof_checkUnicodeString(const USpoofChecker *sc,
--                          const icu::UnicodeString &id,
--                          int32_t *position,
--                          UErrorCode *status);
--#endif
--
--
- /**
-  * Check the specified string for possible security issues.
-  * The text to be checked will typically be an identifier of some sort.
-@@ -1135,39 +1033,6 @@ uspoof_check2UTF8(const USpoofChecker *sc,
-     USpoofCheckResult* checkResult,
-     UErrorCode *status);
- 
--#if U_SHOW_CPLUSPLUS_API
--/**
-- * Check the specified string for possible security issues.
-- * The text to be checked will typically be an identifier of some sort.
-- * The set of checks to be performed is specified with uspoof_setChecks().
-- *
-- * @param sc      The USpoofChecker
-- * @param id      A identifier to be checked for possible security issues.
-- * @param checkResult  An instance of USpoofCheckResult to be filled with
-- *                details about the identifier.  Can be NULL.
-- * @param status  The error code, set if an error occurred while attempting to
-- *                perform the check.
-- *                Spoofing or security issues detected with the input string are
-- *                not reported here, but through the function's return value.
-- * @return        An integer value with bits set for any potential security
-- *                or spoofing issues detected.  The bits are defined by
-- *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
-- *                will be zero if the input string passes all of the
-- *                enabled checks.  Any information in this bitmask will be
-- *                consistent with the information saved in the optional
-- *                checkResult parameter.
-- * @see uspoof_openCheckResult
-- * @see uspoof_check2
-- * @see uspoof_check2UTF8
-- * @stable ICU 58
-- */
--U_STABLE int32_t U_EXPORT2
--uspoof_check2UnicodeString(const USpoofChecker *sc,
--    const icu::UnicodeString &id,
--    USpoofCheckResult* checkResult,
--    UErrorCode *status);
--#endif
--
- /**
-  * Create a USpoofCheckResult, used by the {@link uspoof_check2} class of functions to return
-  * information about the identifier.  Information includes:
-@@ -1199,32 +1064,6 @@ uspoof_openCheckResult(UErrorCode *status);
- U_STABLE void U_EXPORT2
- uspoof_closeCheckResult(USpoofCheckResult *checkResult);
- 
--#if U_SHOW_CPLUSPLUS_API
--
--U_NAMESPACE_BEGIN
--
--/**
-- * \class LocalUSpoofCheckResultPointer
-- * "Smart pointer" class, closes a USpoofCheckResult via `uspoof_closeCheckResult()`.
-- * For most methods see the LocalPointerBase base class.
-- *
-- * @see LocalPointerBase
-- * @see LocalPointer
-- * @stable ICU 58
-- */
--
--/**
-- * \cond
-- * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER.
-- *       For now, suppress with a Doxygen cond
-- */
--U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckResultPointer, USpoofCheckResult, uspoof_closeCheckResult);
--/** \endcond */
--
--U_NAMESPACE_END
--
--#endif
--
- /**
-  * Indicates which of the spoof check(s) have failed. The value is a bitwise OR of the constants for the tests
-  * in question: USPOOF_RESTRICTION_LEVEL, USPOOF_CHAR_LIMIT, and so on.
-@@ -1355,36 +1194,6 @@ uspoof_areConfusableUTF8(const USpoofChecker *sc,
- 
- 
- 
--#if U_SHOW_CPLUSPLUS_API
--/**
-- * A version of {@link uspoof_areConfusable} accepting UnicodeStrings.
-- *
-- * @param sc      The USpoofChecker
-- * @param s1     The first of the two identifiers to be compared for
-- *                confusability.  The strings are in UTF-8 format.
-- * @param s2     The second of the two identifiers to be compared for
-- *                confusability.  The strings are in UTF-8 format.
-- * @param status  The error code, set if an error occurred while attempting to
-- *                perform the check.
-- *                Confusability of the identifiers is not reported here,
-- *                but through this function's return value.
-- * @return        An integer value with bit(s) set corresponding to
-- *                the type of confusability found, as defined by
-- *                enum USpoofChecks.  Zero is returned if the identifiers
-- *                are not confusable.
-- *
-- * @stable ICU 4.2
-- *
-- * @see uspoof_areConfusable
-- */
--U_STABLE int32_t U_EXPORT2
--uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
--                                  const icu::UnicodeString &s1,
--                                  const icu::UnicodeString &s2,
--                                  UErrorCode *status);
--#endif
--
--
- /**
-  *  Get the "skeleton" for an identifier.
-  *  Skeletons are a transformation of the input identifier;
-@@ -1463,38 +1272,6 @@ uspoof_getSkeletonUTF8(const USpoofChecker *sc,
-                        char *dest, int32_t destCapacity,
-                        UErrorCode *status);
- 
--#if U_SHOW_CPLUSPLUS_API
--/**
-- *  Get the "skeleton" for an identifier.
-- *  Skeletons are a transformation of the input identifier;
-- *  Two identifiers are confusable if their skeletons are identical.
-- *  See Unicode UAX #39 for additional information.
-- *
-- *  Using skeletons directly makes it possible to quickly check
-- *  whether an identifier is confusable with any of some large
-- *  set of existing identifiers, by creating an efficiently
-- *  searchable collection of the skeletons.
-- *
-- * @param sc      The USpoofChecker.
-- * @param type    Deprecated in ICU 58.  You may pass any number.
-- *                Originally, controlled which of the Unicode confusable data
-- *                tables to use.
-- * @param id      The input identifier whose skeleton will be computed.
-- * @param dest    The output identifier, to receive the skeleton string.
-- * @param status  The error code, set if an error occurred while attempting to
-- *                perform the check.
-- * @return        A reference to the destination (skeleton) string.
-- *
-- * @stable ICU 4.2
-- */
--U_I18N_API icu::UnicodeString & U_EXPORT2
--uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
--                                uint32_t type,
--                                const icu::UnicodeString &id,
--                                icu::UnicodeString &dest,
--                                UErrorCode *status);
--#endif   /* U_SHOW_CPLUSPLUS_API */
--
- /**
-   * Get the set of Candidate Characters for Inclusion in Identifiers, as defined
-   * in http://unicode.org/Public/security/latest/xidmodifications.txt
-@@ -1525,8 +1302,243 @@ uspoof_getInclusionSet(UErrorCode *status);
- U_STABLE const USet * U_EXPORT2
- uspoof_getRecommendedSet(UErrorCode *status);
- 
-+/**
-+ * Serialize the data for a spoof detector into a chunk of memory.
-+ * The flattened spoof detection tables can later be used to efficiently
-+ * instantiate a new Spoof Detector.
-+ *
-+ * The serialized spoof checker includes only the data compiled from the
-+ * Unicode data tables by uspoof_openFromSource(); it does not include
-+ * include any other state or configuration that may have been set.
-+ *
-+ * @param sc   the Spoof Detector whose data is to be serialized.
-+ * @param data a pointer to 32-bit-aligned memory to be filled with the data,
-+ *             can be NULL if capacity==0
-+ * @param capacity the number of bytes available at data,
-+ *                 or 0 for preflighting
-+ * @param status an in/out ICU UErrorCode; possible errors include:
-+ * - U_BUFFER_OVERFLOW_ERROR if the data storage block is too small for serialization
-+ * - U_ILLEGAL_ARGUMENT_ERROR  the data or capacity parameters are bad
-+ * @return the number of bytes written or needed for the spoof data
-+ *
-+ * @see utrie2_openFromSerialized()
-+ * @stable ICU 4.2
-+ */
-+U_STABLE int32_t U_EXPORT2
-+uspoof_serialize(USpoofChecker *sc,
-+                 void *data, int32_t capacity,
-+                 UErrorCode *status);
-+
-+U_CDECL_END
-+
- #if U_SHOW_CPLUSPLUS_API
- 
-+U_NAMESPACE_BEGIN
-+
-+/**
-+ * \class LocalUSpoofCheckerPointer
-+ * "Smart pointer" class, closes a USpoofChecker via uspoof_close().
-+ * For most methods see the LocalPointerBase base class.
-+ *
-+ * @see LocalPointerBase
-+ * @see LocalPointer
-+ * @stable ICU 4.4
-+ */
-+/**
-+ * \cond
-+ * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER.
-+ *       For now, suppress with a Doxygen cond
-+ */
-+U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckerPointer, USpoofChecker, uspoof_close);
-+/** \endcond */
-+
-+/**
-+ * \class LocalUSpoofCheckResultPointer
-+ * "Smart pointer" class, closes a USpoofCheckResult via `uspoof_closeCheckResult()`.
-+ * For most methods see the LocalPointerBase base class.
-+ *
-+ * @see LocalPointerBase
-+ * @see LocalPointer
-+ * @stable ICU 58
-+ */
-+
-+/**
-+ * \cond
-+ * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER.
-+ *       For now, suppress with a Doxygen cond
-+ */
-+U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckResultPointer, USpoofCheckResult, uspoof_closeCheckResult);
-+/** \endcond */
-+
-+U_NAMESPACE_END
-+
-+/**
-+ * Limit the acceptable characters to those specified by a Unicode Set.
-+ *   Any previously specified character limit is
-+ *   is replaced by the new settings.    This includes limits on
-+ *   characters that were set with the uspoof_setAllowedLocales() function.
-+ *
-+ * The USPOOF_CHAR_LIMIT test is automatically enabled for this
-+ * USoofChecker by this function.
-+ *
-+ * @param sc       The USpoofChecker
-+ * @param chars    A Unicode Set containing the list of
-+ *                 characters that are permitted.  Ownership of the set
-+ *                 remains with the caller.  The incoming set is cloned by
-+ *                 this function, so there are no restrictions on modifying
-+ *                 or deleting the UnicodeSet after calling this function.
-+ * @param status   The error code, set if this function encounters a problem.
-+ * @stable ICU 4.2
-+ */
-+U_STABLE void U_EXPORT2
-+uspoof_setAllowedUnicodeSet(USpoofChecker *sc, const icu::UnicodeSet *chars, UErrorCode *status);
-+
-+
-+/**
-+ * Get a UnicodeSet for the characters permitted in an identifier.
-+ * This corresponds to the limits imposed by the Set Allowed Characters /
-+ * UnicodeSet functions. Limitations imposed by other checks will not be
-+ * reflected in the set returned by this function.
-+ *
-+ * The returned set will be frozen, meaning that it cannot be modified
-+ * by the caller.
-+ *
-+ * Ownership of the returned set remains with the Spoof Detector.  The
-+ * returned set will become invalid if the spoof detector is closed,
-+ * or if a new set of allowed characters is specified.
-+ *
-+ *
-+ * @param sc       The USpoofChecker
-+ * @param status   The error code, set if this function encounters a problem.
-+ * @return         A UnicodeSet containing the characters that are permitted by
-+ *                 the USPOOF_CHAR_LIMIT test.
-+ * @stable ICU 4.2
-+ */
-+U_STABLE const icu::UnicodeSet * U_EXPORT2
-+uspoof_getAllowedUnicodeSet(const USpoofChecker *sc, UErrorCode *status);
-+
-+/**
-+ * Check the specified string for possible security issues.
-+ * The text to be checked will typically be an identifier of some sort.
-+ * The set of checks to be performed is specified with uspoof_setChecks().
-+ *
-+ * \note
-+ *   Consider using the newer API, {@link uspoof_check2UnicodeString}, instead.
-+ *   The newer API exposes additional information from the check procedure
-+ *   and is otherwise identical to this method.
-+ *
-+ * @param sc      The USpoofChecker
-+ * @param id      A identifier to be checked for possible security issues.
-+ * @param position  Deprecated in ICU 51.  Always returns zero.
-+ *                Originally, an out parameter for the index of the first
-+ *                string position that failed a check.
-+ *                This parameter may be NULL.
-+ * @param status  The error code, set if an error occurred while attempting to
-+ *                perform the check.
-+ *                Spoofing or security issues detected with the input string are
-+ *                not reported here, but through the function's return value.
-+ * @return        An integer value with bits set for any potential security
-+ *                or spoofing issues detected.  The bits are defined by
-+ *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
-+ *                will be zero if the input string passes all of the
-+ *                enabled checks.
-+ * @see uspoof_check2UnicodeString
-+ * @stable ICU 4.2
-+ */
-+U_STABLE int32_t U_EXPORT2
-+uspoof_checkUnicodeString(const USpoofChecker *sc,
-+                          const icu::UnicodeString &id,
-+                          int32_t *position,
-+                          UErrorCode *status);
-+
-+/**
-+ * Check the specified string for possible security issues.
-+ * The text to be checked will typically be an identifier of some sort.
-+ * The set of checks to be performed is specified with uspoof_setChecks().
-+ *
-+ * @param sc      The USpoofChecker
-+ * @param id      A identifier to be checked for possible security issues.
-+ * @param checkResult  An instance of USpoofCheckResult to be filled with
-+ *                details about the identifier.  Can be NULL.
-+ * @param status  The error code, set if an error occurred while attempting to
-+ *                perform the check.
-+ *                Spoofing or security issues detected with the input string are
-+ *                not reported here, but through the function's return value.
-+ * @return        An integer value with bits set for any potential security
-+ *                or spoofing issues detected.  The bits are defined by
-+ *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
-+ *                will be zero if the input string passes all of the
-+ *                enabled checks.  Any information in this bitmask will be
-+ *                consistent with the information saved in the optional
-+ *                checkResult parameter.
-+ * @see uspoof_openCheckResult
-+ * @see uspoof_check2
-+ * @see uspoof_check2UTF8
-+ * @stable ICU 58
-+ */
-+U_STABLE int32_t U_EXPORT2
-+uspoof_check2UnicodeString(const USpoofChecker *sc,
-+    const icu::UnicodeString &id,
-+    USpoofCheckResult* checkResult,
-+    UErrorCode *status);
-+
-+/**
-+ * A version of {@link uspoof_areConfusable} accepting UnicodeStrings.
-+ *
-+ * @param sc      The USpoofChecker
-+ * @param s1     The first of the two identifiers to be compared for
-+ *                confusability.  The strings are in UTF-8 format.
-+ * @param s2     The second of the two identifiers to be compared for
-+ *                confusability.  The strings are in UTF-8 format.
-+ * @param status  The error code, set if an error occurred while attempting to
-+ *                perform the check.
-+ *                Confusability of the identifiers is not reported here,
-+ *                but through this function's return value.
-+ * @return        An integer value with bit(s) set corresponding to
-+ *                the type of confusability found, as defined by
-+ *                enum USpoofChecks.  Zero is returned if the identifiers
-+ *                are not confusable.
-+ *
-+ * @stable ICU 4.2
-+ *
-+ * @see uspoof_areConfusable
-+ */
-+U_STABLE int32_t U_EXPORT2
-+uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
-+                                  const icu::UnicodeString &s1,
-+                                  const icu::UnicodeString &s2,
-+                                  UErrorCode *status);
-+
-+/**
-+ *  Get the "skeleton" for an identifier.
-+ *  Skeletons are a transformation of the input identifier;
-+ *  Two identifiers are confusable if their skeletons are identical.
-+ *  See Unicode UAX #39 for additional information.
-+ *
-+ *  Using skeletons directly makes it possible to quickly check
-+ *  whether an identifier is confusable with any of some large
-+ *  set of existing identifiers, by creating an efficiently
-+ *  searchable collection of the skeletons.
-+ *
-+ * @param sc      The USpoofChecker.
-+ * @param type    Deprecated in ICU 58.  You may pass any number.
-+ *                Originally, controlled which of the Unicode confusable data
-+ *                tables to use.
-+ * @param id      The input identifier whose skeleton will be computed.
-+ * @param dest    The output identifier, to receive the skeleton string.
-+ * @param status  The error code, set if an error occurred while attempting to
-+ *                perform the check.
-+ * @return        A reference to the destination (skeleton) string.
-+ *
-+ * @stable ICU 4.2
-+ */
-+U_I18N_API icu::UnicodeString & U_EXPORT2
-+uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
-+                                uint32_t type,
-+                                const icu::UnicodeString &id,
-+                                icu::UnicodeString &dest,
-+                                UErrorCode *status);
-+
- /**
-   * Get the set of Candidate Characters for Inclusion in Identifiers, as defined
-   * in http://unicode.org/Public/security/latest/xidmodifications.txt
-@@ -1559,34 +1571,6 @@ uspoof_getRecommendedUnicodeSet(UErrorCode *status);
- 
- #endif /* U_SHOW_CPLUSPLUS_API */
- 
--/**
-- * Serialize the data for a spoof detector into a chunk of memory.
-- * The flattened spoof detection tables can later be used to efficiently
-- * instantiate a new Spoof Detector.
-- *
-- * The serialized spoof checker includes only the data compiled from the
-- * Unicode data tables by uspoof_openFromSource(); it does not include
-- * include any other state or configuration that may have been set.
-- *
-- * @param sc   the Spoof Detector whose data is to be serialized.
-- * @param data a pointer to 32-bit-aligned memory to be filled with the data,
-- *             can be NULL if capacity==0
-- * @param capacity the number of bytes available at data,
-- *                 or 0 for preflighting
-- * @param status an in/out ICU UErrorCode; possible errors include:
-- * - U_BUFFER_OVERFLOW_ERROR if the data storage block is too small for serialization
-- * - U_ILLEGAL_ARGUMENT_ERROR  the data or capacity parameters are bad
-- * @return the number of bytes written or needed for the spoof data
-- *
-- * @see utrie2_openFromSerialized()
-- * @stable ICU 4.2
-- */
--U_STABLE int32_t U_EXPORT2
--uspoof_serialize(USpoofChecker *sc,
--                 void *data, int32_t capacity,
--                 UErrorCode *status);
--
--
--#endif
-+#endif /* UCONFIG_NO_NORMALIZATION */
- 
- #endif   /* USPOOF_H */
--- 
-2.21.0
-
diff --git a/dev-libs/icu/icu-64.2.ebuild b/dev-libs/icu/icu-64.2.ebuild
deleted file mode 100644
index 8bf3f21fb54e..000000000000
--- a/dev-libs/icu/icu-64.2.ebuild
+++ /dev/null
@@ -1,143 +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 autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~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}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-	"${FILESDIR}/${PN}-64.1-data_archive_generation.patch"
-)
-
-src_prepare() {
-	default
-	eapply -p3 "${FILESDIR}/${PN}-64.2-extern_c.patch"
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 1c70ca1257fb..06bc31e3e84d 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -5,5 +5,5 @@ DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6
 DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
 EBUILD libpcre2-10.32.ebuild 2337 BLAKE2B a6659156d613e53ef1bce927e42c1a948a73868278c335bdb49b89bdc1b5dc9090afb994635e0395921748312c84ab1125a3e5acb66d916540795c9733e7fcc3 SHA512 9c8ebe7887d4ae6c6cf4138ec62021bba726a2052cb7b3c1d34ed276310e3b18e4c01d3a3ba0eb048e8234f2a72418e3749141a3bb0121c5193cfcdd72879fc2
 EBUILD libpcre2-10.33-r1.ebuild 2511 BLAKE2B abcd065375574623703679dffbb248dab0262e04a6a664f34443dae45865be1785611107cc5e58d9f76777cd8a87d74be6e785709ea89d0bbcec73a8a3bf8f99 SHA512 01fb195504b20e6fe88cb066fcaecfae1d133958d60ddfd5a9b3c96f16770becdee5e95d8230356e62c8200e2d625c8331068c20cfa3fd57821d82a37d466f10
-EBUILD libpcre2-10.34.ebuild 2643 BLAKE2B 649c567b6bc899ae6e66180a2588c2f807de795c22f1798c3b42588ef08043158c275034fa86df8555b389cc7ca68a49571d7398d6d77b94e05cdfe1327b9d7f SHA512 f4325d823527b5c0ea7f5e6fc9601fd38800834384338aff26ba304f996998d76dc657873481d4afb2fe8d9b380c4a6fcfb874baececefeb961e6196482096c3
+EBUILD libpcre2-10.34.ebuild 2596 BLAKE2B 6991aa2b8ce4b55a4ff30f2f1d8524ed920c4a457d347bf924b6049b5fddc48383364c5b08316f6aa3612606f8f62c161d073f4bba219f720e809159202a7c0b SHA512 0f45498bb09c8675acdf671bb1da9973ebd75014109b48e01422bcc8fa062a5fe676ac23c3a690b722ca61a45accc63e7fb76f48d9fc3992b9f7c05b5c25207f
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.34.ebuild b/dev-libs/libpcre2/libpcre2-10.34.ebuild
index 905bcad3168c..91c82fa3b0a2 100644
--- a/dev-libs/libpcre2/libpcre2-10.34.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,14 +8,14 @@ inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
 PATCH_SET="${P}-patchset-01.tar.xz"
 
 DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
+HOMEPAGE="https://www.pcre.org/"
 MY_P="pcre2-${PV/_rc/-RC}"
 if [[ ${PV} != *_rc* ]] ; then
 	# Only the final releases are available here.
 	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
 else
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
 fi
 
 if [[ -n "${PATCH_SET}" ]] ; then
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index edd32ded8d92..a32eb08e115b 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,7 +1,9 @@
 DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa357869f815658c3c13e04808841e5e1e847732046e212153d4e4d49bbddcd5c661cdb7f7f962e6fd0a305a534bbca074a4ca6 SHA512 9f55c9a00807e46c1c6157fc372d3cad575f2574ac8b3abc82acd26ef6425166ac18ee1b7d77a9dfc617b14bc9eb7dc3a364cef5c0bf6c4951dc755d9c6c5ce0
 DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877f6312573d54c8cf3b34e38996886f1100ddae12e34ced1c8eace1a307238024fb91b2a96e6b9e2e85d30a5073 SHA512 beb21ae2bcc5f5e7dbc8cb645e004ce923f2b77f756b48a9ec835dbe1c99afa8cdbce12c5f982b5ca880b5b1ea113570d48733a1d043a7b16ae271f5718a6757
 DIST libvterm-0.1.2.tar.gz 69050 BLAKE2B bd547e14ef2b2b7c733a88ccd975db5ccc936ad5df49221cc6877be223e48da41fd8e5cf40dbc8750a95d6efaa6e5b97d337d4a013ec534a4bbfd68279325bc0 SHA512 5d6a17b98d4dda9d0529c3686cadc1f788e48667fa133100bfb0cdc92a6b08d0ea2f1a6058f58941e1408788c4f1d5a86941ec2457e31c6582f5ddd13bcdf7c4
+DIST libvterm-0.1.3.tar.gz 69115 BLAKE2B befdb173a75652a42f3ba72682cc5c411ee170f2cfe46a22f133ca2b414f40f3af97331a4aaa34ca2a36f39b2ef92b63f2730bd872db8181512fd18f95921034 SHA512 de68b36c589638cc727fdd8153af66cc9288d32567bca1213e3769418a7b98afff68565dfd34f73f74625c39e66b60da7e658e9afa9bef4efa2072ff91d872e5
 EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55
 EBUILD libvterm-0.1.1.ebuild 861 BLAKE2B b6bead0944e8b79cd6730db0b02d675245667a3d469e4175507ea0111b719393d93929c05afa833a213c328ac21f029d0eea4dd44a54a0aa2d82c9a2d1e9ff2b SHA512 5f51122dd4c01c4eae11be5fc8e9690bb3bbd9abf11b55d68622b4c6d1d9095ca02a85c8bf028b72343a647101d55dbf1172376d36a4c82705a513406ce627ae
 EBUILD libvterm-0.1.2.ebuild 832 BLAKE2B f037c535ecca36cc4140cd9bb2d46883526e252ba477189c283deadd8068cbd41e95fc775ea24e145d8b7ef581b6927f0e4f67b251fc6f50c9b2fd906550e89a SHA512 7d72d2bd2335e516dfed729797c57a1f4119f8c9e656f2c1d20333997dd1406efee3c699330007a46ab29c7e1a31d2c503d5fad3b1f2dbbeec793c756f82fb90
+EBUILD libvterm-0.1.3.ebuild 834 BLAKE2B c0a6e9a3360e78bb5d628a5755c5effa98169c0f663dd0309df67c6854baa6fa51b49eb9e37c893f26a959407d25c68d8ecece3d8a76f80c6922035006a38536 SHA512 20e7dabdc9ec8cf057fa8f6e04ed9cc20d0c1261a628eac8dc2e2f1d416941d3b12cfb245a67701b81cf932976b880447089960b896b2a4300ab34c520ed7373
 MISC metadata.xml 493 BLAKE2B 8f975516716c1da5b84c183162a338e25b8985e10b329254c23cf3320a405e51e931668ee2f5a12dd7d7a38038e2c30f1b4b8614d739f1fb6344d3f78db29fce SHA512 2d75f4dddf3e7cc02f7dc0a31274aa8d30fe69800231a6d83ac57a8fb5692304dbe6a6190270c26ea35c4a52c0f299cf09b82584f7eeec11a081c259ab146e22
diff --git a/dev-libs/libvterm/libvterm-0.1.3.ebuild b/dev-libs/libvterm/libvterm-0.1.3.ebuild
new file mode 100644
index 000000000000..dacba680fa78
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+DEPEND=""
+RDEPEND="!dev-libs/libvterm-neovim"
+
+src_compile() {
+	append-cflags -fPIC
+	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake \
+		VERBOSE=1 \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+}
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 21378a470c88..f0804870a160 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,8 +1,5 @@
-AUX marisa-0.2.4-python.patch 683 BLAKE2B 5d26607877b3f4614a558d085de11360783d2a448749e7a7fed2ac805e4b6dc5d4b89c29c37fe70a34cc4745789b9ff93b4f398860d8014303a4290bbd1196c5 SHA512 fa718a385cfef196833f5a9aa23c31839505a0101df3d25a73616942845668891f818213b89a36689ec93e678289128add1f6450e15fb995233621faaa76d700
 AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
-DIST marisa-0.2.4.tar.gz 502552 BLAKE2B aa8e6ce11c35db41f386d1c5d3ffdf56a940f298e10a7f6b1fa14cb80c27c9c4af1d4d61c58786f96e9598effe26379127c69b8fe72b1ca561a44ee2b9cddc61 SHA512 71aee3ae034d1ce725d986bef43472d61bd64f0af3ccda01bb019cce03f0872629b6a1b305e717056bef06e036372323b2a67e5dc69705d6a74e028b5e2553e4
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
-EBUILD marisa-0.2.4.ebuild 2304 BLAKE2B d6a532c61ce90997b21f0fe4ba78921cfed56a0cb37fd581104a4f5ad4dfc0d344fffea0e06522ef95c2dfb9a1ba61587521da0ea5b93d7fd79c67bb526f06e2 SHA512 36954927ec4154e43b01f7498dcc25ad5d6f46e463af3bd82275a3bd3adc1a010f783a05881537de801582df5d8795c53c627016cb77620d0741edeab47f9a8e
 EBUILD marisa-0.2.5.ebuild 2229 BLAKE2B 892624c70436db9f826a843def566b081a5062ceee70f59d59fd5f2c63944c1fe05d8cef3c0da48cbd259f6c42e07815042d06eace22cd81820a8ec192887db6 SHA512 07e5e79b72d0d8b0a6b77c39741fcfb58dc9b03b5bf6493005a060ff0e28e26f4ecfdf3e490fdfd0d67dbed90fa86d5afdf4f70bafb3bf13970b19221875c337
 EBUILD marisa-9999.ebuild 2139 BLAKE2B 08fe3511b7340f07991121f9d84e36bd69a0c6a479ecfdd5f4c044174b501fbe1ff6f44226c33aa7ac20fb2b554be3e038a3d2893476e81cb810cec7f61e2c7d SHA512 3306d92fb8d241f09ad57fd1a8f7004ea85be1481d3f808f07821ce295c42566fceb732e358bc49797617767bf06238fc349f48aa0fb0be3f6ce0570b85d3285
 MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
diff --git a/dev-libs/marisa/files/marisa-0.2.4-python.patch b/dev-libs/marisa/files/marisa-0.2.4-python.patch
deleted file mode 100644
index fba0e016d475..000000000000
--- a/dev-libs/marisa/files/marisa-0.2.4-python.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- bindings/python/setup.py	2011-05-14 07:20:52.000000000 +0200
-+++ bindings/python/setup.py	2013-08-02 17:04:16.423771834 +0200
-@@ -1,8 +1,10 @@
- from distutils.core import setup, Extension
- 
- marisa_module = Extension("_marisa",
--                          sources=["marisa-swig_wrap.cxx", "marisa-swig.cxx"],
--                          libraries=["marisa"])
-+                          sources=["marisa-swig.i", "marisa-swig.cxx"],
-+                          swig_opts=["-c++"],
-+                          libraries=["marisa"], library_dirs=["../../lib/.libs"],
-+                          include_dirs=["../../lib"])
- 
- setup(name = "marisa",
-       ext_modules = [marisa_module],
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
deleted file mode 100644
index 94066df3c186..000000000000
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
-HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
-SRC_URI="https://marisa-trie.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86"
-IUSE="python doc static-libs cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_sse4a cpu_flags_x86_popcnt"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )"
-
-# implied by --enable switches
-REQUIRED_USE="
-	cpu_flags_x86_popcnt? ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse4a? ( cpu_flags_x86_popcnt cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse4_2? ( cpu_flags_x86_popcnt cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-python.patch"
-	if use python; then
-		pushd bindings/python || die
-		ln -sf ../marisa-swig.i marisa-swig.i || die
-		ln -sf ../marisa-swig.h marisa-swig.h || die
-		ln -sf ../marisa-swig.cxx marisa-swig.cxx || die
-		distutils-r1_src_prepare
-		popd || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse3 sse3)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
-		$(use_enable cpu_flags_x86_sse4_2 sse4.2)
-		# sse4 is just an alias to sse4.2
-		$(use_enable cpu_flags_x86_sse4a sse4a)
-		$(use_enable cpu_flags_x86_popcnt popcnt)
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		pushd bindings/python || die
-		distutils-r1_src_configure
-		popd || die
-	fi
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd bindings/python || die
-		distutils-r1_src_compile
-		popd || die
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		pushd bindings/python || die
-		distutils-r1_src_install
-		popd || die
-	fi
-	use doc && dohtml docs/readme.en.html
-	prune_libtool_files
-}
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 2d58d4a6f407..a1da54aaa647 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -4,7 +4,9 @@ AUX msgpack-1.1.0-gcc6.patch 900 BLAKE2B 770cce3486efe6b402a5d8a54c317cc31e603a3
 DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
 DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3 SHA512 cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
 DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B 6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478dbbbb60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14 SHA512 f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
+DIST msgpack-3.2.1.tar.gz 1234733 BLAKE2B 97fb6cab5125463f10e7ad2c55ee478b2bf3dab5628a40ce1b0bcdd96cc002f5c99e495592c91f1342e6623d32b5594536de226b0bf80e1cb5290dae9b0566dc SHA512 68d06b05a1f00a3d9d7d39313a9e11f42828606c39d9d4c07673a48c9b88028a6316f2a964881cc8e4d185616a037711f02a7d3cd6029eadbacf52145603538b
 EBUILD msgpack-1.1.0.ebuild 1055 BLAKE2B f50c69aa071803feb8fe923a4013555713f275c0efe59d6fb72664275a590b45f5b6c95e3514d8afb170c85f68ea9e3f5d9cebc6baa12b7ee3b02a09c80c3994 SHA512 39c31dd96a67f9c8e36b68c6c4f7392eb90305934696b47464eb2677323e0a59cbe1100d06d2e23455e75b8fb671f90d4a6347abb13b8c43f35608f185cd69ef
 EBUILD msgpack-3.1.1.ebuild 1717 BLAKE2B bf44d36d1b0c747d054699dfbc13b4d51badbc80575ec44769ea1f27459ec50fdcabc6b1b3c76273ee686fc843561ce6e02ba883c159ffcf48fecf21bfc24e32 SHA512 a1bab4c161c0493441413584d0eb8957b5d074809c5008d1084bb2da9c1bc9741bdd5562dacd461cc96f873a2181abdb5f209a0a8ee716752089e33cf2bb47cb
 EBUILD msgpack-3.2.0.ebuild 1715 BLAKE2B 48a074fdc4f7e465d1339914853469eb240edecef610d6f4d81018bfd945601ad3891ac4e32e9fb9e36b4aa53052301546808519c5b54ca6ef65a72e66cc7f10 SHA512 7c1f10c53ab2f13a259bc43fc8e485f6d523b1bf9a9e21c36e367967d3f5e1fbc530cca28267e56ecff89fec41f3f3b918a6934da80da568f8182f3c644b21c8
+EBUILD msgpack-3.2.1.ebuild 1717 BLAKE2B 14d3ca227d4ecb9b903b9c251a0b5895475c50f2fb03af2bba5ed4d9fb29db022acd981acfbecfb08b88315211a99aa957270a54743589f9bdcc69b10b4266b1 SHA512 e86438ec6993a983eff96bb8c0c553a57269d928d2a0536b2a7e30cc690e851d43e9b8cb9e3907d17bdfdf3721db9b76d9293bf5c44f748e178029380ab92c4e
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/msgpack-3.2.1.ebuild b/dev-libs/msgpack/msgpack-3.2.1.ebuild
new file mode 100644
index 000000000000..9e7faeb02180
--- /dev/null
+++ b/dev-libs/msgpack/msgpack-3.2.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
+HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
+
+LICENSE="Boost-1.0"
+SLOT="0/2"
+IUSE="boost +cxx doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+	doc? ( app-doc/doxygen[dot] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMSGPACK_BOOST="$(usex boost)"
+		-DMSGPACK_ENABLE_CXX="$(usex cxx)"
+		-DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
+		-DMSGPACK_BUILD_TESTS="$(usex test)"
+		# don't build the examples
+		-DMSGPACK_BUILD_EXAMPLES=OFF
+		# enable C++11 by default
+		-DMSGPACK_CXX11=ON
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		cmake-utils_src_make doxygen
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use doc; then
+			local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+			mkdir docs || die
+			mv doc_c/html docs/c || die
+
+			use cxx && mv doc_cpp/html docs/cpp || die
+		fi
+
+		if use examples; then
+			docinto examples
+
+			dodoc -r "${WORKDIR}/${P}/example/."
+
+			docompress -x /usr/share/doc/${PF}/examples
+		fi
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index be33a7c055ad..c05af27d7c96 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -2,5 +2,5 @@ AUX opensc-0.19.0-p11test_common.h.patch 2969 BLAKE2B dd5e309fdaa847da43fa811f3c
 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
 DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
 EBUILD opensc-0.19.0-r2.ebuild 1677 BLAKE2B 979c4377b0c7ad3e53315b39200a35d52b3dab90f1e5ee399103730f142110b3958904042147cf07825bd45c2b8b94d51a9ef92d14608b30585f9c5217f8472e SHA512 606d3341d01f6c471cc4e8f979ec5a9811ee245ff8996bfbab96925ddf857bfbcd69de9eec91968503307ac75557b28f1dccfa067ee74b6f39ce5b79b84426aa
-EBUILD opensc-0.20.0.ebuild 1604 BLAKE2B 9ef9ab943e90ed8b14b62ea79fa2d7399167b67b13ff4cc728acbc79dec18affc208ece35033f656edb0531b43d692d297dbb2b7f79e300261c5aa9a6dabad9c SHA512 c248df1729c8fb31481b77487f9109f592e7f53138db7381cd939522a907445f476942c7ad606ea1cde56733f7e4ed37c488829b7b5891b7ae79e346b92e02d6
+EBUILD opensc-0.20.0.ebuild 1599 BLAKE2B 7adada7f2482c75a245f1300055b0e10ad917764c04add7fc03ed4876089d1619ff3451c5b462f51fa32b5392d58a15df7629aeed558b678b76e6fe0a50e060a SHA512 e964112db9cda9a939f9e842417bfda8f113ff2a68bb56acdb6be596169fa6901e2493b750d52644cd0a361ea9ab1c36a9834648c6e1a4862f83c96663e84ee0
 MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild
index 7dd7147094b2..625c0206a763 100644
--- a/dev-libs/opensc/opensc-0.20.0.ebuild
+++ b/dev-libs/opensc/opensc-0.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index e503bf300eda..de70aef447a0 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,7 +1,9 @@
 AUX pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch 1670 BLAKE2B f5e4404a29ea2706961d8611399f07082b605c8b7d1849df854240f4ce87c73d30df0c69aeaedca2b4e5a2ff2fc340998af51c04a410b151e377b701a86f3458 SHA512 90c3c8b2a9d1d205829f58bcdce567d849b4099366bbcdc3eba11b4c3bf04151f66ebd3b7bb983ddfd2dfeb937164fba6d4046bfab3dbc5554b508477f2d5798
 AUX pugixml-1.9-always-install-the-pkg-config-file.patch 2820 BLAKE2B 768af20490d163f581a4c683426055fe50fee716e29124d4af28d1a347dbb4e48ff4ea95eab93820ec69d875ece957f66977ff68288b452ba20d2151b9c8c78d SHA512 5ce40e7838ec950902a02b74ebd81958ff821e0dc0a2d8be8d65e194c40c32056f137a8cdbbfa9beaf43665f261c3a8db18e8f6485c3b903f7e59840702ee250
 AUX pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch 1641 BLAKE2B 281f24717276e7e21d380d048e6e6896fdc89de88f1ee8745b9880b0c39d5c0043af6f408bd2bfb6dbbea1ef3e516635ea486ed1f247e5b5ef19f7c7e01358a0 SHA512 60a1b80b26d663cccc2da4ed3b2fa631ffe1dd09a62d7e42a00d28844cb097be6c682aa6ecf92e2ce3d9c20569e23d2f1e8133af6c1eb4ceb3f99692fa5c1623
+DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
 DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
+EBUILD pugixml-1.10.ebuild 569 BLAKE2B ec211c15417bba351d773d29d2dcfee760596e847be1767249e93fadccb6aee48f83aaba0c2149b5260a0bb3d4a163495793e163d50e0c1d02f1f84db5ae21ac SHA512 76d5aae611fca7d0cfa32d66ed574bd766c6a2052fe3a8a7570c8b31416f3c8db75524f297b7930f6cbb293bd645c6d0d9c7d9445a960aee4e8e7d41ac70afc6
 EBUILD pugixml-1.9-r1.ebuild 775 BLAKE2B ca17f0fc74d4eb47c0b67f61442acc64a8ea1b7176ec411ae5b5a8ba7a9eac443fca99ce27427691eadb1b793c96e6e777c1957b5f69ec87ae05af671571c1af SHA512 0f32da89b78cf48f7b0ca2d6e745892c9ab449d22052f64eeafd5e0018aec0faffc88f9769494bb0adff7b7cb734cef19245b42f1b8c5126f038edcd089989d5
 EBUILD pugixml-1.9.ebuild 585 BLAKE2B 131575f7432ca4a912b7b45006c35d2fffe8e54f3a6b63def1d723fd587c20e58c88ec8ab9a31664732370e9771e427b30d02e0fde9082689693b7010cddf3bc SHA512 5d62f6ec363f503debb8082c699c21744e9a59a3419d10a88dd51c57425f4ce0944b86ce8836efb6be228822a341799015410934fd139b274bc2b2114ae4f90b
 EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
diff --git a/dev-libs/pugixml/pugixml-1.10.ebuild b/dev-libs/pugixml/pugixml-1.10.ebuild
new file mode 100644
index 000000000000..4e1d8c3dce85
--- /dev/null
+++ b/dev-libs/pugixml/pugixml-1.10.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
+HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
+
+LICENSE="MIT"
+SLOT="0"
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 7facbb84d18a..d98425ee8d42 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -3,5 +3,5 @@ AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473
 DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
 EBUILD redland-bindings-1.0.14.1-r2.ebuild 1331 BLAKE2B d275c6df8aa46588a6019fbe5c0a02cf52cb50a04ef58e0f581fc3c2c47d91e4feea2654e8d735d50d39722f19115436e033caebc3bde73c9f04477877d53c0b SHA512 a05fc7daa0b42aade87680e5fdf4705da2efaadcc5b20d283839cca038e5e45e3f81520f210b8559f311ef5442c23655ad95efdd58d68c11cba3a41d253bf3d6
-EBUILD redland-bindings-1.0.17.1.ebuild 2489 BLAKE2B f93016c80dc1c2b07f80d3b63210f20a00c91059b89fd929e319d09def1483648b7f277f5b6e5c4dd82784d8020b0e3ebf01a2a655ed449f592818ccd448ad0c SHA512 5bdb893ca819a9557ef25a93d0e40e4a5be5dad9ebb98e9fb7b5bf25dee4bd77a820a78cb4aa8083d1ede74701a08a74edc9bc46a704a4efa18af60d60a8d049
+EBUILD redland-bindings-1.0.17.1.ebuild 2653 BLAKE2B b3ab9239ec293e96940efc94ff0a1d0e9bac9d7067b578870642d979d9e46363f7d4099c7051149bc191f64810cc741a50239841135379fb9276c6d33b8627fb SHA512 90c5e62338df3c1918f234256428201fa548387a4a9f4ce652a878a1ba8d28eeb10418048a147a172ea55aa9eabddb40705bc6b5dffd1f200427dc822645dac4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
index b03e9531a939..73d8c3bf66ef 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
 
-USE_PHP="php7-2"
+USE_PHP="php7-2 php7-3 php7-4"
 PHP_EXT_NAME="redland"
 PHP_EXT_OPTIONAL_USE="php"
 PHP_EXT_SKIP_PHPIZE="yes"
@@ -18,7 +18,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos"
 IUSE="lua perl python php ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -27,8 +27,12 @@ RDEPEND=">=dev-libs/redland-1.0.14
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( dev-lang/ruby dev-ruby/log4r )
+	php? (
+		php_targets_php7-2? ( dev-lang/php:7.2[-threads] )
+		php_targets_php7-3? ( dev-lang/php:7.3[-threads] )
+		php_targets_php7-4? ( dev-lang/php:7.4[-threads] )
+	)
 "
-#	php? ( php_targets_php5-6? ( dev-lang/php:5.6[-threads] ) )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=dev-lang/swig-2
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index e8e3d8064b52..b287384bf7a3 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,3 @@
 DIST sink-0.8.0.tar.xz 295064 BLAKE2B 8187520979b43966a4e2d782e0ceb651c49eb25a349e2f9f2251b47978b0eebe64a98ce8c04f1854cdd05779f01c2cb68f1fa008568c1e95d292dbcd65fc61fe SHA512 008ca8355ffbed2bf89a906510aac4c505c8e44de49f445db283aa565e233e7652f2e46c5bcf37e680dec940a8c0f1525e6a8f708e1b4742db62522255c8bad6
-EBUILD sink-0.8.0-r1.ebuild 1129 BLAKE2B ada5bc9d8bc7de4375b19ab875e426401860eec1ebaebcb1a846ad982aa1473e26004581dba5105631ee42294b1fb7927562188b4a4a186cf7105cad61d77b87 SHA512 662d5bebdc8c6364ed509be48b3bb80d780267c9d17e40919c0f7ea03853e37191bf41bfc470696cd8e7d23f439d25afff136db8a78a6bcae6f8a36e64ae503c
+EBUILD sink-0.8.0-r2.ebuild 1395 BLAKE2B 2131b25a7740db64ffa0dec68611ce6b487b60f5c1dea9331378acd8fa17cfcf0891db81625a175cf322a390ba665c74916385e82ccf57d5c022cbf507934a17 SHA512 7de0086b33b5921fac78e0b62dbcd7cab41bdb2ced155db7e2a2bce1259a2f8f2ec8f50e0dd4025516230c62a3eb177601ddc70b621ed9715f2b1db7d29e8101
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/sink/sink-0.8.0-r1.ebuild b/dev-libs/sink/sink-0.8.0-r2.ebuild
index 439b04419d72..02e229bc471f 100644
--- a/dev-libs/sink/sink-0.8.0-r1.ebuild
+++ b/dev-libs/sink/sink-0.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,25 +15,21 @@ KEYWORDS="~amd64"
 
 # qtgui is bogus but is required because something else in the deptree
 # uses it as a public dependency but doesn't search for it properly
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:5
+"
 RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
 	dev-db/lmdb:=
 	dev-libs/flatbuffers
 	>=dev-libs/kasync-0.3:5
 	>=dev-libs/xapian-1.4.4:0=
-	kde-frameworks/extra-cmake-modules:5
-	|| (
-		kde-frameworks/kcalendarcore:5
-		kde-apps/kcalcore:5
-	)
-	|| (
-		kde-frameworks/kcontacts:5
-		kde-apps/kcontacts:5
-	)
-	kde-frameworks/kcoreaddons:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	kde-apps/kmime:5
+	kde-frameworks/kcalendarcore:5
+	kde-frameworks/kcontacts:5
+	kde-frameworks/kcoreaddons:5
 	>=net-libs/kdav2-0.3:5
 	>=net-libs/kimap2-0.3:5
 	net-misc/curl
@@ -46,9 +42,13 @@ DEPEND="${RDEPEND}
 # fails to build
 RESTRICT+=" test"
 
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
-	)
-	cmake_src_configure
+src_prepare() {
+	cmake_src_prepare
+	# tests are sprinkled all over the place, and examples are needed...
+	# disabling tests disables installing 'hawd'... what a mess
+	sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \
+		-i CMakeLists.txt examples/imapresource/CMakeLists.txt \
+		examples/mail{transport,dir}resource/CMakeLists.txt \
+		examples/ca{l,rd}davresource/CMakeLists.txt \
+		|| die "Failed to disable tests everywhere"
 }
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 6ab12314f758..948ce32cb82d 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,6 +1,4 @@
-DIST utf8_v2_3_4.zip 22422 BLAKE2B cf736876a99068c7e5cb1b0b892d1d63cb38906c993c60b78c8c5625aef86fac3a849551771d0840c3cccf04f1a3617216cbd4684fa5cdde0037e3901c70ff4b SHA512 0e85e443e7bd4ecbe85dedfb7bdf8b1767808108b3a4fc1c0c508bcf74787539ae0af95a31a70e715ca872689ac4d7233afc075ceb375375d26743f92051e222
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
-EBUILD utfcpp-2.3.4.ebuild 536 BLAKE2B f0ea01b1af4dba1fccb992c590e419941123a123fc451c335a160ea8ce3ecde2a2cfbe82dc99555ee374663ecc7555a6462624720a42299c39a59b3b09477846 SHA512 b769ca26494a135688895450b48b914e6af28c3f52398b3b5e7d5860efac7253acac3ee523f9a6e7742bd4e72aba14b674ad09ecc52274e90c7ecc3e514c91a9
 EBUILD utfcpp-3.1.ebuild 948 BLAKE2B 387a70b0dbdf706c8b41620ff54938d2b0f21ed45061173e29910ec352207d0b5c933ed99048a3fa04fff13fd615ef6abfdeaac104ec9596230d18b18a7650ba SHA512 a97cbda1e503c591504368101a3b150aed6d5b215fb2f115d45ba781c2fea849672876bf9369ba5d9c8ccad52f58d0283a870ae6e0df43ec1e2d7be8b87359ad
 EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
 MISC metadata.xml 494 BLAKE2B 9e52a09505cc2bdae2fd434169a21ca63d48d62dd917bf2fcf15a54378b1894191cacc0c676705c731cbc05720723604b18c1bc982da036168d6b9bc184d1b71 SHA512 af81373c64b07a3650d3a613d0b260a55740ce140546db9f7b839c5b5b7f7b02abd85307e033a980da8a1182fcbc5182c0415a3bb8a89d3fdfaaee8eeb648612
diff --git a/dev-libs/utfcpp/utfcpp-2.3.4.ebuild b/dev-libs/utfcpp/utfcpp-2.3.4.ebuild
deleted file mode 100644
index 97954a553c9a..000000000000
--- a/dev-libs/utfcpp/utfcpp-2.3.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Portable and lightweight generic library for handling UTF-8 strings"
-HOMEPAGE="https://sourceforge.net/projects/utfcpp/"
-SRC_URI="mirror://sourceforge/utfcpp/utf8_v${PV//./_}.zip"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/source"
-
-src_install() {
-	doheader utf8.h
-	insinto /usr/include/utf8
-	doins utf8/{checked,unchecked,core}.h
-}
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 8c64ed6d5bbc..dd97bb5a30e0 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,4 +1,9 @@
 AUX zziplib-0.13.69-SDL-test.patch 453 BLAKE2B 645e55b034ec72abbab26fad4062cf9f7137aeeac2cc33aad89d9b86f4b616b5bdd256d383bfaa3252459caa2150f1b6426d3ca31ce8c055d0cae92d81547cd1 SHA512 2a524efc04721459cfb744ce7d0e3b6a4412e791250442632093116e181642184ba3cfa4a93fff8bdb792a03c293ab317696a78aed422ec75c26448552bc5721
+AUX zziplib-0.13.69-disable-docs.patch 1700 BLAKE2B f0e4ef353a9c0d86d8eb345bf03bd1f1008e81a019cc60ab480e66327fe0db06b6efb35c5ac556c1539426b56a88a9bc4ff8974f9600414d5d1fa7a4cdc577d6 SHA512 3c0b95209e215d955b1710d08dc4976caaedb512aec926b376adb7393c1cff4c269ee5741feddd8a1c4ca5e5ebfa987d40ffe5d966d799e659bc5606acd2b6dd
+DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc1614222cb9607e832618e7534cb55a022f2ba3d2c6f8c6337f4bf9e80a350e43eb05a4c1708b63efa5e0ed10297a5f19ec7adb SHA512 211a83594d4043a29472f9c556d72ad486e40f28d55426b970b8b0617aca76f9dcbd4a3ca5991df943dfac1a1cab623b19aa04fb6ef7807a7740730e01926205
+DIST zziplib-0.13.69-man.tar.xz 10988 BLAKE2B 2c3c5cfd17b3d3e17a3e72031b2246e32c9fe471b9578a4717c128725493054ceafc34763a763d31cf5532f082a596a6bceb8e417ef70476a59f4daa0a14b587 SHA512 5a804896a2d06b1d32d6b8715ffdb374ff7179145d033e919acecd46426dad3e44d4889adabce33e7f6bbc18e2b70b50a8a059498bf4f1f3d6844dda90c33c7e
+DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad8593b2161e2acd76122a982339154cd76d58b5398c61f605e3e29e0f63399c9a176710f95a1e6632ff4e1249ac596978006b SHA512 16190e20b8c722f3aee8e77ef7cc24026976b067402430c833d21761a13e32ed5f2eff543a2c13469e442d01c2ed5ae373badd6b8851c962852d6c09620a0d91
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
+EBUILD zziplib-0.13.69-r1.ebuild 2371 BLAKE2B 1596a6b8b257f099926fa9a4334f12746251767fe84b652888ac1bce8a1a8f799263fb77f0b047bd045213381fdd8cf47e1c72e9826b97f4f943a878d3e8c414 SHA512 5fa0a17db47ffb517a4dad4f401eab345876a42ffe4a269f322c786df9ce4c52d4537ec0f8a1a9788ef95c6e4c21a3532b8c732439accc0c9478574c5f80a3c6
 EBUILD zziplib-0.13.69.ebuild 2320 BLAKE2B 86d2e5148cfb1b89a322c611d9240d59a303b2433a767718e7bc53ef1e5db6e3d7867a8e28bbcf32b610b34576dbeb0dd3f2817c5b5d1960f7e95dfc94351f38 SHA512 aa7fb89b20dbcabcbcbc800bbf07058538d30eb5de9fee6f8e6766645ececf2691ba5ab4586a6494f2299d1abc9760b780841ffd65c7ea05253e87984f7c9e69
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch b/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch
new file mode 100644
index 000000000000..8b492d10f56e
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch
@@ -0,0 +1,48 @@
+From b34cf087aaa0b02c4a9c9ab6959a3567ad31acea Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 17 Jan 2020 02:01:01 +0100
+Subject: [PATCH] Disable building docs (requires python2)
+
+---
+ Makefile.am | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c54b2cc..560c9e6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,8 +3,8 @@ ACLOCAL_AMFLAGS = -I m4
+ WANT_AUTOMAKE = 1.7
+ WANT_AUTOCONF = 2.57
+ 
+-DIST_SUBDIRS = zzip zzipwrap bins test docs  SDL
+-SUBDIRS =      zzip zzipwrap bins test docs @SDL@
++DIST_SUBDIRS = zzip zzipwrap bins test  SDL
++SUBDIRS =      zzip zzipwrap bins test @SDL@
+ 
+ rpm: dist-bzip2 $(PACKAGE).spec
+ 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2
+@@ -62,9 +62,9 @@ osc-distclean:
+ indent-check:
+ 	(cd zzip && $(MAKE) `basename $@`)
+ 
+-doc docs docu clean-doc clean-docs clean-docu   zzip.html zzip.xml zzip.pdf \
++doc docu clean-doc clean-clean-docu   zzip.html zzip.xml zzip.pdf \
+ man mans manpages htmpages unpack clean-unpack  changes.htm pdfs \
+-omf install-omf install-doc install-docs install-man3 install-mans \
++omf install-omf install-doc install-install-man3 install-mans \
+ upload-sourceforge www:
+ 	(cd docs && $(MAKE) `basename $@`)
+ 
+@@ -104,7 +104,7 @@ msvc6/zziptest.dsp     msvc6/zzip.dsp
+ EXTRA_DIST =   zziplib.spec zzipback.sed Makefile.mk \
+                $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps)
+ 
+-PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \
++PHONY = auto boottrap rpm doc man manpages htmpages sdl testsdl \
+ 	comp compats msvc6 msvc7
+ # ------------------------------------------------------------------------
+ 
+-- 
+2.25.0
+
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
new file mode 100644
index 000000000000..582884e002c2
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools libtool flag-o-matic python-any-r1
+
+DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
+HOMEPAGE="http://zziplib.sourceforge.net/"
+SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-man.tar.xz
+	doc? ( https://dev.gentoo.org/~asturm/distfiles/${P}-html.tar.xz )"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc sdl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		app-arch/zip
+	)
+"
+DEPEND="
+	sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${WORKDIR}"/${P}-patches )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	use test && python_fix_shebang .
+
+	# workaround AX_CREATE_PKGCONFIG_INFO bug #353195
+	sed -i \
+		-e '/ax_create_pkgconfig_ldflags/s:$LDFLAGS::' \
+		-e '/ax_create_pkgconfig_cppflags/s:$CPPFLAGS::' \
+		configure || die
+
+	# zziplib tries to install backwards compat symlinks we dont want
+	sed -i -e '/^zzip-postinstall:/s|$|\ndisable-this:|' Makefile.in || die
+	sed -i -e '/^install-exec-hook:/s|$|\ndisable-this:|' zzip/Makefile.in || die
+
+	elibtoolize
+
+	# Do an out-of-tree build as their configure will do it automatically
+	# otherwise and that can lead to funky errors. #492816
+	mkdir -p build || die
+}
+
+src_configure() {
+	cd "${S}"/build || die
+
+	append-flags -fno-strict-aliasing # bug reported upstream
+
+	local myeconfargs=(
+		$(use_enable sdl)
+		$(use_enable static-libs static)
+	)
+
+	# Disable aclocal probing as the default path works #449156
+	ECONF_SOURCE=${S} ACLOCAL=true \
+		econf "${myeconfargs[@]}"
+	MAKEOPTS+=' -C build'
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+	default
+	doman "${WORKDIR}"/man3/*
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+src_test() {
+	# need this because `make test` will always return true
+	# tests fail with -j > 1 (bug #241186)
+	emake -j1 check
+}