gentoo resync : 29.10.2017

4 files changed, 16 insertions, 2 deletions

diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index f55bfab04b9a..46260baa7f3f 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,6 +1,7 @@
 AUX 50mozc-gentoo.el 121 SHA256 833039439dea484a430e832df869b3af0b8d42bae63c4d6999e72c97d55d897b SHA512 2d67a6723374872717ab7132f02f4030f00ddecabb8a1fc20c9d69d64406dc2ba2a1109734378fae7b4718a8ae9601beff4b6f27cb43a280fa2e0f946da70685 WHIRLPOOL b9e5235177ee432509c9428b632a1148e8788c1bf9b6fe57bbc4f3f747a038008ef4752a1dfacb86a5be9a018504405e6a68053dd54d381af1fd9170ba9c6ed7
 AUX mozc-1.10.1390.102-drop-Werror.patch 353 SHA256 894411a2dc704157661cc7386abf32b62abea9dc5621bc30474ce3161c54adf7 SHA512 203066f08a5094306d09c3c58f81bfb7a4069bb1eacd31f0d257701a4560adee5452a516351cd9bc5ea7227e40d31bbc6eb177422d3c37514f7573398b389bc2 WHIRLPOOL 0a3cdabbc653c42403fa60d9486927a8b4d9c2003262b973a4f4264424331a02a8fb3c413a736e797525e57f25b12a7ba2fb328ff7a7684b4bb2533f35b2ba96
 AUX mozc-1.13.1651.102-gtk-renderer.patch 547 SHA256 6daa6d077dffbcc133f49745bce5b2503b6097d8280c52a602a99b24eaac7b40 SHA512 7b4a4910a8a0a821fd8130e77ecd0b4f846f7fc2b573607e2ce0280889d625f4e374c60e35995dd5cbc2e8ccaf3443652b60764f538584e0a9d351ca67a28af4 WHIRLPOOL f4dabc1a7a4d29f5830bc641019b939405abc6c36d6acc384ed74a06995dfc31d5993653965acf60f8208969e9643ba97c1d4aca3bb7eac19ee73b4bccbd22e3
+AUX mozc-2.20.2673.102-gcc-5.patch 413 SHA256 6d422910257aa8fb408f36a6e1dce3df9e13760a93c0b935e819405befe5652d SHA512 4c05db865fa7985ff977ac574fe53e43ec103dc17432ed2a2d8a76c5e0230d8ca430eda3848da06b855471e0cd690e62ce73521b9a354f5f3cd4e901ad7e3760 WHIRLPOOL 6e30af73a93c440a363e7c6e5048c1033907a9819be2bcb8245a6cc5885001c564b203de0e00ddde341d1d0c0abba840c475ff6976077d7f426651499f253574
 AUX mozc-2.20.2673.102-system_libraries.patch 9659 SHA256 658ccac9192258e4838b4f25a7aed107fc2121ae16e4e92cf61570a53251f9ad SHA512 c0f858a9536fc449e0d9fb3191df2419f0273a478c31d0404713fc4feae5ffb72afec7b47b57ae2111ed0bf40ead4a75e31a68286440113968e2f4e4d6c2d856 WHIRLPOOL 068e3a5f2d41314cc5f6b3d42787b99ac3f92039061fa83fe4d9728e0d5ff22afad23762b0a75126a273d985a8e3869855bd5eaf381b7e62df9c286b13646763
 AUX mozc-2.20.2673.102-tests_build.patch 1037 SHA256 1f8e35f257e7952fc7818da1748b1be4af578066150304a7f62bdabbc1b95233 SHA512 d99ee7edbb406e123b26ec186933608b42d36193b7bfe67232810c0fbd7a92bd8cfff26dc45eae4f020e82e9a8370cf2033c750250455585b6b3d88cc8c973ef WHIRLPOOL e9384d30f4f8add826dc53fdda1e816563c51c4f7444170667fb041b18782a20f7a3f79c51d7cef19b9a27a078b375d33fdc67d6f5f6bc4321a8a3e03b208329
 AUX mozc-2.20.2673.102-tests_skipping.patch 2086 SHA256 dc86b4d5124e5c3bbce38cf12a0eaf04f7ebad932330fb3a86e7391d14e5843d SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e WHIRLPOOL f7576123d2e9c096d9301bb3085e3875cb8c72f53621a8adad162b826b8c5784885f4cca6cbfd28a7f7b6d589ffec4e509adcfa1d0c2d2b7e8dfdb4def89fede
