gentoo auto-resync : 25:12:2024 - 06:31:02HEADmaster

4 files changed, 35 insertions, 1 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 87bc9ef3faa2..124c9286e4e8 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 65af3e3db8de..bbceed5994c3 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -3,11 +3,12 @@ AUX uim-Wconversion.patch 567 BLAKE2B 7241f18b4efa84f3eecae63027aef169eb7ce3ab06
 AUX uim-clang-16.patch 1394 BLAKE2B 4b245374a538cfd1384389ecb0409779be82d78e52cf065b8430e7bcad1aa6854583841a2bba88d9efe19703dd4432a1cdac5e2847c80e39fc51994c4c30cd09 SHA512 75d70a42e3aed48ba036a38dfa7ffc037b17864d902aae27dca71a21e102e9ac8291f5e8d7f47dd1f074d2230463efd33465b8ab0b58f7860f316a096207c121
 AUX uim-gentoo.patch 1310 BLAKE2B e0f4b85a210f8e041a98e8fddc55ea6e3a06d568ad357a1110b6191ee8ac2d0bcbda191c5702f8f24d82f1b878228bd046ee01c07e6211cc3ccb6dec3c21d7b5 SHA512 88f24a9d816f5e610412200dcabd5a9c51a74d5d3139c0afe9f8d3cddc8815d3dcaad0147acf76536c9180f0041fb1b288e391e17389a31c6b3eabaea6c0f314
 AUX uim-kde.patch 2507 BLAKE2B 81287532295af0e5f1235cc3fcea9b4b06c07d1c4377155f19a6e71622da6e398c133fdfb0a6fc3817bfbb9b61b047eabbea6fed8f01a68115a1050d81c9bc7b SHA512 562a09eb15617133dc9fb4ca8b6a855dd28af04f4c27de8c292a32849360f898de5252ef52ad9f1363e238d811346a9c3d19750b33d243bfb48f0c7dd606434d
+AUX uim-set-face-underline.patch 1154 BLAKE2B 08eaa6bcf2f5e726fb530aa460fab625f46c47b7fe8fa3ea6a4e64cbc330c28d5cc5b7747599abe9128c51b0622922c08c31ad1aebbf7502263d38d685c3f161 SHA512 3c0cc62c7ce8664c50cd0e7e3810f45bf68e35a1adb846bcb7a2913f3df72053c13d84abb18916314257dfc0998de8c017f9dbcf5df99ebc747e8c9a4f6a8d12
 AUX uim-slibtool.patch 587 BLAKE2B b596fc54798b5366fa6b84370bf614551b82c74cac8adce7c5d5bbd755e83dd3d2e4f9b9ce5824811240946268467e7698acd04cdb7a2df078d617740766f880 SHA512 c02fde5c30a3f11a24cce1bc00f855b8a3ae3dcd09d2c6738ddf0f32795938cf359c04f275809d00f4439a96499a32d7c026b1c531df3656cbabad9a990529c5
 AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
 AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716e1c27200a9b4d29a649beb333fe61c30cd36718494b05cb5217d486fb929cd617fe7038bf168d7 SHA512 4e86e051dd05ec0b56d423a079b0b285fdd9b256ae66528781a68ee0bfcf1be15530346facb28eab0a1401f2f27f9dce8cc8e215fe3195879f66e7e4241d80fc
 AUX uim-zh-TW.patch 369 BLAKE2B a0d536721c67e3acbdc8d9efd060408eb23f0ae3b6eb06cf54ce1fdaf214a7b6e0aef615ad8d27471fa349c94cccefeb97a8f60fcfe0e920ac6ca7451cf325dc SHA512 3dc2a7a5af1562f4972044feccdd3723f5264a6fe22d0bc8a742b8d358f8103b4fe9d2e767e0220fa93eaeb2ff675f162bca4d863f182dbcdf47ea1f8400b652
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.9.tar.bz2 6233465 BLAKE2B 5fc57ffd43557cc685ca766d13e871a7b3ad3829fe3b3fcaa3ab76cba15350e82747952bcc77eda0093df0681ad5d3580cb30c96e2a707f0f3e2687a5bf96e19 SHA512 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df
-EBUILD uim-1.8.9-r2.ebuild 5794 BLAKE2B 00b031fc18ecb8e77f85ee7141a81d00e1cc1f64f41e9883edcee287d63e407b1aeecc727d5336c3976397cfbc2f3a8d8448d8bacdae3390f3da66b3a5a5d195 SHA512 ffac9cd698b739c194cb9a756e41ca1d6cf250ffb66676cd44c42f0dbc7956b5217af2a2798026418cef0fb3e473bc0b9349e55a7b71e011e3ae4574ef586d29
+EBUILD uim-1.8.9-r2.ebuild 5840 BLAKE2B 2acfac3ba1bbf4c6b8d65d97a4c7a866b1981a7432853405c85ca539f48b2057f3cda7f20c34781e14bb6ef023a224c6204877fe4a5dd3413d57087453f7f5b4 SHA512 a1b0cb9299957f12462ee5c47a7b5159b5cdbce801cbe59af3ad01f275d526c25692d77d69e5df8a77394411b6918408bf124a4d8bbe58777d66f8295e695344
 MISC metadata.xml 1059 BLAKE2B 7ddf7ebb4c6fa262fb369edabe5bc106023d8b4960ea067fab673c6ca9a489190e591e92e4c14df617318e5feb08d3c064fbdaa5f1ea66a6ebf983a8154a3828 SHA512 c412582600c38a9c171e3e45cf2bfbac0ac3682d5ab1f367ef3e988a4702e8d36cba58ea4f9c34b28493150f34c863c6071b8c02eb3b68bfe5f3b8f98a195c79
