gentoo resync : 11.05.2021

9 files changed, 39 insertions, 10 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 33b19139ad48..4772d7798059 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 82c068e7db80..7521d92fba53 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-m17n-1.4.3.tar.gz 489392 BLAKE2B bd37fb1f7160d4306be008e4f27fc5852db54318e6075f0887294f7ce30406ff697f41c5cc56734cffa4605b37f28cb89b3eb04a942e6acf352be50a273bd71f SHA512 8b42bcac8662b4924f54b6fe56427b32603746a3d1b0dfafb6dfec1296ec52847119f94fabb0a276f9de5918414fdf5f7b5aceaaabd8c01632cfd677344598ab
 DIST ibus-m17n-1.4.4.tar.gz 490328 BLAKE2B e7b5c417d4cc16cea736dfadc504137218397ed1ce6318dc6edc48ec33b13051b43d2f7926a959aafe79025c2af1a35374a7dcb4cb4fee952df85b25b604d07a SHA512 df8be7ceaa2183ffb377e39f52b271f18825a8970f88972d0a43ed1fa2721d36bf564a20f89311541ffe19546441322fc568c4819e42e41bdff45ee137d6de80
-EBUILD ibus-m17n-1.4.3.ebuild 894 BLAKE2B e546c29fed4e3155af586f96836a8720427d272a3eccd432d92778b765dc7ec3347056168eb1decfa0166ede011225a95c80cefa28d68a11d69b30cda91f0590 SHA512 a7e6fd76f12992613c486857b0dd30471175bf56bc0ee5cc273bb21e999cd59a309e1922b204633dd113e18b220051dfc6bf1b6289e56f168b5302fe77fa2a38
-EBUILD ibus-m17n-1.4.4.ebuild 896 BLAKE2B a8a7a9cbf44d8325aa3f59c87ab7b2d1407ae9306c089aad54c7368f315be9bf83bc3b712b9e6e2f42b48e428af4af1431a4b51e24bc5861be6061bd06e47451 SHA512 f78da526515464797d8e98ed7af6879d53da7b61131ffd8332a3e7631d6b8f886b3d7aeb4dfc0a954d0603d2a1bb81d69864fe1742b52592644cc9e110aca12d
+DIST ibus-m17n-1.4.5.tar.gz 493250 BLAKE2B a5fd4de169997dea78acf6273a7e44cefbc9ab4499cbee92c30f394ef7267c15fb1af42d45d227bc160150f35195477f9ec3d2534f9764bab4fa86c0fae046eb SHA512 64bed564d59b0992ebc8a931e0845f687c176e5336d7c7fbc1d575433eb276714615f8fee412a532ec2c8870e46d8d6c41636c984b666c92427dadbdc84838b5
+EBUILD ibus-m17n-1.4.4.ebuild 894 BLAKE2B e546c29fed4e3155af586f96836a8720427d272a3eccd432d92778b765dc7ec3347056168eb1decfa0166ede011225a95c80cefa28d68a11d69b30cda91f0590 SHA512 a7e6fd76f12992613c486857b0dd30471175bf56bc0ee5cc273bb21e999cd59a309e1922b204633dd113e18b220051dfc6bf1b6289e56f168b5302fe77fa2a38
+EBUILD ibus-m17n-1.4.5.ebuild 896 BLAKE2B a8a7a9cbf44d8325aa3f59c87ab7b2d1407ae9306c089aad54c7368f315be9bf83bc3b712b9e6e2f42b48e428af4af1431a4b51e24bc5861be6061bd06e47451 SHA512 f78da526515464797d8e98ed7af6879d53da7b61131ffd8332a3e7631d6b8f886b3d7aeb4dfc0a954d0603d2a1bb81d69864fe1742b52592644cc9e110aca12d
 MISC metadata.xml 679 BLAKE2B a374aafbf949a9cb71906396787329ea1cd31775b29bf1675b30c98098e1025ee5e96dcdce2e8324bd6d3bfc05e854f89b1120a2e9410834a4dab767db1336b0 SHA512 c07286ebfb6f8bcf82c4fe6b5d02cf0a49287c7609daa42a356b8bfe7b3c074558d39d987decbffd15b10a33d475630b5f7194ff9941c9762c87dbcbefada953
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
index c8aebffadc30..79d7891abe84 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk gtk2 nls"
 REQUIRED_USE="gtk2? ( gtk )"
 
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.3.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
index 79d7891abe84..c8aebffadc30 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.3.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk gtk2 nls"
 REQUIRED_USE="gtk2? ( gtk )"
 
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 4c828910672c..a45c4c457362 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,4 +1,5 @@
 AUX librime-1.5.3-log_files_mode.patch 458 BLAKE2B acd2f59f409b3643807ea845fd08bfcfe730cfedaacb7d70a4b1ba017a299cb95b8d815bbbf53b2c0e3c86c4482a2d71a97fef362a6f0404dd45e96b57f78be7 SHA512 d8b12367916ed1ad5deb2e982437d3e5e04592baa6c1e12f6b78ff99b8cc407f2c9fc6f47c0715054572f6f8a5edafcb6f6da033902175cc4357a07faad04420
