gentoo auto-resync : 22:08:2023 - 03:45:27

3 files changed, 18 insertions, 1 deletions

diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 03f16c6fa271..9b9c5a7a381d 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -4,6 +4,7 @@ AUX mozc-2.26.4220-server_path_check.patch 3455 BLAKE2B aa54893a6efb49e111a83e5b
 AUX mozc-2.26.4220-system_abseil-cpp.patch 14344 BLAKE2B d64e3abde60eb856bfb7bee6de68b6d8fa0939dafc9b02ee398a89ccf566e3235a86123067dc0fd98d63a395b9e0815c281f3baa578a64d67ace39e7f114f8e2 SHA512 8fd816e665f1aa84faa036e71be443bc4811b538449a1a8475c6ff9a674a20a5d4fac07c9a0c5e265cc4570120f4606c470964421704da321cc0f8129342d363
 AUX mozc-2.26.4220-system_gtest.patch 4755 BLAKE2B c0d98f949e8942bc4f3025c77be8d7949b131209a2383eed809ffbb0f5527f16a3388ce69e6101e7d219ebb830e16ca65772bab9d4ad8620d2e970e6debd2e37 SHA512 cd1260d0b10b40a4d832a50cd81e79a7ebe6e7d3a215ec80fd01c596161ad6fd69b78a046cda80f35bd5fac7d874e0ad08ae79a01ccf3d5e3f9e2a285de8e3fc
 AUX mozc-2.26.4220-system_jsoncpp.patch 3475 BLAKE2B e6643c1cb2f87d55aec6359fca8f0cdbae34f5b4f57456532e9bae40cf5a6a2debcba662e931dc6bb76157972a479ed773703fa6954af290b3d4c2bca986fd74 SHA512 5f65d9f1019ddfddc18bf60abbd3d88fc0add4c247b869e74e1bf1dcc7fca180dc7364807a4c46f5cae1536a46e6179af851a8012398f7d19fc3aa7dbddae24c
+AUX mozc-2.28.5029.102-abseil.patch 831 BLAKE2B 1d76f9d3a077a448966b96311a76caa1a0468e0a47a51db2971764a1408ec0c72db2ea1fd8fba64b6d8f7ea3730b4f0038449701a86b1457387b5b3813ff6c74 SHA512 0c1809d9066faa4a960bd94204e31e3942feeee36db9ffc58b2686ea7d14d043831d7820ef1fb0d7f747744855f02a67639af1431402728b558eb944c0b4e9d0
 DIST fcitx-mozc-2.26.4220-20201219202429.tar.gz 37174759 BLAKE2B 3f320523103ee7a35a763f6613889e282e8a654db8ef11b5a1168db12611387e300621f015977875ffec3c10c055e36b3cb525a1e8559013f3ac42bc5b0cc296 SHA512 823e64267aa69e4d30dd7408f946a54072994f9a2d68691a3d393b216a15e70fd28bcb24705f9d9f483a2291517c48c5a1aeda893d2315f9a1d9cd352fb3feb2
 DIST fcitx-mozc-2.28.5029.102-2.28.5029.102.tar.gz 37246575 BLAKE2B 54381968e33870f2d9f769184cf49428548d04de66e767140c8f053fad7873f1b2e3b02be81ce54e51b824d2c9cd971da37bff8b60efe60c9e2c748ff298afbd SHA512 4962e9505b79d4680a260c257719ba2486a6fe127018298758728faa9535504bc2dd6b1bfb430ac2982cb377cda52c145430531afd0968f49f91d366fdd43d92
 DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d SHA512 68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3