@@ -21,8 +22,8 @@ DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3a
 EBUILD mozc-1.10.1390.102-r1.ebuild 4854 SHA256 f0c67e771fbe8f2dd8d324f0525e6cf90f14e84d9b1d7919da075f2262818efd SHA512 f84435093d31d49b8b7dd5b71c4f753ed8d0da7fb5666ff4381578dff7d9ab8cbbc02b728923f3f75c00dfe4591f7709f85df9ac7e586a1c3653b79ec0d3c60d WHIRLPOOL a97880e4d4c14843052465f1e981737e5e379d21febd2115a515cc9b20659c0f38f7af6f772f0e00e7b7b5d2bca1adf5887b7358f6d5d319db661befb7d004ae
 EBUILD mozc-1.13.1651.102.ebuild 5036 SHA256 968aa5ea57c352fe27832db8242637d57f2f809b45362144d7556760e17dc405 SHA512 ee8f4d4feffc39dd01dc70ae03a5f4f307d0fff5319c38c25d7dabc35ea66855e58d84e71220ab812e31dcdb47c32097ff6685be945299213dbba24a8836fecb WHIRLPOOL a7fab3c787335db1b8f32bb693b566edb747074df9f278d55abbc22af2443fdc0e8623f1f2b4dd582ba1a854eb8dc64d5bcf38288648fa34c12bc9084ff9c598
 EBUILD mozc-2.16.2037.102.ebuild 6726 SHA256 9dc66731dcb8a792b0a309fc21b262625e1f8c22016ce2bb580b872856730e25 SHA512 eb4d744a8fb5902c66296b96987f8b50e0a3e5d8792951fe44bb84f12c3308d2512341ac89781b62e9db4d1c19b40646a3948449ea744e2e7470e28c048ecaf6 WHIRLPOOL 991dc805f479a90f2ad540ea1d1ed1fd6147f628081e9048554cb85e47583c53b7e1cec19cada1200475a8d8d42d30ea8e5acbf57869a32f1565dac3cde25b75
