diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-i18n/uim | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-i18n/uim')
-rw-r--r-- | app-i18n/uim/Manifest | 15 | ||||
-rw-r--r-- | app-i18n/uim/files/50uim-gentoo.el | 2 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.8.6-gentoo.patch | 28 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.8.6-libressl.patch | 79 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.8.6-qt.patch | 16 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.8.6-tinfo.patch | 65 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-gentoo.patch | 28 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-tinfo.patch | 38 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-zh-TW.patch | 11 | ||||
-rw-r--r-- | app-i18n/uim/files/xinput-uim | 6 | ||||
-rw-r--r-- | app-i18n/uim/metadata.xml | 24 | ||||
-rw-r--r-- | app-i18n/uim/uim-1.8.6-r1.ebuild | 212 | ||||
-rw-r--r-- | app-i18n/uim/uim-1.8.6-r2.ebuild | 216 | ||||
-rw-r--r-- | app-i18n/uim/uim-1.8.8.ebuild | 228 |
14 files changed, 0 insertions, 968 deletions
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest deleted file mode 100644 index eeb5d4e68437..000000000000 --- a/app-i18n/uim/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -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-qt.patch 755 BLAKE2B dccef1b392e331b230f99f34c3dfc2829a49d5c5a15ac7c41eef201f06e5e6bd5c78ea7a3253b7bbcbbccb77feee7bfae677368cdccc1090c4dd8df26a38a5eb SHA512 ba3b80fe5951e2d508c8fc280038f17523a2de5a0bb136179a486c076aa3dd343112dcc976b2d2e4ae157aaa81682ea85031fcb51682776ecdcdb929f6aceb65 -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 -DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3 -EBUILD uim-1.8.6-r1.ebuild 5052 BLAKE2B 67f7e600a86a2f74ee49def7684bed41182946a6f0591892ef3b79609a5ae0002514ea941eeae6dca13ce93627fce28efbf1c9fb84f3fec805d301a347309edc SHA512 521d6bb0c8e40cf4a8b2a8c7ecbf650bbb24d6143ecfb4fa2e6ab3b0aa1df2d6e243345bb6bee9412c3fd5af8cfe20b88a05fb4ab3e048406ac3f674ac587aab -EBUILD uim-1.8.6-r2.ebuild 5157 BLAKE2B 87909b8657beb68f9148b937ccdbaf97cc515d556fd7bbd97b9c5e08a202d7e3f1b835a0d1394dba7d98236642cf3eb94199ae764f45435cb769961d0b537672 SHA512 405dc2308abd24708c3b4fb68e866b83300a48909d5b60c1c21127235e2a7d69e984fda7e4131774de3c86da1c442cac36010569bf9d573ea89a79ee298522b0 -EBUILD uim-1.8.8.ebuild 5300 BLAKE2B c778627e7f1868b6c8c54133965c24619f8450a5ebcae0f58cc093d6b23f3176fa7e67ac7b1622434a10fa96d1202a1693c81c554514a28f8a4d6221ba0bf36b SHA512 ab7edd45870830ae7a5149a4f69903624dc8ec323cc9274384b50076da2c7375284368690dbd64b1b05cc4f051a25a30760fdda0fcabef0d7980fe28312258e5 -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 deleted file mode 100644 index 101505c4bd59..000000000000 --- a/app-i18n/uim/files/50uim-gentoo.el +++ /dev/null @@ -1,2 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(autoload 'uim-mode "uim" nil t) diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch deleted file mode 100644 index 0feee5a70997..000000000000 --- a/app-i18n/uim/files/uim-1.8.6-gentoo.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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-libressl.patch b/app-i18n/uim/files/uim-1.8.6-libressl.patch deleted file mode 100644 index b14de58433aa..000000000000 --- a/app-i18n/uim/files/uim-1.8.6-libressl.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 7a281b1131399f04627986e6f9a54499b08e239d Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Thu, 21 Apr 2016 23:12:10 +0200 -Subject: [PATCH] Make openssl SSLv2 and SSLv3 support optional - -Fixes compilation with libressl ---- - uim/openssl.c | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -diff --git a/uim/openssl.c b/uim/openssl.c -index ba1b238..35ca1ca 100644 ---- a/uim/openssl.c -+++ b/uim/openssl.c -@@ -208,34 +208,64 @@ c_SSL_write(uim_lisp s_, uim_lisp buf_) - static uim_lisp - c_SSLv2_method(void) - { -+#ifndef OPENSSL_NO_SSL2 - return MAKE_PTR(SSLv2_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv2_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - static uim_lisp - c_SSLv2_server_method(void) - { -+#ifndef OPENSSL_NO_SSL2 - return MAKE_PTR(SSLv2_server_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv2_server_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - static uim_lisp - c_SSLv2_client_method(void) - { -+#ifndef OPENSSL_NO_SSL2 - return MAKE_PTR(SSLv2_client_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv2_client_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - - /* SSLv3 */ - static uim_lisp - c_SSLv3_method(void) - { -+#ifndef OPENSSL_NO_SSL3 - return MAKE_PTR(SSLv3_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv3_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - static uim_lisp - c_SSLv3_server_method(void) - { -+#ifndef OPENSSL_NO_SSL3 - return MAKE_PTR(SSLv3_server_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv3_server_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - static uim_lisp - c_SSLv3_client_method(void) - { -+#ifndef OPENSSL_NO_SSL3 - return MAKE_PTR(SSLv3_client_method()); -+#else -+ uim_notify_fatal(N_("uim-openssl: SSLv3_client_method() is not supported on this system")); -+ return uim_scm_f(); -+#endif - } - - /* SSLv3 but can rollback to v2 */ diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch deleted file mode 100644 index 6c0cb7eee667..000000000000 --- a/app-i18n/uim/files/uim-1.8.6-qt.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/m4/ax_path_qmake4.m4 -+++ b/m4/ax_path_qmake4.m4 -@@ -23,10 +23,10 @@ - # the copyright notice and this notice are preserved. - - AC_DEFUN([AX_PATH_QMAKE4], [ -- ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin" -+ ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin" - AC_PROG_EGREP -- AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"]) -- AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"]) -+ AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"]) -+ AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"]) - - AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [ - ax_cv_path_QMAKE4=no diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch deleted file mode 100644 index 51105c909f54..000000000000 --- a/app-i18n/uim/files/uim-1.8.6-tinfo.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- 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 deleted file mode 100644 index de498b754d86..000000000000 --- a/app-i18n/uim/files/uim-gentoo.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 deleted file mode 100644 index e2fcfceb3158..000000000000 --- a/app-i18n/uim/files/uim-tinfo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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-zh-TW.patch b/app-i18n/uim/files/uim-zh-TW.patch deleted file mode 100644 index f73850013178..000000000000 --- a/app-i18n/uim/files/uim-zh-TW.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/xim/convdisp.cpp -+++ b/xim/convdisp.cpp -@@ -69,7 +69,7 @@ - #endif - - const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"; --const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0"; -+const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0"; - const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0"; - const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0"; - diff --git a/app-i18n/uim/files/xinput-uim b/app-i18n/uim/files/xinput-uim deleted file mode 100644 index a0969dd9f01a..000000000000 --- a/app-i18n/uim/files/xinput-uim +++ /dev/null @@ -1,6 +0,0 @@ -XIM=uim -XIM_PROGRAM="@EPREFIX@/usr/bin/uim-xim" -XIM_ARGS= -GTK_IM_MODULE=uim -QT_IM_MODULE=uim -SHORT_DESC=UIM diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml deleted file mode 100644 index 5954a1c59d13..000000000000 --- a/app-i18n/uim/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <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> - <use> - <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="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> - <remote-id type="github">uim/uim</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild deleted file mode 100644 index af634f34baf1..000000000000 --- a/app-i18n/uim/uim-1.8.6-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools elisp-common gnome2-utils qmake-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="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 )" - -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 ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl: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}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-qt.patch - "${FILESDIR}"/${P}-tinfo.patch - "${FILESDIR}"/${PN}-zh-TW.patch -) -DOCS=( AUTHORS NEWS README RELNOTE ) - -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 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 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 qt4; then - myconf+=( --enable-pref ) - else - myconf+=( --disable-pref ) - fi - - export QT4DIR="$(qt4_get_libdir)" - 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 - 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 emacs; then - elisp-install ${PN}-el emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el - 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-qt4." - - 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 -} diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild deleted file mode 100644 index 8ecd96c02155..000000000000 --- a/app-i18n/uim/uim-1.8.6-r2.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools elisp-common gnome2-utils qmake-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="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 )" - -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 ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - 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}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-libressl.patch - "${FILESDIR}"/${P}-qt.patch - "${FILESDIR}"/${P}-tinfo.patch - "${FILESDIR}"/${PN}-zh-TW.patch -) -DOCS=( AUTHORS NEWS README RELNOTE ) - -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 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 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 qt4; then - myconf+=( --enable-pref ) - else - myconf+=( --disable-pref ) - fi - - export QT4DIR="$(qt4_get_libdir)" - 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 - 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 emacs; then - elisp-install ${PN}-el emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el - 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-qt4." - - 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 -} diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild deleted file mode 100644 index 96c19d017d73..000000000000 --- a/app-i18n/uim/uim-1.8.8.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# 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 - # fix build with >=dev-scheme/chicken-4, bug #656852 - touch scm/json-parser-expanded.scm - - 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 -} |