gentoo resync : 03.03.2021

16 files changed, 139 insertions, 105 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 8aa1c85cdc33..5654bc932ae3 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest
index ab3da3600179..9f9d686c0fc4 100644
--- a/app-i18n/ibus-rime/Manifest
+++ b/app-i18n/ibus-rime/Manifest
@@ -1,4 +1,6 @@
 AUX ibus-rime-1.4.0-fno-common.patch 278 BLAKE2B b4ec86e71074309ccacec7299b5c6f5e9eda55af3b1a8e5a8db105833c5482fd10aacf22e03fd61bea75646930b3285c8a2a6b907f54223556cffd3884beebcc SHA512 45fd643cea9695b92eecc76e93a7908967b3eb66a108541ec6733c1a6e145ef43aa81592666db1d811b2460593ac3a0b1432990d387f58c897bfd1360f2a9b80
 DIST ibus-rime-1.4.0.tar.gz 34176 BLAKE2B 69d0392adc78b2b8935f2239c4567d001d3636d0e8ff59aca0b04b3189751a3edd0350eea9e2262b3ae3e639dbd9715c157e44727cc48ba9521801161a1508f4 SHA512 3fc24f4ce390e27d37e41775e4c075c7465cd3e90a9ab61d13ec47c2ca1c2afaafb322f327e18be573aa254a43b8cf6426415500a5d817b835bf4e0615ab9145
+DIST ibus-rime-1.5.0.tar.gz 35170 BLAKE2B 30cba341c3ae29438bf94fd93f030d6aa4fde3988d11b1b5e92aa4190ceac7e0776e07248cb1930819f455b378e01e3305fbf687efc997e675f23ff3120037ad SHA512 59b05efe7d5c7dd6dd88a213f05967b19f4946ad0685e29c6c87fbc47ffb3059cc16c88403cfbb945bcbf8637b20d34dcfd91d442c23bb6a9a18d60febbaf27b
 EBUILD ibus-rime-1.4.0.ebuild 807 BLAKE2B d4c5bb3ff31b04e07c072a1ff44b934d74d56b5dc39726d44dfec7390ae4213c0fc401c0223d4d3b139874d8e0436e01459db877024700871c2a66c817731cc8 SHA512 e1102beae2168d556f306e05b4960a4fd94eefc3978996ba6fdd06d0752268f67d0d006d53adc9e993914e70b97cac9e8c20e7c12ef339ab10155ffca77e657d
+EBUILD ibus-rime-1.5.0.ebuild 688 BLAKE2B d700726025c5b7bc0a511893a48867a8401f76df278933813e5119ff7edc46269fb739bf0b6134a7b87b45325c2cc4623c25caa1cca113e08b1dcfc426de85c3 SHA512 67737e557f02c3dd505097420500af2eb6324e6784faeb9069f7f14abc6fce218fdfaa5d90033aca2e48c366224417803966ebd97c10b06e852071d27a51351b
 MISC metadata.xml 534 BLAKE2B 0d1888080b3fcf1b2bd5ef07456c8ed3f91dad7e11bb1c34882a43ad2396bc6b5bb62f49bf8af4936d3d5df84b6af30dd4dfcf48ef343865ac36e50da26d061b SHA512 78e2d7631f65652305b451e5b4ab95886dd8a1c2436fb95c0f344daae87feab1eb57486a0815348363858faf91f9b931f32166a9b22b7613bd3b1407ac19e317