-EBUILD mozc-2.20.2673.102.ebuild 8922 SHA256 fe3d0ea5bccb5e22934c621e8a30f7b181920e7037b047dfa08473f3bb6a805b SHA512 7167848180259f4730aec41ca8f56a2611894d6670ae0e806109e8b8aa12989637d09c9aa3c106cf4b99f88a7a4a5c230ce07b69af50a6c6a4a2a9b948d14985 WHIRLPOOL 60404395f9c37b6f0be34462167279716615ddfcfef7392616a6da23379e98dcaf1c295ec12cb276e3eac30662edccfe6a9f6dd5dcf191d793a6bf0ac5b3158e
-EBUILD mozc-9999.ebuild 8817 SHA256 38c8908784b01fb85be41365b8b668d57c8dee7a9ea140f4f978fac9f253a709 SHA512 509e26b5bac136458e8da631b8ef2cba9b0489be96dfb08f3ece836dab8e4f3e46db2b77c9bba8094db234d1ef5fcc864ef8b3e5f6200c1dc6cb52d09cebe51b WHIRLPOOL 75da7473481383e6664ed8d95f336163352862a3f77617b14edc79a3bb4aee9cef7a4a89dd3a8c8fb9df37030eccecf817a89a92a252840f3f02deaa5673ed5e
+EBUILD mozc-2.20.2673.102.ebuild 8980 SHA256 7e06e6da0516bbefe16a1a84760a6989488196d1eead07d60c2ec2ee9636d400 SHA512 658afe79f1121d4d920e908743fe3a21ee9529f054a1ec0c74baf304a67ae2549ef81f7ef475a5fcf5072efa67635a0f4db5fa3fb27c2d3e255fdefe00737e1c WHIRLPOOL 50b0ecccf9c7a168a72b09396a9312023a2dc068e95ba15f82e8b03909e9030421b5acdfab5d592d8fab6f14eb0202cdda0077250f254008971376ce636f8f28
+EBUILD mozc-9999.ebuild 8875 SHA256 1efdce8761ce9c4b23b6b147e48bebc8a6e15ce70cde27db015c088175a32ae3 SHA512 325c139315a060116f1ae64f88c93bcc191000a0ec06717e3adb359e624b02f7ad334c806b1b01147c233337ee247f5b53122f7287299e3bb12700b2e812729e WHIRLPOOL b845063d7078942de41a01f0737726e65f938a1b25cc6413798ef049e2cabb25633b1ca6ce3084781e3d6f2b4d8f24df78cba85dd25214a3ff8be7c4f4eaff34
 MISC ChangeLog 3991 SHA256 40dc9da4e7d6d62958c610f045da2e78bdca028852617be136838e3cdb707fdb SHA512 ad3b884e40c14154afe299f353dde7cd3fc08555e281911a1b97b2da60e6e5a34c4de396b974b59bfd9cda4ca6068b74e0ce3cef24c3828d55b708c16fffbcbe WHIRLPOOL 99d04bfcd81c2cce998a72f71a3b6577650d413c02fb05b36ac2e82a8ab3fc625076ff51a5093b5f682fd1c2224b8d6af3813bb7684ed8891e74d2f9425dda9e
 MISC ChangeLog-2015 8901 SHA256 096cea82e38f33a34acfac0b7622c959de656cfe4f1cb3afd3f148e12f3e013d SHA512 2f9acbcf3e7eafd3a1b7052e9b0e7f9a41c565d876cb4eb78360964b3fb7acd9dee3b45ee6a3ed76fe04c00b175e56c63b0b83698c0dbfc6554ab4b474566e87 WHIRLPOOL eed311405f838d6daa955f118d9429db8508a1b08120bed39debe3af397c8bdd5100a6cda0c0b77ae48550407a6b2d49bb63f2c40f6faac62aa183c1479479d6
 MISC metadata.xml 1334 SHA256 a4f99e39449d176f6d38e09097c5df85be755c5747430bfdc41f0a7e1aedf276 SHA512 07979f2fb42667e6281f7617f88d86eae9117e7fb33203acb456379db9468992e2105e520c1ecb7e77c9ad79900daa8c11d57c53b03b5ea89f644dcca020f9de WHIRLPOOL 5c3c78f349c84e394d98d7468145b7ab6e73786b59621987f135ab8fdb6182418d26e0c9bcd18d458062a28d89d81f1bf7b7691fa40b46eb3594109356499207
diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch b/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
new file mode 100644
index 000000000000..b8b2bf1808ec
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
@@ -0,0 +1,11 @@
+--- /src/prediction/user_history_predictor.cc
++++ /src/prediction/user_history_predictor.cc
+@@ -841,7 +841,7 @@
+       // swap.
+       if (i + 1 < prefix.size()) {
+         string swapped_prefix = prefix;
+-        swap(swapped_prefix[i], swapped_prefix[i + 1]);
++        std::swap(swapped_prefix[i], swapped_prefix[i + 1]);
+         if (Util::StartsWith(str, swapped_prefix)) {
+           return true;
+         }
diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
index eb93090b7361..ee84afb7d91f 100644
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
@@ -94,6 +94,7 @@ src_unpack() {
 
 src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index c56eb0e73da6..35e9ab69f408 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -94,6 +94,7 @@ src_unpack() {
 
 src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"