gentoo auto-resync : 24:09:2022 - 17:32:06

7 files changed, 41 insertions, 13 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 3c11875a6573..cfd0e36abbc0 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index fa4377c9c1e5..5d3a539d7553 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,9 +1,9 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
 AUX uim-1.8.8-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX uim-Wconversion.patch 567 BLAKE2B 7241f18b4efa84f3eecae63027aef169eb7ce3ab068bf3f1b225ab5ff597008c017c6da54817bc4db18578c8654031b56afd149936f2825f803db959dad28636 SHA512 b193a7e689b955b966cb5f402336de0b96f23a9d9f831907863ddc4cbaf63080509f514ddc35a67f75d19c65bbfadbf4883b65ae83faa7c741cf7ec80ddf3f50
-AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
-AUX uim-kde.patch 2193 BLAKE2B 38e049b372cf2854879627186a2f014265e410ace9657cfd6afaf9c08bbfc5b4df208a8207861a9edab32c058847b01b3a8ba1b5cf4f88ab6d2d213c494c64d4 SHA512 4ff8306ea451233836f78096eaafd739e1d9c19d9c48230963c7d98c23860ecc649e1e94eb1569e959a2932eae3fb74641e274cb72212a962d149dcde09a0537
-AUX uim-slibtool.patch 573 BLAKE2B 97b6b1130ff7bb0aeb6d58d731cae387e7a2fa96fbbc260ee7482fd595cfd8754440a0db2903dd4e82429d5409e2639545af247e9b761d4119329a9f6bd01030 SHA512 9f8637ee7f7c43af72c1f85e71ad087850972d410c5d9e235f87c7a3dba97cc9970aba0466b897cb8383553185615dd29569c471362f3f90b9ba5e039c679cd6
+AUX uim-gentoo.patch 1310 BLAKE2B e0f4b85a210f8e041a98e8fddc55ea6e3a06d568ad357a1110b6191ee8ac2d0bcbda191c5702f8f24d82f1b878228bd046ee01c07e6211cc3ccb6dec3c21d7b5 SHA512 88f24a9d816f5e610412200dcabd5a9c51a74d5d3139c0afe9f8d3cddc8815d3dcaad0147acf76536c9180f0041fb1b288e391e17389a31c6b3eabaea6c0f314
+AUX uim-kde.patch 2507 BLAKE2B 81287532295af0e5f1235cc3fcea9b4b06c07d1c4377155f19a6e71622da6e398c133fdfb0a6fc3817bfbb9b61b047eabbea6fed8f01a68115a1050d81c9bc7b SHA512 562a09eb15617133dc9fb4ca8b6a855dd28af04f4c27de8c292a32849360f898de5252ef52ad9f1363e238d811346a9c3d19750b33d243bfb48f0c7dd606434d
+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
@@ -11,6 +11,6 @@ AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663
 DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1 SHA512 b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
 DIST uim-1.8.9.tar.bz2 6233465 BLAKE2B 5fc57ffd43557cc685ca766d13e871a7b3ad3829fe3b3fcaa3ab76cba15350e82747952bcc77eda0093df0681ad5d3580cb30c96e2a707f0f3e2687a5bf96e19 SHA512 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df
 DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104 SHA512 39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
-EBUILD uim-1.8.9.ebuild 5765 BLAKE2B ffaa1d41c47d7cbbfe41bac4869a9823c59fbc93a4af7c0cd6d1ee94f5b8ae29f00b79e73f641e0d2e0bb542f85980a086f12bb17058a33bd5511bbc0a8c846c SHA512 1a24516e54218b294c618234e807a3ccb9443faa7e18eb30a8ce87780b003c4afd4ef5bf68ca69142f2012b3f1f694f5afddbf72a8e3403c448a7b6888d31c10
-EBUILD uim-1.8.9_pre20210103-r1.ebuild 6054 BLAKE2B 2c22283993a35d34a0be42e0dc68f0594c53312b88386790b8013e2a32e64c99c64ee476dfd2d108442a00eaee61ba1792cc7ae346416cb0acb9deaa8198670b SHA512 0e7b544bd617f2803f3c0201771f759d735385ad2a3d6a38a04227725a0ebef48283209d0ab36211872fab9393c585cfc329c34460a0ae24f7b80bf7427d722a
+EBUILD uim-1.8.9.ebuild 5743 BLAKE2B 5e30bdb0715225944b347c7b352d8e811c9f4f78d8adae88ed279626780878853ad2a4d407981b0410e3f1848167c1a39d2241fff60b1ff3bfa4aa2ca337c0ea SHA512 d01fac3d2005461410d349e9c907e84dd775c15692a37426409351746bf834640db9bb16693da0365cb6bf5a2cf486de5a6e120b5a17b67f104133386ccae0f5
+EBUILD uim-1.8.9_pre20210103-r1.ebuild 6032 BLAKE2B f91321fe42c453c628b48212545e05c63ebf0a96c9dcdb42c1cab630a66d0bdb0d22b7e88775c0a7a327135245ddb7b360ae4058b5fea6c2878ff570b431a1a9 SHA512 73f950c16d9d399ed6fb3c205102feb0b01c768c54e4519d3daabfab1d1c1246d580316c217375b65dbfae35bf6cc2eec3d1fa18709c9630c5c2e9f05a43ddf9
 MISC metadata.xml 1059 BLAKE2B 7ddf7ebb4c6fa262fb369edabe5bc106023d8b4960ea067fab673c6ca9a489190e591e92e4c14df617318e5feb08d3c064fbdaa5f1ea66a6ebf983a8154a3828 SHA512 c412582600c38a9c171e3e45cf2bfbac0ac3682d5ab1f367ef3e988a4702e8d36cba58ea4f9c34b28493150f34c863c6071b8c02eb3b68bfe5f3b8f98a195c79