@@ -11,5 +12,5 @@ DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35
 DIST mozc-2.28.5029.102-2.28.5029.102.tar.gz 37247099 BLAKE2B 4bb528991102d34a26321e6fa00a73cc83cb103e0b765f1ebb837dd6894387288b13ed75cc255003d07d6f0c4a82f963684fa4f2bd9b5043cfaddb57a5f5cef0 SHA512 b20aa45757db92f66d1c135eacf907b4cec937226a8d09e5f9f6768ae22a6b8464e3b75276773ce55413f2002ffcc3d8cae136e7fd3acfc0733e48bccf848d5b
 DIST mozc-2.28.5029.102-patches.tar.xz 224380 BLAKE2B 377d2cac6ec8a9c90661f10c0b105d8347ca8080ec43cee3dfd4660feadfe2d9b204d6e4b9e22bd11a5fdbbf26e7f6f298b703b88fb1621ea1847741408c1953 SHA512 5836a19ea68de271475b3ca1efce928b0ad012c96ff7ecdc4474b05daf8b8df022203eb46ec839b76e7d50be7a75b8f278d534d762fac0e612a8f09ae13c7c16
 EBUILD mozc-2.26.4220_p20201212102434_p20201219202429.ebuild 10424 BLAKE2B c19e305e4ed43d17935391c715ba54d2d2875cbc4b4d31462df99021773d0b8005c2cdc86e6cdbc58ef9394e5e8d3ca3d0a8cdf356b93f7730b81f097cca1e78 SHA512 c0382b61832a9cb0356bb03b1464c1c5e988644c425fbdec68dda046dddcac9dd6d235d5adc161a54cd23ffb0ed2273664282094dd9b4ee47398814b28d2f935
-EBUILD mozc-2.28.5029.102.ebuild 10672 BLAKE2B ea0bdcf9cbb381a59fa03b3d0c6a6b8c4bf15ca556b82e48dfd92210fa4b89b062813f3951e7692edf62d3d6ee42683cc7547edf8580977057b3802c6414acbd SHA512 5309c5338f8f9682c57b19cf20d0f6cd1862f63498ae923830582f18d6b3e1a16846293cb53f0248f68885ea7372378e623871bd714aa3a60e042146150fa880
+EBUILD mozc-2.28.5029.102.ebuild 10719 BLAKE2B c8902ce8286cd4ea4db5c74777bf09410a20128c6a786293a66f136a0fd4fdb8480cb830bb94e3840acc4ba026696a8b2fb5ca8a5ff1c61fd8056ca05491c5b8 SHA512 0132fef584573e776c85e9608ff1060344b79f07baaca38fb6d494e9810a480b727a595d4305d036253a9d266abb6ca5e28824d593c8e0a525f9215eb735d4a0
 MISC metadata.xml 759 BLAKE2B 4a5a13fcee5848044c4fb7f47435c75e82ec5fc31d3666b101356a7ec14743eb4a997629066fbffc216caba1aff743653d92e491cd3ce2f54ee22019eff959b1 SHA512 a97788b46f15e7e7dd578dbc229334c694dda9cde84093a1fde53cb4a877773ed0a336247e3cb80dcc5962b27fc7946242634f2cad87c602c569262670f31ffa
diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch
new file mode 100644
index 000000000000..08421910d098
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/912776
+Adapted from https://src.fedoraproject.org/rpms/mozc/raw/aa3cba136c9a28e176d246f450465d3a8a4e8533/f/mozc-build-new-abseil.patch
+--- a/src/base/init_mozc.cc
++++ b/src/base/init_mozc.cc
+@@ -87,7 +87,10 @@ std::string GetLogFilePathFromProgramName(const std::string &program_name) {
+ void ParseCommandLineFlags(int argc, char **argv) {
+   absl::flags_internal::ParseCommandLineImpl(
+       argc, argv,
++      #if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20230802
++      // Abseil 20230802.0 does not use ArgvListAction
+       absl::flags_internal::ArgvListAction::kRemoveParsedArgs,
++      #endif
+       // Suppress help messages invoked by --help and others.
+       // Use UsageFlagsAction::kHandleUsage to enable it.
+       absl::flags_internal::UsageFlagsAction::kIgnoreUsage,
diff --git a/app-i18n/mozc/mozc-2.28.5029.102.ebuild b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
index ee6de0134b29..a6790b3d1213 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
@@ -118,6 +118,7 @@ SITEFILE="50${PN}-gentoo.el"
 
 PATCHES=(
 	"${WORKDIR}"/mozc-2.28.5029.102-patches
+	"${FILESDIR}"/mozc-2.28.5029.102-abseil.patch
 )
 
 python_check_deps() {