gentoo resync : 29.05.2018

12 files changed, 637 insertions, 278 deletions

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index fb4dc091738d..21ecdcaca6f7 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,9 +1,14 @@
-AUX 50uim-gentoo.el 113 BLAKE2B ecd49245ef94bad14e4ae7ad3b338b88e800bacb2a8da542420a5492061ccaf98ea5886981c2cf4498db9857afcdca767dfe49d40bdfddb10d8c8e8500119580 SHA512 5bdf2d6ea7203fa171e2183b272f9b1e7dfde990d14fdb13a4abc64a3eaaebb65d0325006451979cff00f6dde8c90d58e4905dbdabe0b5c4b4fa3eb721c01b7a
-AUX uim-1.5.4-zhTW.patch 1034 BLAKE2B 131fe0940d02f1a12984db63ad92190a131c66ee645ff2f39dd79a31ecdf4128f27acd37b8bae8b32667e43c23461c6c620e147e0902ac2e9e6dea2a06b69a63 SHA512 0fb31957a74b49bd2ca335357b8aa177dda4fb90687b8ee4ce86595940d7fd36b82ccaf12850d658dfbf0e7f2e5119dd26ecf9246806d854cf22bde633687aee
-AUX uim-1.6.0-gentoo.patch 381 BLAKE2B 4a9184a9c5e28258691a116c4b7bde8bca200d27e125748834b1ce460be04041065ff025cc8f55d9164b75d37206ab728210a8b28943255dde959ccaa38a33c8 SHA512 c5445c74269aa51a07fc41e5ecc05bc6c4e73527dd6780e13070efa4f9074f5a3eddcd150c38981393cec5d883e73ba55e4b1f3d460aeaf40817ce60c268f417
+AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
+AUX uim-1.8.6-gentoo.patch 618 BLAKE2B 339602558ab7f8d09ef49f9be948f735c6f262961e82d74d22f83a47b9a4072c64d1d197147a168caaa9fbe3fd4b9b1cbc2364576130d400d06cc77551544a75 SHA512 b48d80d26d15956ece6457df32ea35c8ccb2b37cd222699bd35a1cbf40cd6fec14ae424cac17ee91db159a9369a37cc7b8af29c2613d55eb1e82be4e06324d86
 AUX uim-1.8.6-libressl.patch 2041 BLAKE2B d13fc555ce0351b46a08f6fd258a5f222ac104e5107281548a97d2251cfcec89ece8addc2bd5be51f192a854b72701bb9abdc1f97e2c717cd2ae907a088579c1 SHA512 a1af2af13b26b631064165c8f6d6dafaba09d236b489e0e8fd84a7ab6d9c0720a8a91cd9f8baabcc1e640157559fd77f68e18d5e85aaf0c335e25b69e0ef120a
