gentoo auto-resync : 28:06:2024 - 07:59:59

7 files changed, 318 insertions, 64 deletions

diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index e31964567ea5..c35b54083b9c 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,9 +1,13 @@
-AUX m17n-lib-configure.patch 3476 BLAKE2B 6e74f8e94de9d589b7a5054bee0e805f4fb1f031b82c9d532347d7a06005828b068cb6b350f41464e21682c056a2ac6470e8db4fcd9b16f258ddb8c6c958b6c7 SHA512 d66119495b0eb3a67964826540e9fb86d9b6bfd057dfa6f3156628659751f0b9f9a702e6c6f7eefed2a26ced2101087678ef6af0d1e2098f77c35521ef400a43
+AUX m17n-lib-1.8.0-configure.patch 3476 BLAKE2B 6e74f8e94de9d589b7a5054bee0e805f4fb1f031b82c9d532347d7a06005828b068cb6b350f41464e21682c056a2ac6470e8db4fcd9b16f258ddb8c6c958b6c7 SHA512 d66119495b0eb3a67964826540e9fb86d9b6bfd057dfa6f3156628659751f0b9f9a702e6c6f7eefed2a26ced2101087678ef6af0d1e2098f77c35521ef400a43
+AUX m17n-lib-clang.patch 720 BLAKE2B 6f5551d98aaba930488b932f07578ae7210f8aa464489ede65d561723dd706da8fcd2a734e0842e6885458ee00bdaab011f3f01267a1cf456359152def61384e SHA512 8430fc9299a903e62cabbbc938ff4643c37cc42217f91474bcae0d2a5547fd89ff1d9e9180c4e8c3aaad453c7bba9ceadcc8879c60a0ca6ccab2fb7437fd21ac
+AUX m17n-lib-configure.patch 3749 BLAKE2B ac35bb426ed9716b1bbeaeb89246dc78eccbc048748b1bc336af16cacb5f5390111b80d89dee19e5ea1639123f95a8505742b2f8b4df6cd557d2e979107214ab SHA512 53dae15aad722f207607ed13e2fbadcb468b4773d84d6e6936a88e21a9f111bb5e5bb89b4a8d3f11ecf3e30535473c15cbc527d8bb3fe9fe4d5c60c87fd11d80
 AUX m17n-lib-freetype.patch 1185 BLAKE2B 4056c1e6dffb6783151ca9e33668b76dd64fe59fe21585f433e2a484fb20ebb3e72707174f28993a98ef4d9c7f010e339e9c750dd62343dc8ed2de0fbcef9c04 SHA512 637e27602030cd1d690ad802e31cbf9802f442c690a9df554397db8ae069f3a67f87dffb486403c30f0c6769f8ecc255f4889691671ca073b51692ec295e9fb7
 AUX m17n-lib-ftconfig.patch 1200 BLAKE2B 8aea727469596923fba54ac98cde29719a09eaecdabde0ab5f02b491e0d86ed855689eeb92f536e420a75111d937fdb0941bc419c9d15ef4baf1e0a4f678bb81 SHA512 b03680b185dccf063ef01ce85bb1d252bd984a77e94e314e76482747af4ecd4f90c3b7dd03b5da88e1d75654526b22368c70c80df398044baa39bc80f5936ba3
 AUX m17n-lib-ispell.patch 458 BLAKE2B 745b7567421b475fad70e63c4a6c5e12606de89bd7add18cc269d0a18e294dd3c1fed542cf65aa776120989f63009bf95bfabaad1b795fd5316e1599dd66dbf7 SHA512 cbfbd70a1b6d7525627ad8d87c3b2d79f8bfbd74915da5b6f8646a5ab7cbb351abb7a1ea103320faaa4cf80fa0a58d0adf7d9b3a7cc0ee40e8bb4220dd92574c
 AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda768948e92f4fb0bdaa7d5316657bc48342232edc64c24ec4e7f7b1329fff8ba2b453e8211856168d6830218d6ebd48c SHA512 a1726270680ab0124764a092aca36369e89a21b0164b039d5663cb0af8352b316ed59bec049dc849201f046bcb7bbcf3dd8522bbc7ab20ef64c59d898274eef1
 AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987881c4cebe9fd0e0f6fc5ed49a36b602c61259acfedc0f7020258b4313595c45326bcfc65d9744b273a49e1ab11 SHA512 978d968bdfe590861ec078135db5afb7edf21e2d0bb73403926f5fb7d77566bbd51813849bcd97e1ae127721b886be1ad8216b47b53a82f5df6dec813b249e7f
 DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb SHA512 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
