gentoo resync : 17.07.2021

31 files changed, 53 insertions, 1207 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 4c18c7a76c2f..0134ba0258b4 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index ef7f168d8330..b97a1530239e 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -1,5 +1,5 @@
 AUX 50anthy-gentoo.el 63 BLAKE2B 8680f0a54f0c16a4d869f52d1589c6af39d29c151a5f7e7182f7afb2417aa5ba2fea002d7638271f486f95931036a1e4e4a83af8d796c3b751760d5750adf1d6 SHA512 ca11bd44d092da07278905555513e8b5215413af64c46cfb9213cbd27948727133c06fb1fcfc1a48d67d196c693ed2835e8dbae142a52ff4dbd5ea8d49e6e65a
 AUX anthy-anthy_context_t.patch 174 BLAKE2B 0a38c7a467b5a0331762fa1083c2dffef8f4c39c8bfbf7ce0ec431f6f865dc8727fac391ff77a6a1cf5e455ca274c78b7a6ebf7a2326ba90c6cd979f8e3c7a3f SHA512 3f252628f77f53dd96eac50f08a36bb782f0ddc37446c1bdd5bd94fffa3454b9adcaff7118d76fdc7e8bc3f86b1a84e9830da5b67b2b0d281847b26ff62cdee3
 DIST anthy-9100h.tar.gz 4446148 BLAKE2B b07da205694db9223c22ebcf6158158247611be41448457ee112766d1ea5fe72eee3f2292276363245d751eb49bd582c39330cc6df5e52547b6188386439d29a SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b
-EBUILD anthy-9100h-r2.ebuild 1324 BLAKE2B cbbb511431cc23ac30fcf25dfe17059ad8cf5a7b5de25402ae12afc98cecbaf0c0250904ad583d253076d02873fcbfe20aa9c13fdfbc1d866f75a6017e62ac45 SHA512 f49dee3ff11e0de42712b901dd08dd5283010c96561e7680471ee42f888693b89cb14afa4a63b2949b8c7b5b76dc3cb9fd6c78f3dbf8ccaf329e22a65b0aa520
-MISC metadata.xml 907 BLAKE2B 4192793f866cd1747335aef0bcf556db1e39c80a8dd5661b66887ebd6deb498db52bf86020a426a0828d192dec0a41600cf328af344cad07cd20cf81e77776eb SHA512 1a57ac78da70868dd6580bac2c85b4510e1f4b1db2bb3629c17a16fbf9e44d711a355d3c488479d00a466930d4cce9980803e526f4b574e48a1a5b6e3bd3d24c
+EBUILD anthy-9100h-r3.ebuild 1056 BLAKE2B c81b450a0808bea13587bd39386ba92bf19137594b8da7fa50e8a72fba4b9b1cd884f29b83c7baf158851f7c9e451a30ab8a88401087dd0b0a90b3d5d3798b28 SHA512 61ae32a2b25e0c425b626bcfcacb9b5c18c4ca7608db01f86a1749591cdf01d02ae4eaa31b0422510a915beae536a0b2ac5a671e892dea9cdac06380bfe60a83
+MISC metadata.xml 806 BLAKE2B 53481d14a789c34c69cf56476e7930f57a18982d7ef7e6b1dbe3bdf3cf13a57fad5c2e76e8d1c6202d016b2b8d67c45b0e02ae953dcc90b60056648b34e9ca4e SHA512 ccdd97451f76963242b3698bb6ca76c98ee10110305a4a725289517c53910c9627967f6edb1949a218e4b411fb50b1fcf752be226f831471d5211ed8cdc5f0d7
diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r3.ebuild
index bfd867fdc12f..0a4beeca472b 100644
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit elisp-common
 
@@ -12,30 +12,17 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="canna-2ch emacs static-libs"
+IUSE="emacs static-libs"
 
-BDEPEND="canna-2ch? ( app-dicts/canna-2ch )
-	emacs? ( >=app-editors/emacs-23.1:* )"
+BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND=""
 RDEPEND="${BDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-anthy_context_t.patch"
-)
-
-DOCS=(AUTHORS ChangeLog DIARY NEWS README)
+PATCHES=( "${FILESDIR}/${PN}-anthy_context_t.patch" )
+DOCS=( AUTHORS ChangeLog DIARY NEWS README )
 
 SITEFILE="50${PN}-gentoo.el"
 
-src_prepare() {
-	default
-
-	if use canna-2ch; then
-		einfo "Adding nichan.ctd to anthy.dic"
-		sed -e "/set_input_encoding eucjp/aread ${EPREFIX}/var/lib/canna/dic/canna/nichan.ctd" -i mkworddic/dict.args.in || die
-	fi
-}
-
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
index 7b0ba62c9e0a..794feb3174cc 100644
--- a/app-i18n/anthy/metadata.xml
+++ b/app-i18n/anthy/metadata.xml
@@ -15,9 +15,6 @@
     and <pkg>app-editors/emacs</pkg> (to enable Anthy support for emacs, build
     this package with emacs USE flag).
   </longdescription>
-  <use>
-    <flag name="canna-2ch">Enable support for <pkg>app-dicts/canna-2ch</pkg></flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge-jp">anthy</remote-id>
   </upstream>