+AUX uim-1.8.6-tinfo.patch 2646 BLAKE2B edb4fde474b7264ed8a4a4db329ac06068ddb68e4b0bb6bd33e011018b5450de8ecc2b94716ca486a8a3b965867ee62eb0b3be2b2e939155a0cc34a02264a7a6 SHA512 34c2df710f0053c40b858369036d2e4bbac6a5da6f81794c3d97f6c58713d14c4bffffda555d9fc10ce2d70406578b2a50c9397b23c008ec4b106aa0a4582338
+AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
+AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
+AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
-EBUILD uim-1.8.6-r1.ebuild 5769 BLAKE2B 141384df6fcbd6b2ebf91889c7316335b1edfa8ef048ae13db71f0ec0dd0d44cf38be7a7440c29e0e20ab8dd560442ba17d3fd60e17dc36de62f283182797fb8 SHA512 aa884381f32be8dd47ec7c74f0dff1d97593b6eede94fb47b8fec7acace65b5d96456765970e58f8c2d8315f5fd33e627c40b650fe3a1da12592af0962864687
-EBUILD uim-1.8.6-r2.ebuild 5877 BLAKE2B 0674d551262472928874bd15b48dc686a7aebf62b3e354681701690a9d1ac939a21cff544bd3f4a43267662028fec12162b3d54a12290edd7121d41304ffbf85 SHA512 c7a9e994ed6d0e365ae68615c9de0864533ad6f578cbd1b7794bd63cf75596aad837b299e8b953e71bc42e114a4bd0e0d965e17edcb42c62ce142a24bf0f443f
-MISC metadata.xml 1064 BLAKE2B 627c105f3c768168368bfa609de02f0fa067902f6975926e50c4b36983f44b34fcd46905d2d59cbda4533e045f8c7dfb1a1c4a58c92ccc78a3217232a6a67b60 SHA512 e265b2bab3338a8cc89b456fbbd46b8a2a1c59f50704e66fe3505e955b75226b786fff3abc061b9c7fe2edb5039fe265d59cf5b4750fd73ad092aafe4b390a56
+DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
+EBUILD uim-1.8.6-r1.ebuild 4976 BLAKE2B e819e53f6112104dcb1d07f56c531ea0bd089e79c976a16dabce298f1655cddc8b95cee460d835e3f9d081012a5603943b25928ae4079dc19f58332f6a696f90 SHA512 384f14cbf35c6f791f16e6d462f032731a9a86c41b82d3aa958bb439e6922ec33af21b7054d56f72843627f47f2958334dfbd2d988c44a0ff61da43af170e1b7
+EBUILD uim-1.8.6-r2.ebuild 5081 BLAKE2B b2e2e6122b8b3ba52444b65e7262fb4d1e44a632295e85575ae38419412a67b0cba40d9933b7b0dd1fb9d4f3d9b6fd2b26a386ea5e5a6ddef5b96ef180c1b49d SHA512 c897f747f5126e59ebc52658d839b6ee5e2136ecdc89f20fbf3fc4d9e55c4868ee04068a57453078801d28ae3c2b6b23c92fa0d4971a85a95c33cad0b069de59
+EBUILD uim-1.8.8.ebuild 5210 BLAKE2B d21cd6233b3d415a7dc4abea701d509deea009672ca51ca14f6fb1772f96f91337beb9929d6442ae03e440311d99bbb8ef00d2525e5bc9c0bf06584e267382f4 SHA512 d8ff76a51500a3a91755c0b6c94047397c04f6f690d57872ffc87cc41c5472fcf130bdfe0803a02e0b4cd8bcdac7e99f5e42bb07766d01fba1eb027b51d6ff6d
+MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/files/50uim-gentoo.el b/app-i18n/uim/files/50uim-gentoo.el
index 350f6216139f..101505c4bd59 100644
--- a/app-i18n/uim/files/50uim-gentoo.el
+++ b/app-i18n/uim/files/50uim-gentoo.el
@@ -1,4 +1,2 @@
-;;; app-i18n/uim site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'uim-mode "uim" nil t)
diff --git a/app-i18n/uim/files/uim-1.6.0-gentoo.patch b/app-i18n/uim/files/uim-1.6.0-gentoo.patch
deleted file mode 100644
index 206a1cdfb1e0..000000000000
--- a/app-i18n/uim/files/uim-1.6.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur uim-1.6.0.orig/configure.ac uim-1.6.0/configure.ac
---- uim-1.6.0.orig/configure.ac	2010-08-02 09:30:14.000000000 +0900
-+++ uim-1.6.0/configure.ac	2010-08-14 08:30:34.000000000 +0900
-@@ -1696,6 +1696,7 @@
- 
-   QT_CONFIG_OPTS="release"
- fi
-+QT_CONFIG_OPTS="$QT_CONFIG_OPTS nostrip"
- 
- AC_ARG_ENABLE(warnings-into-error,
-     AC_HELP_STRING([--enable-warnings-into-error],
diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
new file mode 100644
index 000000000000..0feee5a70997
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,6 +36,7 @@
+ AC_PATH_PROGS(SHA1, sha1 sha1sum)
+ AC_PATH_PROGS(SED, sed gsed)
+ AX_PATH_QMAKE4
++PKG_PROG_PKG_CONFIG
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -1792,7 +1793,7 @@
+   fi
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="debug"
++  QT_CONFIG_OPTS="debug nostrip"
+ else
+   CFLAGS="$CFLAGS -DNDEBUG"
+   CXXFLAGS="$CXXFLAGS -DNDEBUG"
+@@ -1810,7 +1811,7 @@
+   AX_CFLAGS_GCC_OPTION([-Wno-unused-variable],  [SCIM_CFLAGS])
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="release"
++  QT_CONFIG_OPTS="release nostrip"
+ fi
+ 
+ AC_ARG_ENABLE(warnings-into-error,
diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
new file mode 100644
index 000000000000..51105c909f54
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
@@ -0,0 +1,65 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1058,27 +1058,25 @@
+       ;;
+       yes|*)
+         use_uim_fep="yes"
+-	AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-	  [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-	    AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+-	AC_CHECK_FUNCS(forkpty)
+-	if test $ac_cv_func_forkpty = no; then
+-	  AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+-	fi
+-	AC_SUBST(FEP_LIBADD)
+       ;;
+     esac
+   ],
+-  [ use_uim_fep="yes"
+-    AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-      [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-        AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+-    AC_CHECK_FUNCS(forkpty)
+-    if test $ac_cv_func_forkpty = no; then
+-      AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+-    fi
+-    AC_SUBST(FEP_LIBADD)
+-  ])
++  [use_uim_fep="yes"])
++
++if test "x$use_uim_fep" != "xno"; then
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
++    [
++      AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
++        [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
++          AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
++    ])
++  AC_CHECK_FUNCS(forkpty)
++  if test $ac_cv_func_forkpty = no; then
++    AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
++  fi
++  AC_SUBST(FEP_LIBADD)
++fi
+ 
+ AC_ARG_ENABLE(emacs,
+   AC_HELP_STRING([--disable-emacs],
+@@ -1210,10 +1208,14 @@
+     saved_LDFLAGS=$LDFLAGS
+     CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
+     LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
+-    AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
+-        [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
+-            AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
+-            use_libedit="no")])
++    PKG_CHECK_MODULES(CURSES, ncurses,
++        [LIBEDIT_LIBS="$CURSES_LIBS"],
++        [
++            AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
++                [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
++                    AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
++                    use_libedit="no")])
++        ])
+     if test "x$use_libedit" != "xno"; then
+         AC_CHECK_LIB(edit, el_init,
+             [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
diff --git a/app-i18n/uim/files/uim-gentoo.patch b/app-i18n/uim/files/uim-gentoo.patch
new file mode 100644
index 000000000000..de498b754d86
--- /dev/null
+++ b/app-i18n/uim/files/uim-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,7 @@
+ AC_PATH_PROGS(SED, sed gsed)
+ AX_PATH_QMAKE4
+ AX_PATH_QMAKE5
++PKG_PROG_PKG_CONFIG
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -1618,7 +1619,7 @@
+   fi
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="debug"
++  QT_CONFIG_OPTS="debug nostrip"
+ else
+   CFLAGS="$CFLAGS -DNDEBUG"
+   CXXFLAGS="$CXXFLAGS -DNDEBUG"
+@@ -1629,7 +1630,7 @@
+   AX_CFLAGS_GCC_OPTION([-Wno-unused-function], [UIM_SCM_CFLAGS])
+   AX_LANG_WNOERROR  # end AC_LANG_WERROR
+ 
+-  QT_CONFIG_OPTS="release"
++  QT_CONFIG_OPTS="release nostrip"
+ fi
+ 
+ AC_ARG_ENABLE(warnings-into-error,
diff --git a/app-i18n/uim/files/uim-tinfo.patch b/app-i18n/uim/files/uim-tinfo.patch
new file mode 100644
index 000000000000..e2fcfceb3158
--- /dev/null
+++ b/app-i18n/uim/files/uim-tinfo.patch
@@ -0,0 +1,38 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1180,9 +1180,13 @@
+ 
+ if test "x$enable_fep" != xno; then
+   enable_fep=yes
+-  AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-    [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-      AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);enable_fep=no)])
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
++    [
++      AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
++        [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
++          AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);enable_fep=no)])
++    ])
+   AC_CHECK_FUNCS(forkpty)
+   if test "x$ac_cv_func_forkpty" = xno; then
+     AC_CHECK_LIB(util, forkpty,
+@@ -1319,10 +1323,14 @@
+   saved_LDFLAGS=$LDFLAGS
+   CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
+   LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
+-  AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
+-    [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
+-      AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
+-        with_libedit=no)])
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [LIBEDIT_LIBS="$CURSES_LIBS"],
++    [
++      AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
++        [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
++          AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
++            with_libedit=no)])
++    ])
+ 
+   if test "x$with_libedit" != xno; then
+       AC_CHECK_LIB(edit, el_init,
diff --git a/app-i18n/uim/files/uim-1.5.4-zhTW.patch b/app-i18n/uim/files/uim-zh-TW.patch
index 3836a210caa8..f73850013178 100644
--- a/app-i18n/uim/files/uim-1.5.4-zhTW.patch
+++ b/app-i18n/uim/files/uim-zh-TW.patch
@@ -1,6 +1,5 @@
-diff -Naur uim-1.5.4.orig/xim/convdisp.cpp uim-1.5.4/xim/convdisp.cpp
---- uim-1.5.4.orig/xim/convdisp.cpp	2008-02-13 23:43:42.000000000 +0900
-+++ uim-1.5.4/xim/convdisp.cpp	2008-12-10 02:04:35.000000000 +0900
+--- a/xim/convdisp.cpp
++++ b/xim/convdisp.cpp
 @@ -69,7 +69,7 @@
  #endif
  
diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml
index 0e2214531e40..5954a1c59d13 100644
--- a/app-i18n/uim/metadata.xml
+++ b/app-i18n/uim/metadata.xml
@@ -6,17 +6,16 @@
     <name>Cjk</name>
   </maintainer>
   <longdescription lang="en">
-  uim is a simple, secure and flexible input method library.  At the moment
-  Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
-  Pinyin (Chinese input method), Hangul (Korean input method), IPA
-  (International Phonetic Alphabet) are implemented.  You can extend the
-  library with Scheme thus easily, or with C if it becomes rather complicated.
-</longdescription>
+    uim is a simple, secure and flexible input method library.  At the moment
+    Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
+    Pinyin (Chinese input method), Hangul (Korean input method), IPA
+    (International Phonetic Alphabet) are implemented.  You can extend the
+    library with Scheme thus easily, or with C if it becomes rather complicated.
+  </longdescription>
   <use>
-    <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg> input method
-    </flag>
+    <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg></flag>
     <flag name="eb">Enable support for <pkg>dev-libs/eb</pkg></flag>
-    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+    <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
     <flag name="skk">Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag>
   </use>
   <upstream>
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index f72b7d26bba5..84c5fa527ebd 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -1,150 +1,150 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit autotools eutils multilib elisp-common gnome2-utils
+EAPI="6"
 
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="https://github.com/uim/uim/"
-SRC_URI="https://uim.googlecode.com/files/${P}.tar.bz2"
+inherit autotools elisp-common gnome2-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
-IUSE="+anthy canna curl eb emacs expat libffi gtk gtk3 libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
-
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
 RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk2? ( X )
+	qt4? ( X )
+	xft? ( X )"
 
-REQUIRED_USE="gtk? ( X ) qt4? ( X )"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
+CDEPEND="!dev-scheme/sigscheme
+	X? (
 		x11-libs/libICE
 		x11-libs/libSM
+		x11-libs/libX11
 		x11-libs/libXext
+		x11-libs/libXft
 		x11-libs/libXrender
+		x11-libs/libXt
 	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
+	anthy? ( app-i18n/anthy )
 	canna? ( app-i18n/canna )
-	curl? ( >=net-misc/curl-7.16.4 )
+	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
 	emacs? ( virtual/emacs )
 	expat? ( dev-libs/expat )
 	libffi? ( virtual/libffi )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
 	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
 	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
 	qt4? ( dev-qt/qtgui:4[qt3support] )
 	skk? ( app-i18n/skk-jisyo )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0 )
-	!dev-scheme/sigscheme"
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
+	ssl? ( dev-libs/openssl:0 )"
+DEPEND="${CDEPEND}
 	dev-util/intltool
+	sys-devel/gettext
 	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
 	X? ( x11-base/xorg-proto )"
-
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
 	X? (
 		media-fonts/font-sony-misc
-		l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) )
-		l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) )
-		l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) )
+		l10n_ja? (
+			|| (
+				media-fonts/font-jis-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_ko? (
+			|| (
+				media-fonts/font-daewoo-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-CN? (
+			|| (
+				media-fonts/font-isas-misc
+				media-fonts/intlfonts
+			)
+		)
 		l10n_zh-TW? ( media-fonts/intlfonts )
 	)"
-#	test? ( dev-scheme/gauche )
 
-SITEFILE=50${PN}-gentoo.el
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE )
 
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die "sed failed!"
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
 
-	AT_NO_RECURSIVE=1 eautoreconf
+	eautoreconf
 }
 
 src_configure() {
-	local myconf
+	local myconf=(
+		$(use_with X x)
+		$(use_with anthy anthy-utf8)
+		$(use_with canna)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt4 qt4)
+		$(use_with qt4 qt4-immodule)
+		$(use_enable qt4 qt4-qt3support)
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--without-anthy
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--without-prime
+	)
 
-	if (use gtk || use gtk3) && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
+	if (use gtk || use gtk2) && (use anthy || use canna); then
+		myconf+=( --enable-dict )
 	else
-		myconf="${myconf} --disable-dict"
+		myconf+=( --disable-dict )
 	fi
 
-	if use gtk || use gtk3 || use qt4 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
 	fi
 
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
+	if use gtk || use gtk2 || use qt4; then
+		myconf+=( --enable-pref )
 	else
-		myconf="${myconf} --without-anthy"
+		myconf+=( --disable-pref )
 	fi
 
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
-	fi
-
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with curl) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_with expat) \
-		$(use_with libffi ffi) \
-		--disable-gnome-applet \
-		$(use_with gtk gtk2) \
-		$(use_with gtk3) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		--disable-kde4-applet \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_enable qt4 qt4-qt3support) \
-		$(use_with skk) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs static) \
-		$(use_with xft) \
-		${myconf}
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -152,36 +152,31 @@ src_compile() {
 
 	if use emacs; then
 		cd emacs
-		elisp-compile *.el || die "elisp-compile failed!"
+		elisp-compile *.el || die
 	fi
 }
 
 src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	if use emacs; then