-EBUILD m17n-lib-1.8.0-r1.ebuild 1940 BLAKE2B ce610a079d6683eeddba0c2dcd1466b3b132f4c8ecb96b47befc32ab2ecd087dcb4aa94365e2ff5871a68903504abb669bd2a69fb11e1c05ddc44617ac014c33 SHA512 cd4e074aa1924593fae5224f3be7a2d283b0e312bb21d580ff56af1277e175878d0e31a42e252def3a70db07516b0d389c387de0166f73a14e411fbaeb420f67
-MISC metadata.xml 811 BLAKE2B 8c7cf04662ba154324c9f8f0e2df33e0c528bf2746e4e2fab929536daf7cb3e62cdeb699fa6377d5b2a33a489bd056755652cb23d25fa731ab306bb8fd50e67c SHA512 61820843ca86c19a35eec0590a18e2b4dd053e23a14dd97313663d1d01453d8d40290d5a0769349ae36343a567f4a418a77690cd8e3e31a72014a2bb35f866b1
+DIST m17n-lib-1.8.4.tar.gz 1119271 BLAKE2B 790a002e0abd66d7db0d61ab0240712b2810e698c73d507a5054ad83d4a7a7258c4407d5167ce92fc4c1f3acdfc9f8d3244634af801cde2a00762f09d5e1d823 SHA512 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6
+EBUILD m17n-lib-1.8.0-r1.ebuild 1905 BLAKE2B 9656dd865cc442e8bee1561af21db97fdc86b374ddcddca1b23659f5bf9ef6dc5a5eb54da6424d806d011dca5eaea56348bc796984675f5e28b5fa01d0e002e5 SHA512 aa18b9dd39f7b1068a9f51f4f0871799e26adfa6fb0f493302b9e000f6743da0378388aa9403b183e9ff5f58208d8b145617353bc259d88a3cda8f026c700cd9
+EBUILD m17n-lib-1.8.4.ebuild 1766 BLAKE2B f696d03704511c4f5aeafe0dbd07e841dfac444a135a28bf299a692bcdce2947b7107d91eaa54ffa6e0f9210b40264019acbffb7dca1ccca7e2dc09ebc5aab1f SHA512 e764844c208b9a4ff2f02c75df3670737cf2456e1944dcd680ce54f7c617bb80a0689f7d4e4e7f11291805c7286d7965feb258c6b50e0acded288431a3be461e
+MISC metadata.xml 889 BLAKE2B 4fdd373094410c6fac69020e36d1433b10eae0ff3530e666f1445819175e118c8266d6000145e1be27912c530162ed9a76e71014bb37998c11a1355b125d1665 SHA512 fcecdbf2fefbc637a023c3f3b03922dbb6708a6b540e5555242d415e4d70b5ef73df3f9cccc14536aa237a018b9b23e3a5a3d04141d93401fcc06984b542754b
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch
new file mode 100644
index 000000000000..04ffc7749a5b
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch
@@ -0,0 +1,91 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,8 +97,8 @@
+ 
+ dnl Checks which levels of APIs should be compiled.
+ 
+-AC_ARG_ENABLE(gui,
+-	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
++AC_ARG_WITH(gui,
++	      AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
+ 
+ AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
+ 
+@@ -125,7 +125,9 @@
+   X11_LD_FLAGS="-lXt -lX11"
+   M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
+ 
+-  if test "x$HAVE_XAW" = "xyes"; then
++  AC_ARG_WITH(athena, 
++	    AS_HELP_STRING([--with-athena],[with MIT Athena widget suport]))
++  if test "x$with_athena" != "xno" -a "x$HAVE_XAW" = "xyes"; then
+     AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
+ 	      [Define to 1 if you have the Xaw header files.])
+     XAW_LD_FLAGS="-lXaw -lXmu"
+@@ -149,7 +151,9 @@
+ fi
+ AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
+ AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
+-if test "x$HAVE_FRIBIDI" = "xyes"; then
++AC_ARG_WITH(fribidi, 
++	    AS_HELP_STRING([--with-fribidi],[with fribidi suport]))
++if test "x$with_fribidi" != "xno" -a "x$HAVE_FRIBIDI" = "xyes"; then
+   AC_DEFINE(HAVE_FRIBIDI, 1, 
+ 	    [Define to 1 if you have Fribidi library and header file.])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi"
+@@ -202,8 +206,10 @@
+ AC_SUBST(OTF_LD_FLAGS)
+ 
+ dnl Check for Freetype2 usability.
++AC_ARG_WITH(freetype,
++	    AS_HELP_STRING([--with-freetype],[enable Freetype support]))
+ AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
+-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
++if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+   FREETYPE_INC=`freetype-config --cflags`
+   save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
+@@ -255,7 +261,9 @@
+ #else
+ Version too old.  Compiling this line should fail.
+ #endif])
+-if test "x$HAVE_XFT2" = "xyes"; then
++AC_ARG_WITH(xft,
++	    AS_HELP_STRING([--with-xft],[enable Xft2 support]))
++if test "x$with_xft" != "xno" -a "x$HAVE_XFT2" = "xyes"; then
+   AC_DEFINE(HAVE_XFT2, 1,
+ 	    [Define to 1 if you have Xft2 library and header file.])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS xft2"
+@@ -330,7 +338,9 @@
+ fi
+ AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
+ AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
+-if test "x$HAVE_XML2" = "xyes"; then
++AC_ARG_WITH(libxml2, 
++	    AS_HELP_STRING([--with-libxml2],[with libxml2 suport]))
++if test "x$with_libxml2" != "xno" -a "x$HAVE_XML2" = "xyes"; then
+   AC_DEFINE(HAVE_XML2, 1,
+ 	    [Define to 1 if you have libxml2 library and header file])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS xml2"
+@@ -344,7 +354,9 @@
+ dnl Check for Anthy usability.
+ 
+ PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
+-if test "x$HAVE_ANTHY" = "xyes"; then
++AC_ARG_WITH(anthy, 
++	    AS_HELP_STRING([--with-anthy],[with anthy suport]))
++if test "x$with_anthy" != "xno" -a "x$HAVE_ANTHY" = "xyes"; then
+   AC_DEFINE(HAVE_ANTHY, 1,
+ 	   [Define to 1 if you have Anthy library and header file])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS anthy"
+@@ -355,7 +367,9 @@
+ 
+ dnl Check for Ispell usability.
+ AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
+-if test "x$HAVE_ISPELL" = "xyes"; then
++AC_ARG_WITH(ispell, 
++	    AS_HELP_STRING([--with-ispell],[with ispell suport]))
++if test "x$with_ispell" != "xno" -a "x$HAVE_ISPELL" = "xyes"; then
+   AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS ispell"
+   CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL"
diff --git a/dev-libs/m17n-lib/files/m17n-lib-clang.patch b/dev-libs/m17n-lib/files/m17n-lib-clang.patch
new file mode 100644
index 000000000000..fb5d303d01b9
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-clang.patch
@@ -0,0 +1,21 @@
+https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git/commit/?id=624b987e7b252e223de0bdbe148cd56aef0da28f
+
+From 624b987e7b252e223de0bdbe148cd56aef0da28f Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 4 May 2023 13:57:49 +0200
+Subject: Add missing int in example/medit.c
+
+Resolves: https://savannah.nongnu.org/bugs/index.php?64106
+
+--- a/example/medit.c
++++ b/example/medit.c
+@@ -662,7 +662,7 @@ static void MenuHelpProc (Widget, XEvent *, String *, Cardinal *);
+    off the current input method, otherwide turn on the input method
+    input_method_table[$IDX].  */
+ void
+-select_input_method (idx)
++select_input_method (int idx)
+ {
+   int previous_input_method = current_input_method;
+ 
+
diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
index 04ffc7749a5b..90cfc774b806 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-configure.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -1,91 +1,136 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -97,8 +97,8 @@
+@@ -96,8 +96,11 @@
  
  dnl Checks which levels of APIs should be compiled.
  
 -AC_ARG_ENABLE(gui,
 -	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
++PKG_PROG_PKG_CONFIG
++AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != x])
++
 +AC_ARG_WITH(gui,
-+	      AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
++	    AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
  
  AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
  
-@@ -125,7 +125,9 @@
+@@ -117,14 +120,14 @@
+ 
+ M17N_EXT_LIBS=
+ 
+-PKG_PROG_PKG_CONFIG
+-AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != x])
+-
+ if test "x$no_x" != "xyes"; then
+   AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
    X11_LD_FLAGS="-lXt -lX11"
    M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
  