diff --git a/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild
new file mode 100644
index 000000000000..5de798801e46
--- /dev/null
+++ b/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Chinese Rime Input Method Engine for IBus"
+HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
+SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	app-i18n/ibus
+	app-i18n/librime
+	app-i18n/rime-data
+	x11-libs/libnotify"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/cmake
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "/^libexecdir/s:/lib:/libexec:" \
+		-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
+		-e "s/ make/ \$(MAKE)/" Makefile || die
+
+	default
+}
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 6edc5b700841..113ba05ecbbf 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -4,7 +4,9 @@ AUX librime-1.6.1-plugins.patch 7447 BLAKE2B 95f1b8f412e6e12c8c702d2295966831d4c
 DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3
 DIST librime-1.6.0.tar.gz 2856645 BLAKE2B de6d843a5028f6b0308c3432ada7dd00c08a71e73fe799b157fd71a4054c757a00d3b0fdc7743d94d6e87b03f256e822ee29c16c86f96f5d24c7d864266c4f78 SHA512 4aeace0f1628293d4b607483ab976841093a1ff03df8bf63d545715af00254d1f0b1bdcd120795ea688d152287069881e0740372f40e2174a14ae6f53b7f950b
 DIST librime-1.6.1.tar.gz 2856751 BLAKE2B c6b01342dcc9e8ee571cb14a36b851a50bf7b191211197421647ab05e6fa64c676f8936920870dcc335d06c635e354fed706832e41192bccd0a17aff02df1a43 SHA512 944361e9459662bb97b97ce9e2651acf0beb368b3769d1b9576cf4e5c2779302cae470fa39f5bc262cabb6a0e8590bcb77d32ffc87d7385b9465869fe7d5bcb3
+DIST librime-1.7.3.tar.gz 2859513 BLAKE2B 834622860cdc3038d1b983f476bca70f211dfbc3bc2b565a998163e22688841ee3a0c7f9a64bce285e2f3f5b5a9a802bd5506f17904ccb3291babf80d4748fb5 SHA512 8767d17c3d14a5a1bbb8269fab1627b907de72c288b362fdbc6191223937da21e8b18471b4ae8f83ce5afc0ec5c3ab12fbcb49930eb9969c1764c7390d9ee4b0
 EBUILD librime-1.5.3-r1.ebuild 1598 BLAKE2B e2bea3ac09fb0f5f132382caa6a37b8fc3e674688fbbba71e68a5a48e1375248633ec5de170030a5d734f18e294aeb8c3b2b2cba9d033c56bdd88e9709c14c1d SHA512 9c389f0f4ad573bada9c18bdfb3af3cac4f17e42f3bc1fe5d308fed123a3458a28e243f0ac4134753d24b1cbffb644707adbf693fc0f01d5fbc5eb25177bf416
 EBUILD librime-1.6.0.ebuild 1584 BLAKE2B 035bd99e4e49b12cbafc581771d287c0743716af721c674be05c1b7d5a0df8586c504532485a169c535b51ccb332a5a1d43d504d758ebb17c0ee1915d1c5afaa SHA512 381fa20d6a5da0b34d05aed7c53bba10a36029eae10a062c86f40dc7767e07ff1800d799e80b14b7a4e5719e6b32e5364fdc03d557344f24cb14a8097095a9b4
 EBUILD librime-1.6.1.ebuild 1584 BLAKE2B a066ec82c81cd7d1252a24160c340dd8a44a88dee42638aafddc98944344dcc8cc367dda92f0e6f9b006e18bbbd84621acfc5bba48cbbdf23ec4e77c7a6e7381 SHA512 1599d5dcfef15e4c7627fc716fd57ea5e9aeaec60d45f82d0c51893cc363d1d53d235cbba029d6079a368ef43a14ed450873f7efc4ed8ff2cc9b31b109f3cd01
+EBUILD librime-1.7.3.ebuild 1535 BLAKE2B 903bf96d278e0bfabe6d0a23ba027a6580d41ef7349c4193622a3501ac2163b3d1fa247d057668b9a18177d08d8bd1fbdc9bf333c15916ef70b0b95d5f2b9474 SHA512 a346fc3b445df6dc5c111f9ab04be4c655247e47aa101c9cf3e433294870bd0d0676056cdb0555f4452eb79a63765e434a8e8229cc576eee927c6d16a7661c9a
 MISC metadata.xml 762 BLAKE2B 1132cc338a6f90757bb96d9b1d75fe4dc545ee0fdf07fcb946a88d88e5e821320016de902b37855ef1e1c4d4a4b7f5c37e41316b5ff8aa4b3eb14536548831a6 SHA512 82a8325fb69ee74e353375ab4d0f88d7d97b889ce71d660561b74b27303ea6ace3acd9fa9046bdacf15144c013e51382ae4da4c9e355986bf43b363980f6925d