-		elisp-install uim-el emacs/*.elc || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
-			|| die "elisp-site-file-install failed!"
-	fi
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
 
-	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die "sed failed!"
 	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/uim.conf"
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
 
-	# collision with dev-scheme/sigscheme, bug #330975
-	# find "${ED}" -name '*gcroots*' -delete || die
-
-	#rmdir "${ED}"/usr/share/doc/sigscheme || die
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+	fi
 }
 
 pkg_postinst() {
-	elog
 	elog "New input method switcher has been introduced. You need to set"
 	elog
 	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
@@ -194,12 +189,7 @@ pkg_postinst() {
 	elog
 	elog "All input methods can be found by running uim-im-switcher-gtk, "
 	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
-	elog
-	elog "If you upgrade from a version of uim older than 1.4.0,"
-	elog "you should run revdep-rebuild."
 
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -209,10 +199,12 @@ pkg_postinst() {
 		elog "Integration with LEIM is not done with this ebuild, please have"
 		elog "a look at the documentation how to achieve this."
 	fi
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 }
 
 pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 }
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index cac96b004b75..ccec49f28693 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -1,46 +1,46 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit autotools eutils multilib elisp-common gnome2-utils
+EAPI="6"
 
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="https://github.com/uim/uim/"
-SRC_URI="https://uim.googlecode.com/files/${P}.tar.bz2"
+inherit autotools elisp-common gnome2-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+anthy canna curl eb emacs expat libffi gtk gtk3 libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
-
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
 RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk2? ( X )
+	qt4? ( X )
+	xft? ( X )"
 
-REQUIRED_USE="gtk? ( X ) qt4? ( X )"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
+CDEPEND="!dev-scheme/sigscheme
+	X? (
 		x11-libs/libICE
 		x11-libs/libSM
+		x11-libs/libX11
 		x11-libs/libXext
+		x11-libs/libXft
 		x11-libs/libXrender
+		x11-libs/libXt
 	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
+	anthy? ( app-i18n/anthy )
 	canna? ( app-i18n/canna )
-	curl? ( >=net-misc/curl-7.16.4 )
+	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
 	emacs? ( virtual/emacs )
 	expat? ( dev-libs/expat )
 	libffi? ( virtual/libffi )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
 	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
 	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
 	qt4? ( dev-qt/qtgui:4[qt3support] )
@@ -49,106 +49,106 @@ RDEPEND="X? (
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
-	)
-	!dev-scheme/sigscheme"
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
+	)"
+DEPEND="${CDEPEND}
 	dev-util/intltool
+	sys-devel/gettext
 	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
 	X? ( x11-base/xorg-proto )"
-
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
 	X? (
 		media-fonts/font-sony-misc
-		l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) )
-		l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) )
-		l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) )
+		l10n_ja? (
+			|| (
+				media-fonts/font-jis-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_ko? (
+			|| (
+				media-fonts/font-daewoo-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-CN? (
+			|| (
+				media-fonts/font-isas-misc
+				media-fonts/intlfonts
+			)
+		)
 		l10n_zh-TW? ( media-fonts/intlfonts )
 	)"
-#	test? ( dev-scheme/gauche )
 
-SITEFILE=50${PN}-gentoo.el
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE )
 
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${P}-libressl.patch
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die "sed failed!"
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
 
-	AT_NO_RECURSIVE=1 eautoreconf
+	eautoreconf
 }
 
 src_configure() {
-	local myconf
+	local myconf=(
+		$(use_with X x)
+		$(use_with anthy anthy-utf8)
+		$(use_with canna)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt4 qt4)
+		$(use_with qt4 qt4-immodule)
+		$(use_enable qt4 qt4-qt3support)
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--without-anthy
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--without-prime
+	)
 
-	if (use gtk || use gtk3) && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
+	if (use gtk || use gtk2) && (use anthy || use canna); then
+		myconf+=( --enable-dict )
 	else
-		myconf="${myconf} --disable-dict"
+		myconf+=( --disable-dict )
 	fi
 
-	if use gtk || use gtk3 || use qt4 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
 	fi
 
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
+	if use gtk || use gtk2 || use qt4; then
+		myconf+=( --enable-pref )
 	else
-		myconf="${myconf} --without-anthy"
-	fi
-
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
+		myconf+=( --disable-pref )
 	fi
 
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with curl) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_with expat) \
-		$(use_with libffi ffi) \
-		--disable-gnome-applet \
-		$(use_with gtk gtk2) \
-		$(use_with gtk3) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		--disable-kde4-applet \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_enable qt4 qt4-qt3support) \
-		$(use_with skk) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs static) \
-		$(use_with xft) \
-		${myconf}
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -156,36 +156,31 @@ src_compile() {
 
 	if use emacs; then
 		cd emacs
-		elisp-compile *.el || die "elisp-compile failed!"
+		elisp-compile *.el || die
 	fi
 }
 
 src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
 
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	if use emacs; then
-		elisp-install uim-el emacs/*.elc || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
-			|| die "elisp-site-file-install failed!"
-	fi
-
-	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die "sed failed!"
 	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/uim.conf"
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
 
-	# collision with dev-scheme/sigscheme, bug #330975
-	# find "${ED}" -name '*gcroots*' -delete || die
-
-	#rmdir "${ED}"/usr/share/doc/sigscheme || die
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+	fi
 }
 
 pkg_postinst() {
-	elog
 	elog "New input method switcher has been introduced. You need to set"
 	elog
 	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
@@ -198,12 +193,7 @@ pkg_postinst() {
 	elog
 	elog "All input methods can be found by running uim-im-switcher-gtk, "
 	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
-	elog
-	elog "If you upgrade from a version of uim older than 1.4.0,"
-	elog "you should run revdep-rebuild."
 
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -213,10 +203,12 @@ pkg_postinst() {
 		elog "Integration with LEIM is not done with this ebuild, please have"
 		elog "a look at the documentation how to achieve this."
 	fi
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 }
 
 pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
 	use emacs && elisp-site-regen
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 }
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
new file mode 100644
index 000000000000..b77ac271174f
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common gnome2-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk2? ( X )
+	qt5? ( X )
+	xft? ( X )"
+
+CDEPEND="!dev-scheme/sigscheme
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+	anthy? ( app-i18n/anthy )
+	canna? ( app-i18n/canna )
+	curl? ( net-misc/curl )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	expat? ( dev-libs/expat )
+	libffi? ( virtual/libffi )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	qt5? ( dev-qt/qtx11extras:5 )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		l10n_ja? (
+			|| (
+				media-fonts/font-jis-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_ko? (
+			|| (
+				media-fonts/font-daewoo-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-CN? (
+			|| (
+				media-fonts/font-isas-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-TW? ( media-fonts/intlfonts )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-tinfo.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE doc )
+
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with X x)
+		$(use_with anthy anthy-utf8)
+		$(use_with canna)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt5)
+		$(use_with qt5 qt5-immodule)
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--without-anthy
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--without-prime
+		--disable-qt4-qt3support
+	)
+
+	if (use gtk || use gtk2) && (use anthy || use canna); then
+		myconf+=( --enable-dict )
+	else
+		myconf+=( --disable-dict )
+	fi
+
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
+	fi
+
+	if use gtk || use gtk2 || use qt5; then
+		myconf+=( --enable-pref )
+	else
+		myconf+=( --disable-pref )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die
+	fi
+}
+
+src_install() {
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	rm -f doc/Makefile*
+	einstalldocs
+
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
+
+	if use X; then
+		docinto xim
+		dodoc xim/README*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+		docinto emacs
+		dodoc emacs/README*
+	fi
+
+	if use ncurses; then
+		docinto fep
+		dodoc fep/README*
+	fi
+}
+
+pkg_postinst() {
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
+
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}