gentoo auto-resync : 16:07:2024 - 12:27:58

4 files changed, 28 insertions, 2 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index cfcb922f8e1a..60f9903e10b8 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 74795bb476b4..8be3c7f3e563 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,6 +1,7 @@
 AUX librime-1.6.0-boost-1.76.patch 721 BLAKE2B 460b2e007c900b746958b93bb39e378de20f181f89fea7c7422d222ab00754347c12cf24c92ca7ae3b269127785fb3eac462541201ff7d24fe37c9b18417ca24 SHA512 7c44aba7f6cbc5bb829dc6b7f30e96fdcb8955ae1f8a3fced56860e3d68c499a82a1a5a240070663d8e298d2785d68cb5932a35c8b5a33f092acaa630ec57bde
+AUX librime-1.7.3-boost-1.85.patch 852 BLAKE2B 413a5c3bc1b24729b6ed58902e498b182de96f074fac67b582f033090e5a24bab78f1a26590502a490330cd39347f2cdb888ef57813a9daca049aa26d3bc2c63 SHA512 f36457cc1ad381628edb91135a5e559a05af826e8867138c1acdf29efcf0452b309a62cfd86b6a2d0a80c8b3cbd678f0ade62bd530513f31325c9d300e053160
 DIST librime-1.7.3.tar.gz 2859513 BLAKE2B 834622860cdc3038d1b983f476bca70f211dfbc3bc2b565a998163e22688841ee3a0c7f9a64bce285e2f3f5b5a9a802bd5506f17904ccb3291babf80d4748fb5 SHA512 8767d17c3d14a5a1bbb8269fab1627b907de72c288b362fdbc6191223937da21e8b18471b4ae8f83ce5afc0ec5c3ab12fbcb49930eb9969c1764c7390d9ee4b0
 DIST librime-1.9.0.tar.gz 2628091 BLAKE2B 5026fbe537520679b60b7f39cab65e97e175d574ad709e2b09bb5d71f6655f48f9f046d2caeaad73dcd839f58cd76796eded4deb775d6817a99ab7de107187a1 SHA512 7f432bbfeedc0949391fca82ebf080d113089ec9f0ab40f4bc63cf3037052a27b4ef44e55e7fc43b1217cf6635c62be0fb7520c3cc1492ec169fe5ee864e61ea
-EBUILD librime-1.7.3-r1.ebuild 1598 BLAKE2B eaf895f5272a5b52d9fa43f7574c0a45f57de968fd8c3d254ee2c2bc888b062f4c81d547b86829ba847bec93ee1f4399c8ffe962a577f0e034a0c8ff4946289c SHA512 6812c0d4d2d03ce64835b503e0c163c2a397ea786a802eea2edf105ac76f77fc6e91297d66a7752ea2f389c4cf354ea6f71d1ccf1121b0a0ee9334df53298297
+EBUILD librime-1.7.3-r1.ebuild 1649 BLAKE2B 937f4df7a0b33ccef510583ce4d02e33d11229fb6a3c596be98e1ad28140fc072cd2bca4983b67abf92bfe2dc1ce749be757664c1bb7f986214afd750bb7e0e3 SHA512 4b1ce5d97080d7a261f488cb2cc4a341ef1d52b28c9e1910d714469d56eae52685632b1ed4b0289847ef45fcbe728b8fdda8a18e4dae75ddde84e79ad2f66f12
 EBUILD librime-1.9.0.ebuild 1065 BLAKE2B 49c7cc3fb689c8bc55f7fb02f47f7d8eb285adaec365f1e59d5c9384cfb5a3c6ab757bcc140e081c272b8751e68f33e0de061bf260950b494d291361e308c0f2 SHA512 80ea2a653f7466e03e9f527393481022758bb6a5e139927cd68d4e2d20938fa2aa1e75f1fcbc7ed5aba8317c3412bdeb047c712516313cab9f536140322a8f8e
 MISC metadata.xml 777 BLAKE2B 1ac91ae089dff08373d0e0c7a4b95e952a9e697c8ea462f08d3894e01ffeace211eaccafe5d9737912418d254c8343e7b999dd02e79eba3feaeef35191d74d5b SHA512 d06cdebe5baa6d639074a739b9e996deb29f6e553d333f3d852dce03b3e4eef44690a610d6d358493bf91836d9d6a6cb471779ba8eada084528416405a0240b2
diff --git a/app-i18n/librime/files/librime-1.7.3-boost-1.85.patch b/app-i18n/librime/files/librime-1.7.3-boost-1.85.patch
new file mode 100644
index 000000000000..cfb191ddc319
--- /dev/null
+++ b/app-i18n/librime/files/librime-1.7.3-boost-1.85.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/933408
+--- a/src/rime/lever/deployment_tasks.cc
++++ b/src/rime/lever/deployment_tasks.cc
+@@ -577,7 +577,7 @@
+       continue;
+     }
+     boost::system::error_code ec;
+-    fs::copy_file(entry, backup, fs::copy_option::overwrite_if_exists, ec);
++    fs::copy_file(entry, backup, fs::copy_options::overwrite_existing, ec);
+     if (ec) {
+       LOG(ERROR) << "error backing up file " << backup.string();
+       ++failure;
+
+--- a/src/rime/lever/customizer.cc
++++ b/src/rime/lever/customizer.cc
+@@ -94,7 +94,7 @@
+   if (redistribute || (is_dirty && !missing_original_copy)) {
+     try {
+       fs::copy_file(source_path_, dest_path_,
+-                    fs::copy_option::overwrite_if_exists);
++                    fs::copy_options::overwrite_existing);
+     }
+     catch (...) {
+       LOG(ERROR) << "Error copying config file '"
diff --git a/app-i18n/librime/librime-1.7.3-r1.ebuild b/app-i18n/librime/librime-1.7.3-r1.ebuild
index 5976ce7ac04b..f32cba65e333 100644
--- a/app-i18n/librime/librime-1.7.3-r1.ebuild
+++ b/app-i18n/librime/librime-1.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2023 Gentoo Authors
+# Copyright 2012-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -44,6 +44,7 @@ DOCS=(CHANGELOG.md README.md)
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch"
+	eapply "${FILESDIR}/${PN}-1.7.3-boost-1.85.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