diff --git a/app-i18n/canfep/Manifest b/app-i18n/canfep/Manifest
deleted file mode 100644
index 60402fad68aa..000000000000
--- a/app-i18n/canfep/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX canfep-posix-pty.patch 1674 BLAKE2B dfeda6e249501ed6b5a8bd185dbd9df735bd9f0825cf29ff83abdec9b7514f91f0a9eca61a4291a9dd9982262eb92f40db185630b6a89573de364b855ac1097f SHA512 dc02c9fca1e964f04c7fc223fee7935d5e68d25699bb279327904ac2ce042a9cf9fc02e4f1c4e59515c931a6a157861d113e685a8484242b791c367d132d5f7b
-AUX canfep-termcap.patch 6533 BLAKE2B c8e9ffa84390bac88e6ad1fc30e47d237a6fc10d3f8b727a730358faa69d76a24ddb9b1467d695eed691ceb9e1b5558baf12d45178e44b642fb3fc7ff0f9d36d SHA512 7ebaf5745bdc8b1aa1bd07879fe51c3c6410c1475f9e44535bf863f9ab0b7ee6ac0f3dca852c22036ae2ecfababfd976a0c3027ad9d33e3aae7e289c00bd60bc
-DIST canfep-1.0.tar.gz 8067 BLAKE2B 1a6e8af357d2b7aaccf442b0f8bab577ed05a5a0fdf2fb4c189105c2c41f739c2e559e740584bf393fcc52d3f3bd0bb6216e06e2b685f62f7dded9d576e95bed SHA512 0fd7c8ca56282fa537b76fe33f46e03d4f0f4727528ccad95cd4726888372da9158fc8bed2cdc67d645defb479040cd4a4d0999f69d38fd8b4080f7ece4e67d6
-DIST canfep_utf8.diff 7152 BLAKE2B e3848d5119b01d3296c93b5ed8495c6f93ecb1ef39f168d6e1685636055295b8f7277c6b680cadb648fe6847c92e3b038a9b5a9a58f23fe3490dcbe675bcc96f SHA512 32d946b8b78efd3b95736738497fe46a7d0e2383f2b665c8af79270d7b0d1404ca051e63fc67375f0b953b8f604475c8d6b2d683089bc97b098fa9524b89208c
-EBUILD canfep-1.0-r1.ebuild 1030 BLAKE2B 9b7c52e4f3c81cb16b202d4af35dcb18ca074df89f4fd8b8fbc82f3bbd10fb9f3d6b678bd8d08fb20010064dc5a827928c9e4975f8f57b3f2d8c6a7e3543568b SHA512 4ab9f1dae9fcf24bf1f1727c61e82f86d7332165ae3df89d4f160262f95cff748976e268c19c32ec58c6acbcd778143e66ec3b1a9eb72153ca92846639829d99
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/canfep/canfep-1.0-r1.ebuild b/app-i18n/canfep/canfep-1.0-r1.ebuild
deleted file mode 100644
index 4b2531818834..000000000000
--- a/app-i18n/canfep/canfep-1.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
-#HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/${PN}_utf8.diff )"
-
-LICENSE="canfep"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE="unicode"
-
-RDEPEND="app-i18n/canna
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-posix-pty.patch
-	"${FILESDIR}"/${PN}-termcap.patch
-)
-
-src_prepare() {
-	use unicode && eapply "${DISTDIR}"/${PN}_utf8.diff
-	sed -i 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' Makefile
-
-	default
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCXX)" \
-		CFLAGS="${CXXFLAGS}" \
-		LIBS="-lcanna $($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc 00{changes,readme}
-}
diff --git a/app-i18n/canfep/files/canfep-posix-pty.patch b/app-i18n/canfep/files/canfep-posix-pty.patch
deleted file mode 100644
index caa451232ef4..000000000000
--- a/app-i18n/canfep/files/canfep-posix-pty.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=212709
-
-Author: OKUMURA N. Shin-ya <oku.ns@dream.com>
-
---- a/pty.C
-+++ b/pty.C
-@@ -257,6 +257,23 @@
-         }
-     }
- 
-+#if defined(_POSIX_C_SOURCE)
-+    // BSD pty が開けないので、POSIX の方法を試す
-+    if ((master = posix_openpt(O_RDWR)) >= 0) {
-+        if (grantpt(master) == 0 && unlockpt(master) == 0) {
-+            // マスタデバイス名は固定
-+            strcpy(line, "/dev/ptmx");
-+            tcgetattr(0, &tt);
-+            tt.c_iflag &= ~ISTRIP;
-+            ioctl(0, TIOCGWINSZ, (char*) &win);
-+            return;
-+        }
-+        close(master);
-+    } else {
-+        perror("/dev/ptmx");
-+    }
-+#endif  // _POSIX_C_SOURCE
-+
-     printf("Out of pty's\n");
-     fail();
- }
-@@ -265,12 +282,36 @@
- void
- Pty::getslave()
- {
-+#if defined(_POSIX_C_SOURCE)
-+    // マスタデバイスが POSIX 方式の場合
-+    if (strcmp(line, "/dev/ptmx") == 0) {
-+        char *slave_devname = ptsname(master);
-+        if (slave_devname == NULL) {
-+            perror("ptsname");
-+            fail();
-+        }
-+        slave = open(slave_devname, O_RDWR);
-+        if (slave < 0) {
-+            perror(slave_devname);
-+            fail();
-+        }
-+        strcpy(line, slave_devname);
-+    } else {
-+        line[strlen("/dev/")] = 't';
-+        slave = open(line, O_RDWR);
-+        if (slave < 0) {
-+            perror(line);
-+            fail();
-+        }
-+    }
-+#else   // ! _POSIX_C_SOURCE
-     line[strlen("/dev/")] = 't';
-     slave = open(line, O_RDWR);
-     if (slave < 0) {
-         perror(line);
-         fail();
-     }
-+#endif  // _POSIX_C_SOURCE
-     tcsetattr(slave, TCSAFLUSH, &tt);
-     if (!hs)
-         win.ws_row--;
diff --git a/app-i18n/canfep/files/canfep-termcap.patch b/app-i18n/canfep/files/canfep-termcap.patch
deleted file mode 100644
index afd215b07e79..000000000000
--- a/app-i18n/canfep/files/canfep-termcap.patch
+++ /dev/null
@@ -1,266 +0,0 @@
---- a/pty.C
-+++ b/pty.C
-@@ -4,9 +4,18 @@
- int Pty::child = 0;
- struct termios Pty::tt;
- int Pty::wfd = 0;
-+char Pty::buf[] = "";
-+char Pty::funcstr[] = "";
- int Pty::hs = 0;
-+char* Pty::so = 0;
-+char* Pty::se = 0;
-+char* Pty::us = 0;
-+char* Pty::ue = 0;
-+char* Pty::sc = 0;
-+char* Pty::rc = 0;
- char* Pty::ce = 0;
- char* Pty::ts = 0;
-+char* Pty::fs = 0;
- char* Pty::ds = 0;
- char Pty::endstr[] = "";
- char Pty::endmsg[] = "";
-@@ -14,88 +23,7 @@
- // コンストラクタだよん
- Pty::Pty(int ac, char** av, char* amsg, char* emsg)
- {
--    // 環境変数 TERM のエントリを取得
--    char buff[BUFSIZ];
--    char* term = getenv("TERM");
--    if (!term)
--        term = "vt100";
--    int ret = tgetent(buff, term);
--    if (ret != 1) {
--        tgetent(buff, "vt100");
--        putenv("TERM=vt100");
--    }
--
--    // termcap から装飾用のエントリを取ってくる
--    char funcstr[BUFSIZ];
--    char* pt = funcstr;
--
--    // スタンドアウト (反転)
--    so = tgetstr("so", &pt);
--    adjstr(so);
--    se = tgetstr("se", &pt);
--    adjstr(se);
--
--    // アンダーライン (下線)
--    us = tgetstr("us", &pt);
--    adjstr(us);
--    ue = tgetstr("ue", &pt);
--    adjstr(ue);
--
--    // カーソル位置の保存，保存した位置への復帰
--    sc = tgetstr("sc", &pt);
--    adjstr(sc);
--    rc = tgetstr("rc", &pt);
--    adjstr(rc);
--
--    // カーソル位置から行の最後までを削除する
--    ce = tgetstr("ce", &pt);
--    adjstr(ce);
--
--    // ステータスラインを持っているかどうか
--    hs = tgetflag("hs");
--
--    // kon と jfbterm ではステータスラインを使わない
--    if (strcmp(term, "kon") == 0)
--        hs = 0;
--    if (strcmp(term, "jfbterm") == 0)
--        hs = 0;
--
--    // ステータスラインへ移動，戻る
--    if (hs) {
--        ts = tgoto(tgetstr("ts", &pt), 0, 0);
--        adjstr(ts);
--        fs = tgetstr("fs", &pt);
--        adjstr(fs);
--        ds = tgetstr("ds", &pt);
--        adjstr(ds);
--        if (ds) {
--            strcat(endstr, ds);
--            strcat(endstr, ce);
--        }
--    }
--    else {
--        char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
--        adjstr(cs);
--        if (cs) {
--            write(1, ce, strlen(ce));
--            write(1, cs, strlen(cs));
--        }
--        char* cl = tgetstr("cl", &pt);
--        adjstr(cl);
--        if (cl) {
--            write(1, cl, strlen(cl));
--            strcat(endstr, cl);
--        }
--        ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
--        adjstr(ds);
--        if (ds) {
--            strcat(endstr, ds);
--            strcat(endstr, ce);
--        }
--        ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
--        adjstr(ts);
--        fs = rc;
--    }
-+    gettermcap();
- 
-     // 開始と終了のメッセージ
-     if (amsg && ac == 1)
-@@ -209,21 +137,75 @@
-     done();
- }
- 
--// termcap エントリからパディングを削除する
- void
--Pty::adjstr(char* str)
-+Pty::gettermcap()
- {
--    char* sp = strdup(str);
--    char* p = sp;
--    while (*p != '\0') {
--        if (strncmp(p, "$<", 2) == 0) {
--            while (*p != '>')
--                p++;
--            *p = '\0';
-+    // 環境変数 TERM のエントリを取得
-+    char* term = getenv("TERM");
-+    if (!term)
-+        term = "vt100";
-+    int ret = tgetent(buf, term);
-+    if (ret != 1) {
-+        tgetent(buf, "vt100");
-+        putenv("TERM=vt100");
-+    }
-+
-+    // termcap から装飾用のエントリを取ってくる
-+    char* pt = funcstr;
-+
-+    // スタンドアウト (反転)
-+    so = tgetstr("so", &pt);
-+    se = tgetstr("se", &pt);
-+
-+    // アンダーライン (下線)
-+    us = tgetstr("us", &pt);
-+    ue = tgetstr("ue", &pt);
-+
-+    // カーソル位置の保存，保存した位置への復帰
-+    sc = tgetstr("sc", &pt);
-+    rc = tgetstr("rc", &pt);
-+
-+    // カーソル位置から行の最後までを削除する
-+    ce = tgetstr("ce", &pt);
-+
-+    // ステータスラインを持っているかどうか
-+    hs = tgetflag("hs");
-+
-+    // kon と jfbterm ではステータスラインを使わない
-+    if (strcmp(term, "kon") == 0)
-+        hs = 0;
-+    if (strcmp(term, "jfbterm") == 0)
-+        hs = 0;
-+
-+    // ステータスラインへ移動，戻る
-+    if (hs) {
-+        ts = tgoto(tgetstr("ts", &pt), 0, 0);
-+        fs = tgetstr("fs", &pt);
-+        ds = tgetstr("ds", &pt);
-+        if (ds) {
-+            strcat(endstr, ds);
-+            strcat(endstr, ce);
-         }
--        *str++ = *p++;
-     }
--    free(sp);
-+    else {
-+        char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
-+        if (cs) {
-+            write(1, ce, strlen(ce));
-+            write(1, cs, strlen(cs));
-+        }
-+        char* cl = tgetstr("cl", &pt);
-+        if (cl) {
-+            write(1, cl, strlen(cl));
-+            strcat(endstr, cl);
-+        }
-+        ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
-+        if (ds) {
-+            strcat(endstr, ds);
-+            strcat(endstr, ce);
-+        }
-+        ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
-+        fs = rc;
-+    }
- }
- 
- // マスタデバイスを取る
-@@ -327,34 +309,7 @@
- {
-     signal(SIGWINCH, SIG_IGN);
- 
--    // ステータスラインが使えない場合は cs/ds/ts を取り直す
--    if (!hs) {
--        char buff[BUFSIZ];
--        char* term = getenv("TERM");
--        tgetent(buff, term);
--        char funcstr[BUFSIZ];
--        char* pt = funcstr;
--        char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
--        adjstr(cs);
--        if (cs) {
--            write(1, ce, strlen(ce));
--            write(1, cs, strlen(cs));
--        }
--        char* cl = tgetstr("cl", &pt);
--        adjstr(cl);
--        if (cl) {
--            write(1, cl, strlen(cl));
--            strcpy(endstr, cl);
--        }
--        ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
--        adjstr(ds);
--        if (ds) {
--            strcat(endstr, ds);
--            strcat(endstr, ce);
--        }
--        ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
--        adjstr(ts);
--    }
-+    gettermcap();
- 
-     // ウィンドウのサイズを設定し直す (stty -a の 行数/桁数 等)
-     struct winsize win;
---- a/pty.H
-+++ b/pty.H
-@@ -50,18 +50,21 @@
-     int rfd;
-     static int wfd;
- private:
--    static void adjstr(char* str);
-+    static char buf[BUFSIZ];
-+    static char funcstr[BUFSIZ];
-+private:
-+    static void gettermcap();
- protected:
-     static int hs;
--    char* so;
--    char* se;
--    char* us;
--    char* ue;
--    char* sc;
--    char* rc;
-+    static char* so;
-+    static char* se;
-+    static char* us;
-+    static char* ue;
-+    static char* sc;
-+    static char* rc;
-     static char* ce;
-     static char* ts;
--    char* fs;
-+    static char* fs;
-     static char* ds;
- private:
-     static void finish();
diff --git a/app-i18n/canfep/metadata.xml b/app-i18n/canfep/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-i18n/canfep/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
deleted file mode 100644
index b7d838aea8f9..000000000000
--- a/app-i18n/canna/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX canna-Wformat-security.patch 4545 BLAKE2B 796bd97f2b9af03a63c13cde02d59eda227b0b7ba51238de9780057447fd23bd42290e07d1585804e5141ef754919ddc10e908296a7ca8fcbf47366989196c34 SHA512 7c2649d98b5eac8d625586b245fff7e07b19616395e754a59443d7858e818f3651fb5e03e97ebcacb5ff4b2c1cb0f0c45aa0838ae85350e0c24906faa3a36102
-AUX canna-Wformat.patch 340 BLAKE2B b9b31b256ae43dc8ec4e1589bef9c6f221e4e8d4a8532ac7cb6e20ff58806b73b7009c30d83656c879b243fce674263e0b6f1077a8e30595704230cebaf71dd4 SHA512 38b2cc703ff69f29352b1c2bc4bc01c3387edaada98f724344525c68ee5a8ae1490ba0ce84fac53b00ca89b7cab201640631638ee578fb00211cc59d4d968bcd
-AUX canna-canuum.patch 779 BLAKE2B a27f98b535846fb387cb9946319a52c7b5fb22feb19bdc2f3f8860066234459ae66b643d298bdef821edc3c918956941dab6a8770b81e141a5709cda89d7b980 SHA512 62005fe564b7c6cb627c10af136e4ad15bfd6f2d17cd71093ae34b9e7f7f47c582ff5c32fadf5068fdaa5c685dd2b898cccb71ccd86b19b429e34f57c290cdd6
-AUX canna-gentoo.patch 4310 BLAKE2B 8386af1ba3b2c6c2a420246c6de5f218c92553c3569fb47bf275682570ca877c7e0d8cd61c36537218cca77f60421d7ccf460615ff957e54d9488f1df2789cd4 SHA512 31d893ba6fe873d1b9ceb5106c87d027b31013e049ed673d14e7f32232bf259b44a1fa397c133fa0b5a39252a61d400d4d1951a4448e4aaffad649f648652e6b
-AUX canna-kpdef.patch 202 BLAKE2B 44c443da25ac63ad7a418378df55c490c3f288c0ccbb6803fd6d7f2fcd764dca32650f484ec8a5267ca0d8db0349f3736e974a44e7ab0eeebee32a4a5603f3f1 SHA512 f258be22226109b63df7e2aae3a42fb42d13d9f3ca4b92ad9a15f477ac0a4906bf5af3065f4ebfc69a49165073451f310a6b8c43ad57cb772d9af6ece74a50df
-AUX canna-overflow.patch 788 BLAKE2B bd71eafb119ce107540ae4de355755e7e575ee8d197414e24831f6025d2445395a816a7b3c1a9824e5f9d6cc1b732389551abebbb706cfeeac17c1d61275f83a SHA512 7caaf95c9e01277247036488e3f154abca6e7811e17a2c7d1dd34f3a1906ee780ed2cd03a0435d051098d99521b55350d3332e218cebfdebf2391e1f38da541c
-AUX canna-posix-sort.patch 282 BLAKE2B f13360695b7209d1865494438ffc9f5e246173bc82a578ca2e2790072e338c59dd6dc762993624514337cf6d9001020fbf093307ea8c5ea408ae5d911649cc09 SHA512 310b16878d8f2fb0fa35d45ac43709186a70a36d4fba86abe78a6ccc7df410ddba38f7113effa69da4a5afe1ecf9d81175d285338e59793fee352eca93069d5d
-AUX canna.confd 129 BLAKE2B aef79cdd496fbf5a13929a8fa1b08b65ab15e15c9ce690d5f345372e6e5e15cf54b96ce851a564ba4a64613976630b4cc828fd0c9ec4d24f4e0305bc23eab3eb SHA512 401fdca224f3ab85ceff0786865efdda01c121481f9f084c3983f806d5e5543b706a844676d65529fd06a19d264877499c01c1ecc2b4a7dcb94e686c20d34a41
-AUX canna.hosts 5 BLAKE2B a10fe2813bf946464641605e8cdda362629a62817de0a7f72f2b0e54963d3370ebd8d9fa9db28753d1e0567d78c0e5c830c1e13db54e4eea562276263da9fda8 SHA512 88cabd1d372defd4bed25c23bafa0a883b13c1184be0287717df6a0946de0d39b73cdbda3660432f787cded46b57bd187106b12969e960760a9cc2db76e5b497
-AUX canna.initd 782 BLAKE2B 1e34cfc3ed28f5903600f591e55d0eb559aa5336eee54a54a7ab40d2be3816f6a62a947e9c87d4834425f71640c96847836830439f4eeb76a4f25a372fc9d1d0 SHA512 1fd348f2aa4139bbe6154b157b75bf8a39a8ddf36a9a072088279c88241981a9af9024df71aa777ca4e93270d53d0bea8363b31cfb07d229d4a37c48828779e6
-AUX update-canna-dics_dir 1101 BLAKE2B 9b429c2ddfb0e3c2c8a754f7fb61b776abbb809f81c93127e5f8be9ec768df6c28fcce75fe69a5b92a195ce49e20572c083aca5b4309f042a50b53bffafc4042 SHA512 135fdabf3995ddf82d3f14aece908e952f3d514fd83e2f86d8113b1026b7dcaea2156225be251a6d9a74a35ee075d5ebb32c05d9deb85905120287d0af1f4207
-DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
-EBUILD canna-3.7_p3-r4.ebuild 3336 BLAKE2B b2ff41c2a285a79be1c643d7e79275967684c609484beb5fb45f31b99d2a4dca47b908aa87b281d9def01914869935ab0eeee650833da435c21b99c1b99df5d9 SHA512 e93ffdf2f98e97ce5dfb0704daad8389576e81ec7c1d1706a7711185e9548b8dd2206642a03f07d250db96e3e6b8a66796c82eb111b366c87f62b0ea1a5671db
-MISC metadata.xml 383 BLAKE2B 2947ceefe007eb9bcfd46a69a4b97a2406383931cb320cb594b96952697378147824461f1b55d5caddc419b19aebeb1c5ce69c0f0d31568cbbbe3d1d15fba9ba SHA512 8affc10d697147ea5430d73c40eb4e7621ee9a06d444725566d4e16a28ccab4f53aed3025905894fe6cba0ea874dcf0d2d583d3dcedf3a0ccc8b139af02e5e98
diff --git a/app-i18n/canna/canna-3.7_p3-r4.ebuild b/app-i18n/canna/canna-3.7_p3-r4.ebuild
deleted file mode 100644
index a5e3cf174d49..000000000000
--- a/app-i18n/canna/canna-3.7_p3-r4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools cannadic toolchain-funcs
-
-MY_P="Canna${PV//[._]/}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="canuum doc ipv6"
-
-RDEPEND="
-	canuum? (
-		dev-libs/libspt
-		sys-libs/ncurses:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	x11-misc/gccmakedep
-	x11-misc/imake
-	canuum? ( virtual/pkgconfig )
-	doc? (
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-langjapanese
-		dev-texlive/texlive-latexrecommended
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-canuum.patch
-	"${FILESDIR}"/${PN}-kpdef.patch
-	"${FILESDIR}"/${PN}-overflow.patch
-	"${FILESDIR}"/${PN}-posix-sort.patch
-	"${FILESDIR}"/${PN}-Wformat.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
-		-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
-		${PN^c}.conf || die
-
-	if use canuum; then
-		cd canuum || die
-		mv configure.{in,ac} || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	xmkmf -a || die
-
-	if use canuum; then
-		pushd canuum >/dev/null || die
-		xmkmf -a || die
-		# workaround for sys-libs/ncurses[tinfo]
-		sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs ncurses):" Makefile || die
-		popd >/dev/null || die
-	fi
-
-	if use doc; then
-		pushd doc/man/guide/tex >/dev/null || die
-		xmkmf -a || die
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	# bug #279706
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-		canna
-
-	if use canuum; then
-		einfo "Compiling canuum"
-		emake -C canuum -j1 \
-			CC="$(tc-getCC)" \
-			CDEBUGFLAGS="${CFLAGS}" \
-			LOCAL_LDFLAGS="${LDFLAGS}" \
-			canuum
-	fi
-
-	if use doc; then
-		# NOTE: build fails if infinality enabled in fontconfig
-		einfo "Compiling DVI, PS, and PDF documents"
-		# bug #223077
-		emake -C doc/man/guide/tex -j1 \
-			JLATEXCMD="platex -kanji=euc" \
-			DVI2PSCMD="dvips" \
-			VARTEXFONTS="${T}"/fonts \
-			canna.ps \
-			canna.pdf
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man
-	einstalldocs
-	dodoc *CHANGES* INSTALL* RKCCONF* WHATIS*
-
-	if use canuum; then
-		emake -C canuum DESTDIR="${D}" install install.man
-		docinto canuum
-		dodoc README.jp
-	fi
-
-	if use doc; then
-		dodoc doc/man/guide/tex/canna.{dvi,ps,pdf}
-	fi
-
-	# for backward compatibility
-	dosbin "${FILESDIR}"/update-canna-dics_dir
-
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners bin:bin /var/lib/canna/dic/{user,group}
-	fperms 0775 /var/lib/canna/dic/{user,group}
-
-	insinto /var/lib/canna/dic/dics.d
-	newins "${ED}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
-
-	keepdir /var/log/canna
-
-	newconfd "${FILESDIR}"/canna.confd canna
-	newinitd "${FILESDIR}"/canna.initd canna
-
-	insinto /etc
-	newins "${FILESDIR}"/canna.hosts hosts.canna
-}
-
-pkg_postinst() {
-	update-cannadic-dir
-
-	if ! locale -a | grep -iq "ja_JP.eucjp"; then
-		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
-		elog
-		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> ${EROOT}/etc/locale.gen"
-		elog "# locale-gen"
-		elog
-	fi
-}
diff --git a/app-i18n/canna/files/canna-Wformat-security.patch b/app-i18n/canna/files/canna-Wformat-security.patch
deleted file mode 100644
index c83552b5cba5..000000000000
--- a/app-i18n/canna/files/canna-Wformat-security.patch
+++ /dev/null
@@ -1,199 +0,0 @@
---- a/cmd/catdic/can.c
-+++ b/cmd/catdic/can.c
-@@ -1236,7 +1236,7 @@
- 	break;
-       default:
- 	if (init[0] == '/') {
--	    (void)fprintf(stderr,msg_abnl);
-+	    (void)fprintf(stderr,"%s",msg_abnl);
- 	} else {
- 	    (void)fprintf(stderr,msg_abnls,init);
- 	}
-@@ -1297,11 +1297,11 @@
- 
-     if ( opt_fq ) {
-       if ( opt_s ) {
--        (void) fprintf(stderr,msg_sfq);
-+        (void) fprintf(stderr,"%s",msg_sfq);
-         exit(ERR_VALUE) ;
-       }  
-       if ( opt_l || opt_std ) {
--        (void) fprintf(stderr,msg_l);
-+        (void) fprintf(stderr,"%s",msg_l);
-         exit(ERR_VALUE) ;
-       }
-       mode = mode | PL_DIC ;
-@@ -1491,7 +1491,7 @@
-     break;
-   default:
-     if(init[0] == '/') {
--      fprintf(stderr,msg_abnl );
-+      fprintf(stderr,"%s",msg_abnl );
-     }
-     else {
-       fprintf(stderr,msg_abnls,init);
---- a/cmd/catdic/rutil.c
-+++ b/cmd/catdic/rutil.c
-@@ -271,7 +271,7 @@
- 	 "Dictionary \"%s\" does not exist.\n"), dicname);
-     break;
-   case NOTALC :
--    (void)fprintf(stderr, msg_mem);
-+    (void)fprintf(stderr, "%s", msg_mem);
-     break;
-   case BADF :
-     (void)fprintf(stderr, gettxt("cannacmd:196",
-@@ -297,7 +297,7 @@
- 	(void)fprintf(stderr,msg_abnls,init);
-     }
-     else {
--	(void)fprintf(stderr,msg_abnl);
-+	(void)fprintf(stderr,"%s",msg_abnl);
-     }
-     break;
-   }
-@@ -321,7 +321,7 @@
- 	(void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     ret = -1;
-     return ret;
-@@ -332,13 +332,13 @@
- 	  (void)fprintf(stderr, msg_mnts, init);
-       }
-       else {
--	  (void)fprintf(stderr, msg_mnt);
-+	  (void)fprintf(stderr, "%s", msg_mnt);
-       }
-       ret = -1;
-       return ret;
-     }
-     if ((mode & PL_DIC) == PL_DIC ) {
--      (void)fprintf(stderr,msg_fq);
-+      (void)fprintf(stderr,"%s",msg_fq);
-       ret = -1 ;
-       return ret ;
-     }
-@@ -359,7 +359,7 @@
-     ret = 0;
-     break;
-   case NOTALC :
--    (void)fprintf(stderr, msg_mem);
-+    (void)fprintf(stderr, "%s", msg_mem);
-     ret = -1;
-     break;
-   case BADF :
-@@ -421,7 +421,7 @@
-     ret = -1;
-     break;
-   case BADCONT :
--    (void)fprintf(stderr,msg_cnt);
-+    (void)fprintf(stderr,"%s",msg_cnt);
-     ret = -1;
-     break;
-   default:
-@@ -429,7 +429,7 @@
-       (void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     exit(ERR_VALUE);
-     break;
-@@ -448,7 +448,7 @@
-     ret = 0;
-     break;
-   case NOTALC :
--    (void)fprintf(stderr, msg_mem);
-+    (void)fprintf(stderr, "%s", msg_mem);
-     ret = -1;
-     break;
-   case BADF :
-@@ -509,11 +509,11 @@
-     ret = -1;
-     break;
-   case BADARG :
--    (void)fprintf(stderr,msg_fq);
-+    (void)fprintf(stderr,"%s",msg_fq);
-     ret = -1;
-     break;
-   case BADCONT :
--    (void)fprintf(stderr,msg_cnt);
-+    (void)fprintf(stderr,"%s",msg_cnt);
-     ret = -1;
-     break;
-   case NOENT  :   /* 91.12.03 */
-@@ -526,7 +526,7 @@
-       (void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     exit(ERR_VALUE);
-     break;
-@@ -556,7 +556,7 @@
-       (void)fprintf(stderr, msg_abnls,init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     ret = -1;
-     return ret;
-@@ -567,13 +567,13 @@
- 	(void)fprintf(stderr, msg_mnts, init);
-       }
-       else {
--	  (void)fprintf(stderr, msg_mnt);
-+	  (void)fprintf(stderr, "%s", msg_mnt);
-       }
-       ret = -1;
-       return ret;
-     }
-     if ((mode & PL_DIC) == PL_DIC ) {
--      (void)fprintf(stderr, msg_fq);
-+      (void)fprintf(stderr, "%s", msg_fq);
-       ret = -1 ;
-       return ret ;
-     }
-@@ -608,7 +608,7 @@
-     ret = -2;   /* 93.03.03 */
-     break;
-   case BADCONT :
--    (void)fprintf(stderr, msg_cnt);
-+    (void)fprintf(stderr, "%s", msg_cnt);
-     ret = -1;
-     break;
-   default:
-@@ -616,7 +616,7 @@
- 	(void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     ret = -1;
-     break;
-@@ -651,7 +651,7 @@
-     ret = -2;   /* 93.03.03 */
-     break;
-   case BADCONT :
--    (void)fprintf(stderr, msg_cnt);
-+    (void)fprintf(stderr, "%s", msg_cnt);
-     ret = -1;
-     break;
-   default:
-@@ -659,7 +659,7 @@
- 	(void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     ret = -1;
-     break;
diff --git a/app-i18n/canna/files/canna-Wformat.patch b/app-i18n/canna/files/canna-Wformat.patch
deleted file mode 100644
index a8f5aa37163e..000000000000
--- a/app-i18n/canna/files/canna-Wformat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/man/guide/tex/cannaindex.c
-+++ b/doc/man/guide/tex/cannaindex.c
-@@ -198,7 +198,7 @@
-   }
-   inf = fopen(argv[1], "r");
-   if (!inf) {
--    fprintf(stderr, "%s: Can not open file \"%s\".\n", argv[1]);
-+    fprintf(stderr, "%s: Can not open file \"%s\".\n", program, argv[1]);
-     exit(1);
-   }
-   pages = readindex(inf, entries);
diff --git a/app-i18n/canna/files/canna-canuum.patch b/app-i18n/canna/files/canna-canuum.patch
deleted file mode 100644
index 293ffbb54c90..000000000000
--- a/app-i18n/canna/files/canna-canuum.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/canuum/configure.in
-+++ b/canuum/configure.in
-@@ -401,7 +401,7 @@
- dnl
- olibs="$LIBS"
- AC_MSG_CHECKING(--with-term-libs argument)
--AC_ARG_WITH(tlib,
-+AC_ARG_WITH(term-libs,
- [  --with-term-libs=-lLIB    terminal library to be used ],)
- if test -n "$with_term_libs"; then
-   AC_MSG_RESULT($with_term_libs)
---- a/canuum/wnn_config.h
-+++ b/canuum/wnn_config.h
-@@ -149,8 +149,8 @@
- #define TTY_KCODE J_EUJIS
- #define PTY_KCODE J_EUJIS
- # else /* !DGUX */
--#define TTY_KCODE J_JIS
--#define PTY_KCODE J_JIS
-+#define TTY_KCODE J_EUJIS
-+#define PTY_KCODE J_EUJIS
- # endif
- #endif
- 
---- a/canuum/wnn_os.h
-+++ b/canuum/wnn_os.h
-@@ -41,6 +41,7 @@
- #include <signal.h>
- #if STDC_HEADERS
- #  include <stdlib.h>
-+#  include <string.h>
- #  include <limits.h>
- #endif /* STDC_HEADERS */
- 
diff --git a/app-i18n/canna/files/canna-gentoo.patch b/app-i18n/canna/files/canna-gentoo.patch
deleted file mode 100644
index 7ecfb4b9cd84..000000000000
--- a/app-i18n/canna/files/canna-gentoo.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/Canna.conf
-+++ b/Canna.conf
-@@ -109,12 +109,12 @@
- # define DefErrDir $(cannaPrefix)/log
- # define DefLibCannaDir $(cannaExecPrefix)/lib
- #else 
--# define DefCannaPrefix /usr/local/canna
-+# define DefCannaPrefix $(EPREFIX)/usr
- # ifdef ObsoleteInstallDir
- #  define DefErrDir /usr/spool/canna
- #  define DefLibCannaDir /usr/lib
- # else
--#  define DefErrDir /var/log
-+#  define DefErrDir $(EPREFIX)/var/log/$(PN)
- #  define DefLibCannaDir $(cannaExecPrefix)/lib
- # endif
- #endif
-@@ -123,7 +123,7 @@
- # define DefCannaLibDir $(cannaPrefix)/lib
- #else
- # define DefCannaSrvDir $(cannaExecPrefix)/sbin
--# define DefCannaLibDir $(cannaPrefix)/share/canna
-+# define DefCannaLibDir $(cannaPrefix)/share/$(PN)
- #endif
- 
- #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \
-@@ -147,9 +147,11 @@
- XCOMM cannaLibDir = /var/lib/canna
- XCOMM cannaLibDir = /var/db/canna
- cannaLibDir = DefCannaLibDir
--XCOMM cannaManDir = $(cannaPrefix)/share/man
--cannaManDir = $(cannaPrefix)/man
--cannaIncDir = $(cannaPrefix)/include/canna
-+cannaManDir = $(cannaPrefix)/share/man
-+XCOMM cannaManDir = $(cannaPrefix)/man
-+cannaIncDir = $(cannaPrefix)/include/$(PN)
-+cannaShareDir = $(cannaPrefix)/share/$(PN)
-+cannaDocDir = $(cannaPrefix)/share/doc/$(PF)
- 
- libCannaDir = DefLibCannaDir
- ErrDir  = DefErrDir
-@@ -237,7 +239,7 @@
- /* #define UseInstalledLibCanna YES */
- #define UseInstalledLibCanna NO
- 
--DicDir   = $(cannaLibDir)/dic
-+DicDir   = $(EPREFIX)/var/lib/$(PN)/dic
- 
- /* ここから下は変更不要です */
- 
---- a/Imakefile
-+++ b/Imakefile
-@@ -87,6 +87,7 @@
- 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
- 	 echo "/* for lib/canna */";\
- 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
-+	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
- 	 echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
- 	 echo "/* for scripts */";\
- 	 echo "#define CANNABINDIR $(cannaBinDir)"; \
---- a/dic/phono/Imakefile
-+++ b/dic/phono/Imakefile
-@@ -27,9 +27,10 @@
- 
-        ROMAJI_DIC_DEF = -DSHIFT
- 
--               DICDIR = $(cannaLibDir)/dic
--            SAMPLEDIR = $(cannaLibDir)/sample
--         SAMPLESRCDIR = $(cannaLibDir)/sample/src
-+               DICDIR = $(DicDir)
-+        CANNASHAREDIR = $(cannaShareDir)
-+            SAMPLEDIR = $(cannaDocDir)/sample
-+         SAMPLESRCDIR = $(cannaDocDir)/sample/src
- 
-     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
-             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
-@@ -69,7 +70,7 @@
- MakeDirectories(install,$(DICDIR))
- MakeDirectories(install,$(SAMPLESRCDIR))
- 
--InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
-+InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
- 
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
---- a/lib/canna/romaji.c
-+++ b/lib/canna/romaji.c
-@@ -427,7 +427,6 @@
- 	}
-       }
-       
--#if 0 /* currently CANNASHAREDDIR is not defined */
-       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
-         extern jrUserInfoStruct *uinfo;
- 	
-@@ -450,7 +449,6 @@
- 	  }
- 	}
-       }
--#endif
-       
-       if (retval == (struct RkRxDic *)NULL) { /* 全部オープンできない */
- 	sprintf(rdic, 
---- a/misc/Imakefile
-+++ b/misc/Imakefile
-@@ -48,7 +48,7 @@
- MakeLintLibSubdirs($(SUBDIRS))
- MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
- 
--MakeDirectories(install,$(cannaLibDir)/sample/src)
-+MakeDirectories(install,$(cannaDocDir)/sample/src)
- 
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- default.canna: default.ca
-@@ -58,8 +58,8 @@
- 	$(CP) default.ca default.canna
- #endif
- 
- InstallNonExec(default.canna,$(cannaLibDir))
--InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-+InstallNonExec(is.c,$(cannaDocDir)/sample/src)
- 
- clean::
- 	$(RM) $(PROGRAMS)
---- a/misc/initfiles/Imakefile
-+++ b/misc/initfiles/Imakefile
-@@ -6,7 +6,7 @@
- #endif
- 
-             CANNAROOT = ../..
--            SAMPLEDIR = $(cannaLibDir)/sample
-+            SAMPLEDIR = $(cannaDocDir)/sample
- 
- all::
- 
---- a/server/Imakefile
-+++ b/server/Imakefile
-@@ -6,7 +6,7 @@
- #ifdef __EMX__
-          INSTFLAGS = $(INSTUGIDFLAGS)
- #else
--         INSTFLAGS = -s $(INSTUGIDFLAGS)
-+         INSTFLAGS = $(INSTUGIDFLAGS)
- #endif
-            DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
-           INCLUDES = -I$(CANNAROOT)/include
diff --git a/app-i18n/canna/files/canna-kpdef.patch b/app-i18n/canna/files/canna-kpdef.patch
deleted file mode 100644
index b0b71b4442c8..000000000000
--- a/app-i18n/canna/files/canna-kpdef.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/dic/phono/default.kpdef
-+++ b/dic/phono/default.kpdef
-@@ -350,3 +350,15 @@
- _	＿
- /	／
- \\	￥
-+
-+# some useful romkan symbols
-+z,	‥
-+z-	〜
-+z.	…
-+z/	・
-+z[	『
-+z]	』
-+zh	←
-+zj	↓
-+zk	↑
-+zl	→
diff --git a/app-i18n/canna/files/canna-overflow.patch b/app-i18n/canna/files/canna-overflow.patch
deleted file mode 100644
index ef3b6ad1b95d..000000000000
--- a/app-i18n/canna/files/canna-overflow.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmd/catdic/rutil.c
-+++ b/cmd/catdic/rutil.c
-@@ -384,7 +384,7 @@
- 	(void)fprintf(stderr,gettxt("cannacmd:205", 
-     "Specified dictionary \"%s\" already exists. Do you overwrite it ? (y/n)"),
- 		      dicname);
--	fgets(ans,80,stdin);
-+	fgets(ans,sizeof(ans),stdin);
-     } else {
- 	(void)fprintf(stderr,gettxt("cannacmd:206", 
- 	    "Specified dictionary \"%s\" already exists."),dicname);
-@@ -474,7 +474,7 @@
-     if (isatty(fileno(stdin)) != 0) {
- 	(void)fprintf(stderr,gettxt("cannacmd:216", 
- "Personal learning file of dictionary \"%s\" exists. Do you overwrite it ? (y/n)"),dicname);
--	fgets(ans,80,stdin);
-+	fgets(ans,sizeof(ans),stdin);
-     } else {
- 	(void)fprintf(stderr,gettxt("cannacmd:217", 
-     "Personal learning file of system dictionary \"%s\" already exists."),
diff --git a/app-i18n/canna/files/canna-posix-sort.patch b/app-i18n/canna/files/canna-posix-sort.patch
deleted file mode 100644
index 1f98aaf5efdd..000000000000
--- a/app-i18n/canna/files/canna-posix-sort.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmd/mkbindic/mkbindic.cpp
-+++ b/cmd/mkbindic/mkbindic.cpp
-@@ -40,7 +40,7 @@
- bck_text=;
- flag=;
- compat_flag=;
--sortcmd="sort -d -s +0 -1"
-+sortcmd="sort -d -s -k 1,1"
- usage="usage: mkbindic [-m|-s] [-name dicname] [-c version] textfile [cpp-args ...]";
- : ${TMPDIR:=/tmp}
- 
diff --git a/app-i18n/canna/files/canna.confd b/app-i18n/canna/files/canna.confd
deleted file mode 100644
index d3fdce5425a2..000000000000
--- a/app-i18n/canna/files/canna.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-CANNASERVER_ENABLE_SYSLOG="yes"
-
-# Specify user to run as
-CANNASERVER_OWNER="bin"
-
-# Options for cannaserver
-CANNASERVER_OPTS=""
diff --git a/app-i18n/canna/files/canna.hosts b/app-i18n/canna/files/canna.hosts
deleted file mode 100644
index 509143d86315..000000000000
--- a/app-i18n/canna/files/canna.hosts
+++ /dev/null
@@ -1 +0,0 @@
-unix
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd
deleted file mode 100644
index 97dac733fa94..000000000000
--- a/app-i18n/canna/files/canna.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/${RC_SVCNAME}server"
-command_args="${CANNASERVER_OPTS}"
-
-# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
-CANNASERVER_LOGFILE="/var/log/${RC_SVCNAME}/CANNA0msgs"
-
-depend() {
-	use logger
-	need net
-}
-
-start_pre() {
-	if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ]; then
-		command_args="${command_args} -syslog"
-	elif [ -z "${CANNASERVER_OWNER}" ]; then
-		checkpath "${CANNASERVER_LOGFILE}"
-	else
-		checkpath -o "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
-		command_args="${command_args} -u ${CANNASERVER_OWNER}"
-	fi
-}
-
-stop() {
-	ebegin "Stopping ${name:-${RC_SVCNAME}}"
-	/usr/sbin/${RC_SVCNAME}kill
-	eend ${?}
-}
diff --git a/app-i18n/canna/files/update-canna-dics_dir b/app-i18n/canna/files/update-canna-dics_dir
deleted file mode 100644
index a57290ec3bad..000000000000
--- a/app-i18n/canna/files/update-canna-dics_dir
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# update-canna-dics_dir
-# compiles dics.dir files for Canna Server
-# Copyright 2001 ISHIKAWA Mutsumi
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-SRC=/var/lib/canna/dic/dics.d
-DEST=/var/lib/canna/dic/canna
-
-for DIR in $SRC $DEST; do
-    VALID=yes
-    if [ ! -d $DIR ]; then
-	echo "$0: $DIR does not exist or is not a directory." >&2
-	VALID=
-    fi
-done
-
-if [ -n "$VALID" ]; then
-    # write new dics.dir file in case we are interrupted
-    echo '# dics.dir -- automatically generated file.  DO NOT EDIT.' > $DEST/dics.dir.update-new
-#    echo '# To modify, see update-canna-dics_dir(8). >> $DEST/dics.dir.update-new
-    # are there any files to process?
-    if [ "$(echo $SRC/*.dics.dir)" != "$SRC/*.dics.dir" ]; then
-	for file in $SRC/*.dics.dir; do
-	    echo "# $file" >> $DEST/dics.dir.update-new
-	    cat $file >> $DEST/dics.dir.update-new
-	done
-	mv $DEST/dics.dir.update-new $DEST/dics.dir
-    else
-      # no files to process, remove the one
-	rm -f $DEST/dics.dir
-    fi
-fi
-
-exit
diff --git a/app-i18n/canna/metadata.xml b/app-i18n/canna/metadata.xml
deleted file mode 100644
index af8866b3beb0..000000000000
--- a/app-i18n/canna/metadata.xml
+++ /dev/null
@@ -1,14 +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>
-  <use>
-    <flag name="canuum">Build canuum</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge-jp">canna</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-i18n/im-canna/Manifest b/app-i18n/im-canna/Manifest
deleted file mode 100644
index 21a8626d96ae..000000000000
--- a/app-i18n/im-canna/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX im-canna-gentoo.patch 912 BLAKE2B f0f8b62ac935b8f0356d96dc0dbfdbef990c1e38e4765ac0715a34749dffae1c57961a5b4e99b58e62bf966ab1b3ba21633fa7e9bf7065e800488605c3ec5e1a SHA512 5b9c98b3495bafcb9eb31d431abba0490817518c9804de6b09d6287d5e45540bc78d27d1be2496bcb1c6435db28666adc9b5b3967195399d57576aaf79da4ecc
-DIST im-canna-0.3.2.2.tar.gz 314633 BLAKE2B 971ab1d00645a0bd977a156abd6a1d3ad767505b5bd45792332a399685388b53b08e3133bc435adb7a7e27125fb1ad2d538f78af2420679c6d6d17878251b2ac SHA512 6ec4253038ca97e3e6319c024e4d11ca5418bf478280c4b19b81a9c628310a06bcd4ec35334d3a2bbdff0245bdfa660c1cdfd949ddd6b768d3b73d78648edc81
-EBUILD im-canna-0.3.2.2-r1.ebuild 760 BLAKE2B e4e47802487fb4b626e63ea260c09ddf3b7fde7bd059bd58dff84b40fed4836c06aa87c6834ecad30985c0a2a6a1e3edad9c3002328d575425aaf79c17806a5d SHA512 252a5e5a133e95d3f49f70f2c49eda4ed64be6315c2813dcefb6759eb8e7b260829149a7791ec914e54f0dcfb72d361d8b3d029f0fe8c7b93ad88a33e858de62
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/im-canna/files/im-canna-gentoo.patch b/app-i18n/im-canna/files/im-canna-gentoo.patch
deleted file mode 100644
index 959e8697eb82..000000000000
--- a/app-i18n/im-canna/files/im-canna-gentoo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--moduledir = ${libdir}/gtk-2.0/2.4.0/immodules
-+moduledir = ${libdir}/gtk-2.0/${GTK_BINARY_VERSION}/immodules
- ## Makefile.am for gtk+/modules/input 
- if PLATFORM_WIN32
- no_undefined = -no-undefined
-@@ -6,11 +6,11 @@
- 
- SUBDIRS = po
- 
--INCLUDES = @GTK_DEP_CFLAGS@ -I/usr/include/canna -DIM_LOCALEDIR=\"${datadir}/locale\"
-+INCLUDES = @GTK_DEP_CFLAGS@ -DIM_LOCALEDIR=\"${datadir}/locale\"
- 
- DEPS =
- 
--LDADDS = @GTK_DEP_LIBS@ -lcanna
-+LDADDS = @GTK_DEP_LIBS@
- 
- EXTRA_DIST=	\
- 	im-canna.spec \
---- a/configure.in
-+++ b/configure.in
-@@ -21,8 +21,10 @@
- 
- GTK_DEP_CFLAGS=`pkg-config gtk+-2.0 --cflags`
- GTK_DEP_LIBS=`pkg-config gtk+-2.0 --libs`
-+GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
- AC_SUBST(GTK_DEP_CFLAGS)
- AC_SUBST(GTK_DEP_LIBS)
-+AC_SUBST(GTK_BINARY_VERSION)
- 
- LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
- LT_CURRENT=2
diff --git a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
deleted file mode 100644
index f731d1bad990..000000000000
--- a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="Japanese Canna input method module for GTK+2"
-HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
-SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-
-RDEPEND="app-i18n/canna
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/im-canna/metadata.xml b/app-i18n/im-canna/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-i18n/im-canna/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 5636d627aba6..e6d2b52003fe 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,4 +1,6 @@
 AUX transifex-client-0.14.2-r1-timestamp.patch 646 BLAKE2B 22d8eced003f2ce5275ef4a8857637ccc0d094e3c9b8405b1c204b78af4bc26f20be9fadf8a7e50d44e10c131f79e9b66f4f03f8ee92c3e73a548236e2903c42 SHA512 339d8ef42935acfd79f438e725683e9592259b9edeb3249d6817957f9bb25ddcd99d05485ad5220af1329937aaf0ea1249ed34cc53bcb3137e461e97a45f6b95
 DIST transifex-client-0.14.2.tar.gz 211398 BLAKE2B 4210a06da9fd09e689d28ae77a90c65f96cbba7b44a2cc506c2e385dc2f34659bfbda25eb81cef850442f4b3da22a859e19761798ec123888564b0327f0c6503 SHA512 5d7f8241d61621197df95cb42b2a8fb8088e77543f076c2401db14f7e44d67e49478d0b04cb525fc6281b37e5026edc8121f90cb7332e669d63be6112264044d
+DIST transifex-client-0.14.3.tar.gz 211428 BLAKE2B cab17d7103016a78b226df6ca9905a0ddfd1b8765fb7b161c7390911ac5693d97e7a872a00cbc86e9c8e7d84fbcd85904768f463885bb679e22ab052463db418 SHA512 9034111fa0253ce8799c5ba181d6d35e2addd14b8c2edb7822d8d572255c27f49e4cfce9d82e7e70e352c32e87f2e7bdc6bf09c2a591e689606b0831414dd863
 EBUILD transifex-client-0.14.2-r1.ebuild 1067 BLAKE2B 2258efe8b37c219685021d786bbea084bfc72084f8d336961b3648671156718b7fc86f8a0e21f8c785518695d6195bd2a14a6b30984970a3a04a2616f36a920b SHA512 84064038c4fdef42b084db4d09bd8afd9df480e359658451b70e92a58ece5b9d71c5fbe8322749aa0dbea4251f29ffc9d853317d8b6de1c5afeacca4e004f73f
+EBUILD transifex-client-0.14.3.ebuild 1036 BLAKE2B 5af5c04f772c65f06360a7531f5d485f7c8ecf6ee36cceb69b7a89ec1688c09506555a57acaf7eb0ba1ffcb1b78288d19329c07a9f18250f5b895c44d0d7fc40 SHA512 1e490ed0086e08d75085cf68821e6fc63aa59798289d330ee25374b6b3c3aa9dbbf1751b01a70b82d971168b8a5f8a6ecf1f059be1f9de5bfc687b72c471e231
 MISC metadata.xml 541 BLAKE2B 39f4feade85a590470eaab0c19062530385df86cbec95d167e0ca1c9be370fa07db6f51bae60bb389a84516ee332095a29b33beba97f4c258ac29582639c0384 SHA512 3e713de19b4abe79be21cd33fb4751e662f6757aa83705dd4d130a17ed8cece026a60f9111c09a76e7f5f7e4465ecaadabb1c30c8cd6d58683de69d6a0c2b8db
diff --git a/app-i18n/transifex-client/transifex-client-0.14.3.ebuild b/app-i18n/transifex-client/transifex-client-0.14.3.ebuild
new file mode 100644
index 000000000000..f8e5d92fb22b
--- /dev/null
+++ b/app-i18n/transifex-client/transifex-client-0.14.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A command line interface for Transifex"
+HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/ https://github.com/transifex/transifex-client"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/GitPython[${PYTHON_USEDEP}]
+	<dev-python/python-slugify-5.0.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	<dev-python/six-2.0.0[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.14.2-r1-timestamp.patch"
+)
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	default
+
+	sed -i -e 's:test_fetch_timestamp_from_git_tree:_&:' \
+		tests/test_utils.py || die
+	sed -i '/tests_require=\["mock>=3.0.5,<4.0"\]/d' setup.py || die
+}
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index bb7f9b892656..2a3680ab9d7f 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -6,5 +6,5 @@ AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716
 AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.8.ebuild 5533 BLAKE2B d7fe314c7709d6e17802f064295ca300a6601d53865d9a45b2aa918c3f6c0c03ad71f371f5adc57b746cd1d697246903d502fcf31d92c7cbe0663cdaea42f0ba SHA512 f735c01f5053df6dd09ad8d852a583d90e5fe562a777f5af88f7d88808467db5cadfbb2f59ff8746a9b2d323505a58f6139b5d79f48927785d52b63f83e09df1
+EBUILD uim-1.8.8-r1.ebuild 5483 BLAKE2B 21d7f261fba2a0c7e79f578ab8ecaa8464e20ed29a6ef70bad82703191cd11ad68ec65a77350efd5ef09a080c1782566534e7dda1b7c1d069b74c1df3a29662f SHA512 fac70ee9914a29ea22d3a84ffa99e77c5c86bdb50d7089370a31621538a20a1bf9d0a2f880ab11e090381fbe769e77f6863f169de0fbdc3e8f5ff918ba64af67
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8-r1.ebuild
index e658b221ed76..1c032e933dce 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8-r1.ebuild
@@ -12,7 +12,7 @@ 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 m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
 	gtk2? ( X )
@@ -21,7 +21,6 @@ REQUIRED_USE="gtk? ( X )
 
 COMMON_DEPEND="
 	anthy? ( app-i18n/anthy )
-	canna? ( app-i18n/canna )
 	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
 	emacs? ( >=app-editors/emacs-23.1:* )
@@ -112,7 +111,6 @@ 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)
@@ -134,6 +132,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_with xft)
 		--without-anthy
+		--without-canna
 		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
 		--disable-gnome-applet
 		--disable-gnome3-applet
@@ -144,7 +143,7 @@ src_configure() {
 		--disable-qt4-qt3support
 	)
 
-	if (use gtk || use gtk2) && (use anthy || use canna); then
+	if (use gtk || use gtk2) && use anthy; then
 		myconf+=( --enable-dict )
 	else
 		myconf+=( --disable-dict )