diff --git a/app-i18n/uim/files/uim-set-face-underline.patch b/app-i18n/uim/files/uim-set-face-underline.patch
new file mode 100644
index 000000000000..bf0d3a9a64d6
--- /dev/null
+++ b/app-i18n/uim/files/uim-set-face-underline.patch
@@ -0,0 +1,32 @@
+https://github.com/uim/uim/commit/7b903ddf144344e49da12cc070f7c11f82ae61db
+
+commit 7b903ddf144344e49da12cc070f7c11f82ae61db
+Author: Sutou Kouhei <kou@clear-code.com>
+Date:   Fri Aug 11 10:44:26 2023 +0900
+
+    emacs: use set-face-underline
+    
+    set-face-underline-p is removed in Emacs 29.
+
+diff --git a/emacs/uim-var.el b/emacs/uim-var.el
+index 189f91c9..ce40b6db 100644
+--- a/emacs/uim-var.el
++++ b/emacs/uim-var.el
+@@ -435,7 +435,7 @@ keeps the size of it when showing the candidates.")
+ (make-face 'uim-preedit-face)
+ 
+ (copy-face 'uim-preedit-face 'uim-preedit-underline-face)
+-(set-face-underline-p        'uim-preedit-underline-face t)
++(set-face-underline          'uim-preedit-underline-face t)
+ 
+ ;; highlight
+ (make-face 'uim-preedit-highlight-face)
+@@ -443,7 +443,7 @@ keeps the size of it when showing the candidates.")
+ (set-face-background 'uim-preedit-highlight-face "Blue3")
+ 
+ (copy-face 'uim-preedit-highlight-face 'uim-preedit-highlight-underline-face)
+-(set-face-underline-p 'uim-preedit-highlight-underline-face t)
++(set-face-underline   'uim-preedit-highlight-underline-face t)
+ 
+ ;; separator
+ (make-face 'uim-separator-face)
diff --git a/app-i18n/uim/uim-1.8.9-r2.ebuild b/app-i18n/uim/uim-1.8.9-r2.ebuild
index 8e2c2252a1f1..679e1f61e788 100644
--- a/app-i18n/uim/uim-1.8.9-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.9-r2.ebuild
@@ -90,6 +90,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-Wconversion.patch
 	"${FILESDIR}"/${PN}-xkb.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
+	"${FILESDIR}"/${PN}-set-face-underline.patch
 )
 
 DOCS=( AUTHORS NEWS README RELNOTE doc )