--  if test "x$HAVE_XAW" = "xyes"; then
-+  AC_ARG_WITH(athena, 
-+	    AS_HELP_STRING([--with-athena],[with MIT Athena widget suport]))
-+  if test "x$with_athena" != "xno" -a "x$HAVE_XAW" = "xyes"; then
++  AC_ARG_WITH(athena,
++	      AS_HELP_STRING([--with-athena],[with X Athena Widget suport]))
++  if test "x$with_athena" != "xno"; then
+   if test "x$HAVE_XAW" = "xyes"; then
      AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
  	      [Define to 1 if you have the Xaw header files.])
-     XAW_LD_FLAGS="-lXaw -lXmu"
-@@ -149,7 +151,9 @@
+@@ -132,11 +135,15 @@
+     CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_X11_XAW_COMMAND_H"
+     M17N_EXT_LIBS="$M17N_EXT_LIBS Xaw"
+   fi
++  fi
+ fi
+ AC_SUBST(X11_LD_FLAGS)
+ AC_SUBST(XAW_LD_FLAGS)
+ 
+ dnl Check for fribidi library.
++AC_ARG_WITH(fribidi,
++	    AS_HELP_STRING([--with-fribidi],[with FriBidi suport]))
++if test "x$with_fribidi" != "xno"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ AC_CHECK_PROG(HAVE_FRIBIDI_CONFIG, fribidi-config, yes)
+@@ -158,6 +165,7 @@
+   FRIBIDI_LD_FLAGS=
  fi
- AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
- AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
--if test "x$HAVE_FRIBIDI" = "xyes"; then
-+AC_ARG_WITH(fribidi, 
-+	    AS_HELP_STRING([--with-fribidi],[with fribidi suport]))
-+if test "x$with_fribidi" != "xno" -a "x$HAVE_FRIBIDI" = "xyes"; then
-   AC_DEFINE(HAVE_FRIBIDI, 1, 
- 	    [Define to 1 if you have Fribidi library and header file.])
-   M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi"
-@@ -202,8 +206,10 @@
+ LIBS="$save_LIBS"
++fi
+ AC_SUBST(FRIBIDI_LD_FLAGS)
+ 
+ dnl Check for otflib usability.
+@@ -201,6 +209,9 @@
  AC_SUBST(OTF_LD_FLAGS)
  
  dnl Check for Freetype2 usability.
 +AC_ARG_WITH(freetype,
-+	    AS_HELP_STRING([--with-freetype],[enable Freetype support]))
- AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
--if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
-+if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
-   FREETYPE_INC=`freetype-config --cflags`
-   save_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
-@@ -255,7 +261,9 @@
- #else
- Version too old.  Compiling this line should fail.
- #endif])
--if test "x$HAVE_XFT2" = "xyes"; then
++	    AS_HELP_STRING([--with-freetype],[with FreeType support]))
++if test "x$with_freetype" != "xno"; then
+ PKG_CHECK_MODULES([FREETYPE], [freetype2], [HAVE_FREETYPE=yes],
+                                            [HAVE_FREETYPE=no])
+ AS_IF([test "x$HAVE_FREETYPE" = "xyes"],
+@@ -220,9 +231,13 @@
+   ],
+   []
+   )
++fi
+ AC_SUBST([FREETYPE_LD_FLAGS])
+ 
+ dnl Check for Xft2 usability.
 +AC_ARG_WITH(xft,
-+	    AS_HELP_STRING([--with-xft],[enable Xft2 support]))
-+if test "x$with_xft" != "xno" -a "x$HAVE_XFT2" = "xyes"; then
-   AC_DEFINE(HAVE_XFT2, 1,
- 	    [Define to 1 if you have Xft2 library and header file.])
-   M17N_EXT_LIBS="$M17N_EXT_LIBS xft2"
-@@ -330,7 +338,9 @@
++	    AS_HELP_STRING([--with-xft],[with Xft support]))
++if test "x$with_xft" != "xno"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ XFT2_LD_FLAGS="-lXft -lfreetype -lfontconfig -lXrender -lX11"
+@@ -253,6 +268,7 @@
+   CPPFLAGS="$save_CPPFLAGS"
+ fi
+ LIBS="$save_LIBS"
++fi
+ AC_SUBST(XFT2_LD_FLAGS)
+ 
+ dnl Check for fontconfig usability.
+@@ -306,6 +322,9 @@
  fi
- AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
- AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
--if test "x$HAVE_XML2" = "xyes"; then
-+AC_ARG_WITH(libxml2, 
+ 
+ dnl Check for libxml2 usability.
++AC_ARG_WITH(libxml2,
 +	    AS_HELP_STRING([--with-libxml2],[with libxml2 suport]))
-+if test "x$with_libxml2" != "xno" -a "x$HAVE_XML2" = "xyes"; then
-   AC_DEFINE(HAVE_XML2, 1,
- 	    [Define to 1 if you have libxml2 library and header file])
-   M17N_EXT_LIBS="$M17N_EXT_LIBS xml2"
-@@ -344,7 +354,9 @@
- dnl Check for Anthy usability.
++if test "x$with_libxml2" != "xno"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ AC_CHECK_PROG(HAVE_XML2_CONFIG, xml2-config, yes)
+@@ -328,10 +347,13 @@
+   CPPFLAGS="$save_CPPFLAGS"
+ fi
+ LIBS="$save_LIBS"
++fi
+ AC_SUBST(XML2_LD_FLAGS)
  
+ dnl Check for Anthy usability.
+-
++AC_ARG_WITH(anthy,
++	    AS_HELP_STRING([--with-anthy],[with Anthy suport]))
++if test "x$with_anthy" != "xno"; then
  PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
--if test "x$HAVE_ANTHY" = "xyes"; then
-+AC_ARG_WITH(anthy, 
-+	    AS_HELP_STRING([--with-anthy],[with anthy suport]))
-+if test "x$with_anthy" != "xno" -a "x$HAVE_ANTHY" = "xyes"; then
+ if test "x$HAVE_ANTHY" = "xyes"; then
    AC_DEFINE(HAVE_ANTHY, 1,
- 	   [Define to 1 if you have Anthy library and header file])
-   M17N_EXT_LIBS="$M17N_EXT_LIBS anthy"
-@@ -355,7 +367,9 @@
+@@ -340,15 +362,20 @@
+   ANTHY_LD_FLAGS="$ANTHY_LIBS"
+   CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ANTHY"
+ fi
++fi
+ AC_SUBST(ANTHY_LD_FLAGS)
  
  dnl Check for Ispell usability.
++AC_ARG_WITH(ispell,
++	    AS_HELP_STRING([--with-ispell],[with Ispell suport]))
++if test "x$with_ispell" != "xno"; then
  AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
--if test "x$HAVE_ISPELL" = "xyes"; then
-+AC_ARG_WITH(ispell, 
-+	    AS_HELP_STRING([--with-ispell],[with ispell suport]))
-+if test "x$with_ispell" != "xno" -a "x$HAVE_ISPELL" = "xyes"; then
+ if test "x$HAVE_ISPELL" = "xyes"; then
    AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.])
    M17N_EXT_LIBS="$M17N_EXT_LIBS ispell"
    CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL"
+ fi
++fi
+ 
+ dnl Check for Thai word-segmentation library.
+ dnl If we have one, define HAVE_THAI_WORDSEG and one of these:
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
index fb133523ef66..e3a2db9f3487 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
@@ -6,10 +6,10 @@ EAPI="8"
 inherit autotools
 
 DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git"
+HOMEPAGE="https://www.nongnu.org/m17n/"
 SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${PN}-clang.patch
 	"${FILESDIR}"/${PN}-freetype.patch
 	"${FILESDIR}"/${PN}-ftconfig.patch
 	"${FILESDIR}"/${PN}-ispell.patch
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild
new file mode 100644
index 000000000000..9d9d1f79ba11
--- /dev/null
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="Multilingual Library for Unix/Linux"
+HOMEPAGE="https://www.nongnu.org/m17n/"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
+
+RDEPEND=">=dev-db/m17n-db-${PV}
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		athena? ( x11-libs/libXaw )
+		bidi? ( dev-libs/fribidi )
+		fontconfig? ( media-libs/fontconfig )
+		gd? ( media-libs/gd[png] )
+		libotf? ( dev-libs/libotf )
+		xft? (
+			media-libs/freetype
+			x11-libs/libXft
+		)
+	)
+	anthy? ( app-i18n/anthy )
+	libxml2? ( dev-libs/libxml2 )
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-freetype.patch
+	"${FILESDIR}"/${PN}-ispell.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	# workaround for parallel install
+	sed -i "/^install-module/s/:/: install-libLTLIBRARIES/" src/Makefile.in
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with anthy)
+		$(use_with libxml2)
+		$(use_with spell ispell)
+	)
+	if use X; then
+		myconf+=(
+			$(use_with athena)
+			$(use_with bidi fribidi)
+			$(use_with fontconfig)
+			$(use_with xft freetype)
+			$(use_with gd)
+			--with-gui
+			$(use_with libotf)
+			--with-x
+			$(use_with xft)
+		)
+	else
+		myconf+=(
+			--without-athena
+			--without-fontconfig
+			--without-freetype
+			--without-fribidi
+			--without-gd
+			--without-gui
+			--without-libotf
+			--without-x
+			--without-xft
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml
index b4b71f49542e..2803edba8c37 100644
--- a/dev-libs/m17n-lib/metadata.xml
+++ b/dev-libs/m17n-lib/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name="libotf">Use <pkg>dev-libs/libotf</pkg> to handle OpenType fonts</flag>
 		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
 	</use>
+	<upstream>
+		<remote-id type="savannah-nongnu">m17n</remote-id>
+	</upstream>
 </pkgmetadata>