diff --git a/app-i18n/librime/librime-1.7.3.ebuild b/app-i18n/librime/librime-1.7.3.ebuild
new file mode 100644
index 000000000000..03e55e308b4c
--- /dev/null
+++ b/app-i18n/librime/librime-1.7.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/rime/librime"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="RIME (Rime Input Method Engine) core library"
+HOMEPAGE="https://rime.im/ https://github.com/rime/librime"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/1-${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-libs/capnproto:0"
+RDEPEND="app-i18n/opencc:0=
+	>=dev-cpp/glog-0.3.5:0=
+	dev-cpp/yaml-cpp:0=
+	dev-libs/boost:0=[threads]
+	dev-libs/capnproto:0=
+	dev-libs/leveldb:0=
+	dev-libs/marisa:0="
+DEPEND="${RDEPEND}
+	dev-libs/darts
+	dev-libs/utfcpp
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+
+DOCS=(CHANGELOG.md README.md)
+
+src_prepare() {
+	# Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto.
+	sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die
+	rm -r thirdparty || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/utf8cpp"
+
+	if use debug; then
+		CXXFLAGS+=" -DDCHECK_ALWAYS_ON"
+	else
+		CXXFLAGS+=" -DNDEBUG"
+	fi
+
+	local mycmakeargs=(
+		-DBOOST_USE_CXX11=ON
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
+		-DENABLE_EXTERNAL_PLUGINS=ON
+		-DINSTALL_PRIVATE_HEADERS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 43cc05c12bda..39bea2143150 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,5 +1,6 @@
+AUX transifex-client-0.14.2-r1-timestamp.patch 646 BLAKE2B 22d8eced003f2ce5275ef4a8857637ccc0d094e3c9b8405b1c204b78af4bc26f20be9fadf8a7e50d44e10c131f79e9b66f4f03f8ee92c3e73a548236e2903c42 SHA512 339d8ef42935acfd79f438e725683e9592259b9edeb3249d6817957f9bb25ddcd99d05485ad5220af1329937aaf0ea1249ed34cc53bcb3137e461e97a45f6b95
 DIST transifex-client-0.13.9.tar.gz 197283 BLAKE2B 9fd6f63a54d09f190f7dd6701e4994e4fd67e23cf630dcb49641a3c7356e55f1146be7c2a590fb09a52cccfa99e709c48fffd7df416d1d4c10231c4f42919380 SHA512 3dc4a1e713a797ce1ea626c9e85dd353fec3034ba21ab04bc89e5b927e0298b4f6560a793eec50d1a99c7ab340462c33d18c1e159697c476001be868cb7f87fa
 DIST transifex-client-0.14.2.tar.gz 211398 BLAKE2B 4210a06da9fd09e689d28ae77a90c65f96cbba7b44a2cc506c2e385dc2f34659bfbda25eb81cef850442f4b3da22a859e19761798ec123888564b0327f0c6503 SHA512 5d7f8241d61621197df95cb42b2a8fb8088e77543f076c2401db14f7e44d67e49478d0b04cb525fc6281b37e5026edc8121f90cb7332e669d63be6112264044d
 EBUILD transifex-client-0.13.9.ebuild 796 BLAKE2B 2cdfdef014ce8a9ac6a9fc09aee743b698001fe625047660d07e5d8267a1ce27b3b984a6f7533ce9481e2030acf45f59232a227e35f3aad19f19feace9f2a33b SHA512 44824acb28428bc444fa654f2a5b526445609b453895d42fb8283578d6295b28ab51036060ced2c331a29d1de4bae40ed984e22f7a099a139c38405ac78e05df
-EBUILD transifex-client-0.14.2-r1.ebuild 1012 BLAKE2B ac9721d6b160d8fbf172f48a3fb9a56a0a907ac8e52c8e98caa5f8efd18995cffa2e36f946845f54304d4a28f9f94c479d7b13021547ee636b46285f2feb2360 SHA512 6c115469075b9b97e4bc9550dec27acb68c195e768475afeed42f03ce1b09632d44862f8c5f648d123b20c940cb36343ca3a15670e38742c22c80ccc2c07e6ae
+EBUILD transifex-client-0.14.2-r1.ebuild 1067 BLAKE2B 2258efe8b37c219685021d786bbea084bfc72084f8d336961b3648671156718b7fc86f8a0e21f8c785518695d6195bd2a14a6b30984970a3a04a2616f36a920b SHA512 84064038c4fdef42b084db4d09bd8afd9df480e359658451b70e92a58ece5b9d71c5fbe8322749aa0dbea4251f29ffc9d853317d8b6de1c5afeacca4e004f73f
 MISC metadata.xml 511 BLAKE2B cb47fd7af2c99fe027060cd09a0ed4943faf219f1a9117be347e317c651d68f4a8d6967a51d899f6e125110138cfd47242b8818ef0bdf51f8b08d3989680ed79 SHA512 e1ff78568bc8bc8c80a48ffe569deb6fe36f431443ef10903a3fe03ea3f2b1452e0c145388c7225d0dfcac126b692276b27e8973a8875788234924a1d2cd8c31
diff --git a/app-i18n/transifex-client/files/transifex-client-0.14.2-r1-timestamp.patch b/app-i18n/transifex-client/files/transifex-client-0.14.2-r1-timestamp.patch
new file mode 100644
index 000000000000..0943621243c0
--- /dev/null
+++ b/app-i18n/transifex-client/files/transifex-client-0.14.2-r1-timestamp.patch
@@ -0,0 +1,16 @@
+https://github.com/transifex/transifex-client/pull/316
+https://bugs.gentoo.org/771660
+Fix tests on 32-bit systems
+--- a/tests/test_project.py
++++ b/tests/test_project.py
+@@ -717,8 +717,8 @@
+                 )
+                 self.assertEqual(res, True)
+ 
+-                # "Recent" timestamp (in the future - 2100)
+-                ts_mock.return_value = 4111417171
++                # "Recent" timestamp (in the future - 2038)
++                ts_mock.return_value = 2147483000
+                 res = self.p._should_download(
+                     'pt', self.stats, os.path.abspath(__file__), False,
+                     use_git_timestamps=True
diff --git a/app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild b/app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild
index d18a787a257d..4cf3be326673 100644
--- a/app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -25,10 +25,15 @@ RDEPEND="dev-python/GitPython[${PYTHON_USEDEP}]
 	<dev-python/six-2.0.0[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.14.2-r1-timestamp.patch"
+)
+
 distutils_enable_tests setup.py
 
 src_prepare() {
-	eapply_user
+	default
+
 	sed -i -e 's:test_fetch_timestamp_from_git_tree:_&:' \
 		tests/test_utils.py || die
 	sed -i '/tests_require=\["mock>=3.0.5,<4.0"\]/d' setup.py || die
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
index 165d3cd3ef44..13edfad12bab 100644
--- a/app-i18n/translate-shell/Manifest
+++ b/app-i18n/translate-shell/Manifest
@@ -1,5 +1,5 @@
 DIST translate-shell-0.9.6.11.tar.gz 76779 BLAKE2B 39748d0a2d7db504fd4c0bee516f703291dce93f19aa760fdae70b0551cb5f14ae5483314114f7e1141ae2231e0b128a79a9c05ec1fd08c970be886c4430e32d SHA512 d4d376b3750e43e3de5b95790fea7fc91e94140526ac15ee9f7818554f95d410772c8f8887433b6fd4547f569b3d6f510c1bc1497d8237223c344dbb8f0ae87f
 DIST translate-shell-0.9.6.12.tar.gz 77580 BLAKE2B 78e8c694edc03fb03facd8c705c7e703a106fe9f2d7b46d464a681d52523817b4aeaf023fdedf46a9792270daf758fde457ba30ab1ffaa778f8db3eba3caa892 SHA512 6cbdfd14b7004d0e37a4abee01bec87409137f1bb7a14a964936bf0a2ad704ea1fc04dcd8ab10404a5c2df105bf7a6a8b33ed02c75c1035a6900082f6dfbb20d
 EBUILD translate-shell-0.9.6.11.ebuild 1125 BLAKE2B 82038fffdbecd83785571132e127eb43cae6cc489a5659c875cc4118786271cbd5e49e091c01ff5cbce162a579a293495f2eaeed0cc80163273c2416bbbb1d5e SHA512 cf76ed4c4045ca16112cacf45e1b1d87db6346f7830408de72d2018bf4cbd10fe9604f19263db55226c37f5b186704ff2d845b3ab98117a8ff4b7ac73498c27d
-EBUILD translate-shell-0.9.6.12.ebuild 1127 BLAKE2B 0eb66841382df394b9a01c66c18cd3512cadce6279817a234b97f8fb7af4b3cd79370bae9dc759699bbdcbf81f4a9eb015de74ab94f3ce16234a9523d77ffebe SHA512 e14456110f351a380310fa0c61f1a8a1dc70f0874ec9965312f7a6e8fae54da3915200e972a7ecb470f991ab71bda8266720b3533b359d403eb0fccbce7dc62c
+EBUILD translate-shell-0.9.6.12.ebuild 1125 BLAKE2B 5c84b6bdf1063c45a79cb92e0ee5c08f9693978dd3129bcd7b2dffb80bbba3ed8d3072e8da9d5d8c0de03f48368e856e716153ccfd7d7254d442be1d209a1962 SHA512 eac55e001c3cfd2c3f72169983b63f1d8058a4e6a7c4009fe7b7a548fa338d4aa03c07842df73db17565d83eb74827f14ec42f6842c8384f0af30b195da22b28
 MISC metadata.xml 794 BLAKE2B d4a2ba634882f73eb5b151682ce5015169cebf0269edd6358f0b1acbf88d255fed8b45ac0bed74b0371c7a98b77fb37ba8b2712bbfdbc924bb99c78b5e1dbd2e SHA512 fa67bdf15aec6119714fc5160189f7b08c24bcacf7471fc4fe0812a410639690900a3132164f87ac41739a597091d5aefc2dcaee50f1c5c72b4d34f982e3e99c
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
index e467c42875dc..29d458406177 100644
--- a/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 18f9c53c49ed..98a60d83105f 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,7 +1,4 @@
-AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf425385d333488c7eeb37c37f3ec6a224e0a96d2c1bbcaded770c8ab6b5bd8277808fbce2bbc960cb3838e0e9de8d889ef9fe2af2e3b44ec4a81031d43f1 SHA512 fb684a362095810bb462609859018dd22987704ab9def0d0ea9ab6afc076fddcf338c622b9f587649d6f561a216b8bc234d3499c499ce3d4589113e908037972
-DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
 DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
-EBUILD uchardet-0.0.6-r2.ebuild 853 BLAKE2B d1d6952ad6ed96b482cca2ff18987c324ebecf01ba9484c003a19ebdd95b9ad9203b4a7c3aa24390ad30fa0f275ddfce6198670902949bae06f9ceab1faf43b2 SHA512 d76c390c7e4f87b9c209dd50186971ae042b704c266b6f31d3769f09076024cf6c461e5b6b0bc55764b31729b0a3801816b2d14502de7ecf25fb8b94e6cdbe59
-EBUILD uchardet-0.0.7.ebuild 981 BLAKE2B 632b59ff1361382462f754b0a548a1d1fb12bccf776f0ce97b4809ece8e87bb404c9911a75b642b7ae531b46d2af406e441fb2ce348cfc1f017ee3d83e64e310 SHA512 c66a7398444bdb2063b72fd9d99b6b6d215231cf878e902cc0662dd39846855fdef7b90294669bcd7f93c6feaa7cbb0efdeacad9bda63e4acdf552f0cc8f16b2
+EBUILD uchardet-0.0.7.ebuild 1015 BLAKE2B 4a136a4430d0d3d166dfb403ce698e459888285e21e9bad2af22b8ae937de91e984c88d76cab55f3fca979f76f689da98d54d277f6f06012eec63ce8a84fea24 SHA512 310fad81f208924e54ea0b1f96c813eda0237232f6f688b99809791c204f3832adb80b34c0fdf8b80d555c5e45de22351b9179a816ff248c56ec382bf74d46f7
 EBUILD uchardet-9999.ebuild 838 BLAKE2B 1fa9152117465b5e792942983a98d1a0f69373b34f723d1811d5bc8718cffa6f61f3a808d5e70e5837bd4969eb32a49b744a7e200d7d1760d60a0bdf1b08a6c2 SHA512 2a0a59e862a98c88f1a4186043e3eb6819ea09b5b28fa5ae8ec5edaa2f328ced05cd2ad19b2288ee119741987ed7f8ba8756d440d48c264996f2e3d6a6e39e04
 MISC metadata.xml 671 BLAKE2B e4d37fa90064a38dceb1472cc2683257d8f7f7ef5f4c15a440f2d9102f91561d408b919c29077b305013e5dc967b42400ec49ee6a50037708a76b2c2e1742e44 SHA512 38fbc4d87e388fc19dcb64a65fe8859307dd7636a4327353131a7c8ebf8974cd74c73486b9dedf1f350d1d42e23a23e33737a1e2e3f4b769f9f64d730149c8a6
diff --git a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
deleted file mode 100644
index 2bc4977a5f00..000000000000
--- a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Add configuration option to enable SSE2.
-Add -ffloat-store flag on x86 without SSE2.
-
-Gentoo bug: https://bugs.gentoo.org/631852
-Gentoo bug: https://bugs.gentoo.org/641716
-Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=101033
-
-This patch is an aggregation of the following upstream commits:
-5996bbd995aed5045cc22e4d1fab08c989377983
-77bf71ea365a19ac55c59cf10399b566a02d82c1
-939482ab2b5a6585bdd2e5251f3f2f113d64686f
-cd617d181de03a7a13c2020e6c73cd14585e24b6
-f136d434f0809e064ac195b5bc4e0b50484a474c
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e9a699e..d140a24 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,6 @@
- ######## Project settings
- cmake_minimum_required(VERSION 2.8.5)
-+include(CheckCCompilerFlag)
- set (PACKAGE_NAME uchardet)
- project (${PACKAGE_NAME} CXX C)
- enable_testing()
-@@ -33,13 +34,31 @@ include(GNUInstallDirs)
-
- ######## Configuration
-
--option(BUILD_BINARY "Build executable" ON)
--option(BUILD_SHARED_LIBS "Build shared library and link executable to it" ON)
-+option(BUILD_BINARY "Build the CLI tool." ON)
-+option(BUILD_SHARED_LIBS "Build shared library and link executable to it." ON)
-+option(CHECK_SSE2 "Check and enable SSE2 extensions if supported. Disabling SSE on platforms which support it may decrease performances." ON)
-+set(TARGET_ARCHITECTURE "" CACHE STRING "Target CPU architecture. It is autodetected if not specified.")
-
- if (BUILD_SHARED_LIBS)
- 	option(BUILD_STATIC "Build static library" ON)
- endif (BUILD_SHARED_LIBS)
-
-+if (TARGET_ARCHITECTURE STREQUAL "")
-+    string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE)
-+endif (TARGET_ARCHITECTURE STREQUAL "")
-+
-+if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
-+    CHECK_C_COMPILER_FLAG(-msse2 SUPPORTS_CFLAG_SSE2)
-+    CHECK_C_COMPILER_FLAG(-mfpmath=sse SUPPORTS_CFLAG_SSE_MATH)
-+    if (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
-+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
-+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
-+    else (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
-+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store")
-+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
-+    endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
-+endif (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
-+
- configure_file(
- 	uchardet.pc.in
- 	uchardet.pc
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
deleted file mode 100644
index da7d6a5567be..000000000000
--- a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An encoding detector library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
-
-LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="cpu_flags_x86_sse2 static-libs test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DTARGET_ARCHITECTURE="${ARCH}"
-		-DBUILD_STATIC=$(usex static-libs)
-		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/uchardet/uchardet-0.0.7.ebuild b/app-i18n/uchardet/uchardet-0.0.7.ebuild
index 457a67414542..5f8e8c095fc5 100644
--- a/app-i18n/uchardet/uchardet-0.0.7.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index 72a896d6d11b..a2556ae83f5a 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -6,5 +6,5 @@ DIST unicode-data-13.0.0-UCD.zip 7537310 BLAKE2B 5bcc8f010f81fea22cd0b5806ee190b
 DIST unicode-data-13.0.0-Unihan.zip 7044963 BLAKE2B fffcd322c87c607e9e689bfef4ec79b4ec576b4ffd84465ed6d38f485ac4fccc7d0f46662f76dbb79630e070b12bf9e1530bbbd5b32c043b71f696018e1f3ad2 SHA512 87238202b5da069ab1bbc4672d86c6fd0711e354fb17f53b0b4152850c56c0fa09e6e45820ae52d49756b25fe696518ceaa34cbfe5366ff60688c9a5c3a2d5be
 EBUILD unicode-data-12.0.0.ebuild 777 BLAKE2B fd8806e48c3c1a1368dd4db416a7c0b8e85819cb0174b250932b0258b8b21611401cf31aa3575471888969fe06b621f4acae03728d6ec6976ce12536fd295a55 SHA512 15673e33060bbc37eb4da94b7887ebdec3c0641e08e05b356dc29a776948c36f1c7f2f9ef9280c948d63abd455059854ca44889fdf3d5c054362b6e767c7f1fe
 EBUILD unicode-data-12.1.0.ebuild 789 BLAKE2B 53712a51a60f329af8ae58974407987407d6a4245c1abd44a4e795a80a765503a41423f7fa8ba8d44c86de19e314076fa31469f9a5a2701cea3f9a6e148b83f7 SHA512 abc12447244d4c387aaa3803405b57529a391b96df8a66b79abf54565d64dca65055fd1dc70c617a327af7235f21135e3b721502de145ef8f8165048705a3056
-EBUILD unicode-data-13.0.0.ebuild 778 BLAKE2B 9ec0887367f0b8d803de639a3194f52abbfe61a62d739569d7ba93f5bdf81da19fc243d0269131010048645df95f0ab4f072a6530f9e6989ff4a4fedf27bc742 SHA512 148945d3c85c0b4755ec233541e72985ae83e0432de96c555ff11b3420d5515027124baa97c7a245fc54694217d372ed9a6feeede1d908daf7a4ca3d9665b96d
+EBUILD unicode-data-13.0.0.ebuild 769 BLAKE2B 554679ddd4b7bff7a5e3c163b140fa00949c9e780588c5ab158aca1b7b43e750f1fc5d02ff091942f15efaa5704895236bb70ca5db830b1facda8aab7ad7e4ad SHA512 8ffd93c66172b2c6a91b11de49582571868ed67e8e3e25eecfbbea81bcea8c88ed5f2fdf2ad1955d6c4ed6fa4b23bfe8ec82686c6ca553b48e2b4bbaffb690bd
 MISC metadata.xml 347 BLAKE2B 6d5200dae7279af5ad9ae629ffdde919d239d868bbf90592f33ffd7b4d26ae911f5cb21b9dea7d2b0bee3ae1f78c0703e1b2e6e56e91f365611c1ed5be54c3c4 SHA512 cd88c99ee7b72bf0aca6ba376f0e07c504fbe5bcb8e2fb158404e4d46e50f18de351577b2629e0a8449541412536a6566b8943a96e57f5d5ec6f5becca767433
diff --git a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild b/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
index 02c0e2af5cab..d7236ea9b467 100644
--- a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"