+AUX librime-1.6.0-boost-1.76.patch 717 BLAKE2B 9abca897e4a3a23ec7ea2355148e34ef93b331b084634b0011815ec0d7d231626ebc0af53c71cd0b76ee3a5de50e1779a79de118433eca399e17ad06026d0eb2 SHA512 f2dad5927e7c0c95a09900581dff04f99d26ebc877ed4cd2c0fc3f226cb072fbe769fe67166976cbb848599a19b9a8ece926b2538ae2df0cb09a4e5b7b83fe11
 AUX librime-1.6.0-plugins.patch 7447 BLAKE2B c2429bedb7eeabfeafeee310e5380ef22f65c3590f70f387376cdb9ea1c9a9a6c072d87bf2174067378104d31c7de6b2f4ea1fd37f8db3a76343e1849fb6d737 SHA512 dc39a5e9d8cb432b232ce82af31994912c24d446a9b0db908c543a605a047434d5afb7fd79aa8a6ea74d0b4431e2af67a48081e3edc338de75a3b2eafc28dbf9
 AUX librime-1.6.1-plugins.patch 7447 BLAKE2B 95f1b8f412e6e12c8c702d2295966831d4c2d06fd75a691460a2cd83b73ab033ae495a6d51ff2c0f5115b366ca33079159f5d9a026165acde7ca9c0e9c936983 SHA512 b32e6d736a0d26cc4dc5b6ac54f51a737e93f52a356e59d54d51523884eca64066a413cd3f9caa2d4db4574d96524c2688810921555ada0018c064afb1827307
 DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3
@@ -6,7 +7,7 @@ DIST librime-1.6.0.tar.gz 2856645 BLAKE2B de6d843a5028f6b0308c3432ada7dd00c08a71
 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
+EBUILD librime-1.6.0.ebuild 1635 BLAKE2B 13cf817648886c13fc1c6c3913c9bdce4a3c1947928a70a5d904b6dd8160905e1e9651c6bd758a6c6711c7d37781776af75c90b4f7e22bdc6bf4b218e44bac6f SHA512 ff4577d82f8c7e00a565ebae6d8a6b9ad3ad49f33319de9c65c9b50c8599b00ad71ae69f9d304aee217458df858ce78a4557fa52d3f8943281ef9d1633f327d1
+EBUILD librime-1.6.1.ebuild 1635 BLAKE2B d69511b155960827c1d9a058132c5b9e36d03021688aadf7f42634526f10f4f0fe860b93b81dadf35da6486f8322cdf10d1d26912eba0cd172d4da764f77272c SHA512 c8766ba24f6b5f52cd200655796bc3621d4fe51fc115ad97ba59638c2c1d8ab9e5856832159c6c48854826a6ac8f6f338f9fa49f3325e5e2faad51a5b7838ab5
+EBUILD librime-1.7.3.ebuild 1587 BLAKE2B 27305c10770cfa6912ca0bef85d14cfb66c006045ad9e7ab651949de024be75e9783dd88f786f3bf5afc8b3a84842b938f5e6f94c08b65dd6ec6b1e58bd4401d SHA512 8fad27e7c333754cbe05c899f6e9649890527c19d263b2efb89fc2598bd9c2e830dcf57749e2ec82dd2ed420850ef3aebc0dbe02babc89818d2a1eed154c9f0f
 MISC metadata.xml 776 BLAKE2B b362c5696516b756bb9c9c3102d7d5f52f843807d523f26bb12adb6b2c077f98c0aaa2d5d7d87c0a413b8ed69994f35a7fb02db423592ffc5529150df4253f83 SHA512 1bf10d3e1394b0f9512cfe564dfa4eac007e5b343831a482764f1c7c99500ad55cd99e10f07a4428c67fb262b80a2e2be41f9c36f3a937f5521c72d969403817
diff --git a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
new file mode 100644
index 000000000000..5ed1447359d6
--- /dev/null
+++ b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
@@ -0,0 +1,24 @@
+https://github.com/rime/librime/issues/462
+https://github.com/rime/librime/pull/463
+https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db
+
+--- /src/rime/gear/script_translator.cc
++++ /src/rime/gear/script_translator.cc
+@@ -8,6 +8,7 @@
+ //
+ #include <algorithm>
+ #include <stack>
++#include <cmath>
+ #include <boost/algorithm/string/join.hpp>
+ #include <boost/range/adaptor/reversed.hpp>
+ #include <rime/composition.h>
+--- /src/rime/gear/table_translator.cc
++++ /src/rime/gear/table_translator.cc
+@@ -6,6 +6,7 @@
+ //
+ #include <boost/algorithm/string.hpp>
+ #include <boost/range/adaptor/reversed.hpp>
++#include <cmath>
+ #include <utf8.h>
+ #include <rime/candidate.h>
+ #include <rime/common.h>
diff --git a/app-i18n/librime/librime-1.6.0.ebuild b/app-i18n/librime/librime-1.6.0.ebuild
index eef1faa5bd5f..c3c438bc80de 100644
--- a/app-i18n/librime/librime-1.6.0.ebuild
+++ b/app-i18n/librime/librime-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -43,6 +43,7 @@ DEPEND="${RDEPEND}
 DOCS=(CHANGELOG.md README.md)
 
 src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch"
 	eapply "${FILESDIR}/${PN}-1.6.0-plugins.patch"
 
 	# Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto.
diff --git a/app-i18n/librime/librime-1.6.1.ebuild b/app-i18n/librime/librime-1.6.1.ebuild
index 91cdfdf161d4..e1a0804e63a9 100644
--- a/app-i18n/librime/librime-1.6.1.ebuild
+++ b/app-i18n/librime/librime-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -43,6 +43,7 @@ DEPEND="${RDEPEND}
 DOCS=(CHANGELOG.md README.md)
 
 src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch"
 	eapply "${FILESDIR}/${PN}-1.6.1-plugins.patch"
 
 	# Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto.
diff --git a/app-i18n/librime/librime-1.7.3.ebuild b/app-i18n/librime/librime-1.7.3.ebuild
index 03e55e308b4c..44310ba275b7 100644
--- a/app-i18n/librime/librime-1.7.3.ebuild
+++ b/app-i18n/librime/librime-1.7.3.ebuild
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 DOCS=(CHANGELOG.md README.md)
 
 src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch"
+
 	# 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