diff --git a/app-i18n/uim/files/uim-gentoo.patch b/app-i18n/uim/files/uim-gentoo.patch
index de498b754d86..649288932259 100644
--- a/app-i18n/uim/files/uim-gentoo.patch
+++ b/app-i18n/uim/files/uim-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -38,6 +38,7 @@
+@@ -56,6 +56,7 @@
  AC_PATH_PROGS(SED, sed gsed)
  AX_PATH_QMAKE4
  AX_PATH_QMAKE5
@@ -8,7 +8,19 @@
  
  AM_MAINTAINER_MODE
  
-@@ -1618,7 +1619,7 @@
+@@ -575,6 +576,11 @@
+ AC_CHECK_FUNCS([waitpid])
+ AC_CHECK_FUNCS([daemon])
+ 
++AC_CHECK_DECL([va_copy],
++              [AC_DEFINE(HAVE_VA_COPY, 1, [Define to 1 if you have the `va_copy' macro.])],
++              [AC_CHECK_DECL([__va_copy],
++                             [AC_DEFINE(HAVE___VA_COPY, 1, [Define to 1 if you have the `__va_copy' macro.])])])
++
+ # IRIX has a const char return value for gai_strerror()
+ AC_CHECK_FUNCS(gai_strerror,[
+         AC_DEFINE(HAVE_GAI_STRERROR)
+@@ -1637,7 +1643,7 @@
    fi
    AX_LANG_WNOERROR  # end AC_LANG_WERROR
  
@@ -17,7 +29,7 @@
  else
    CFLAGS="$CFLAGS -DNDEBUG"
    CXXFLAGS="$CXXFLAGS -DNDEBUG"
-@@ -1629,7 +1630,7 @@
+@@ -1648,7 +1654,7 @@
    AX_CFLAGS_GCC_OPTION([-Wno-unused-function], [UIM_SCM_CFLAGS])
    AX_LANG_WNOERROR  # end AC_LANG_WERROR
  
@@ -26,3 +38,13 @@
  fi
  
  AC_ARG_ENABLE(warnings-into-error,
+--- a/sigscheme/src/Makefile.am
++++ b/sigscheme/src/Makefile.am
+@@ -51,7 +51,6 @@
+         functable-srfi60.c
+ 
+ if MAINTAINER_MODE
+-$(FUNC_TABLES): $(top_builddir)/config.status
+ # Core
+ SSCM_CORE_SRCS = \
+ 	$(srcdir)/error.c \
diff --git a/app-i18n/uim/files/uim-kde.patch b/app-i18n/uim/files/uim-kde.patch
index 8a291650ae3d..dfac6b556435 100644
--- a/app-i18n/uim/files/uim-kde.patch
+++ b/app-i18n/uim/files/uim-kde.patch
@@ -29,7 +29,15 @@
  AC_ARG_ENABLE(pref,
    AC_HELP_STRING([--disable-pref],
      [do not build graphical utility to edit user settings]),
-@@ -1948,12 +1970,15 @@
+@@ -1883,7 +1905,6 @@
+   cmake_option="-DCMAKE_BUILD_TYPE=${cmake_build_type}"
+   cmake_option="${cmake_option} -DCMAKE_INSTALL_PREFIX=${prefix}"
+   cmake_option="${cmake_option} -DCMAKE_SKIP_RPATH=true"
+-  cmake_option="${cmake_option} -DKDE4_USE_ALWAYS_FULL_RPATH=false"
+ fi
+ 
+ if test "x$with_qt4" = xyes; then
+@@ -1948,12 +1969,15 @@
      qt5_immodule_option="DEFINES+=QT5_IMMODULE"
    fi
    set -e
@@ -51,7 +59,7 @@
    ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
      ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
    ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \
-@@ -2007,6 +2032,7 @@
+@@ -2007,6 +2031,7 @@
     Qt5 immodule    : ${with_qt5_immodule}
     KDE3 Applet     : ${enable_kde_applet}
     KDE4 Applet     : ${enable_kde4_applet}
diff --git a/app-i18n/uim/files/uim-slibtool.patch b/app-i18n/uim/files/uim-slibtool.patch
index 51560d439e25..2efec471c2cc 100644
--- a/app-i18n/uim/files/uim-slibtool.patch
+++ b/app-i18n/uim/files/uim-slibtool.patch
@@ -7,7 +7,7 @@
 -                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs
 -LIBS += -lreplace -luim -luim-scm
 +                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs \
-+		@abs_top_builddir@/sigscheme/libgcroots/.libs
++                @abs_top_builddir@/sigscheme/libgcroots/.libs
 +LIBS += -lreplace -luim -luim-scm -lgcroots
  !win32:!embedded:!mac {
      LIBS += -luim-x-util
diff --git a/app-i18n/uim/uim-1.8.9.ebuild b/app-i18n/uim/uim-1.8.9.ebuild
index 0fc2663179b2..8d3071273f39 100644
--- a/app-i18n/uim/uim-1.8.9.ebuild
+++ b/app-i18n/uim/uim-1.8.9.ebuild
@@ -94,7 +94,6 @@ PATCHES=(
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )
 
-AT_NO_RECURSIVE="yes"
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
diff --git a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
index 0b0228923d41..df9c907e1f24 100644
--- a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
@@ -96,7 +96,6 @@ PATCHES=(
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )
 
-AT_NO_RECURSIVE="yes"
 SITEFILE="50${PN}-gentoo.el"
 
 src_unpack() {