[gentoo-commits] repo/gentoo:master commit in: profiles/arch/ia64/, app-i18n/canna/files/, app-i18n/canna/, profiles/, ...

[David Seifert]

commit:     77785533c2c17fcf741b61a17b3f9217b70a239e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 11:25:28 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 11:25:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77785533

app-i18n/canna: treeclean

Closes: https://bugs.gentoo.org/796878
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-i18n/canna/Manifest                           |   1 -
 app-i18n/canna/canna-3.7_p3-r4.ebuild             | 154 -----------------
 app-i18n/canna/files/canna-Wformat-security.patch | 199 ----------------------
 app-i18n/canna/files/canna-Wformat.patch          |  11 --
 app-i18n/canna/files/canna-canuum.patch           |  34 ----
 app-i18n/canna/files/canna-gentoo.patch           | 146 ----------------
 app-i18n/canna/files/canna-kpdef.patch            |  18 --
 app-i18n/canna/files/canna-overflow.patch         |  20 ---
 app-i18n/canna/files/canna-posix-sort.patch       |  11 --
 app-i18n/canna/files/canna.confd                  |   7 -
 app-i18n/canna/files/canna.hosts                  |   1 -
 app-i18n/canna/files/canna.initd                  |  31 ----
 app-i18n/canna/files/update-canna-dics_dir        |  36 ----
 app-i18n/canna/metadata.xml                       |  14 --
 profiles/arch/ia64/package.use.mask               |   1 -
 profiles/base/use.mask                            |   5 -
 profiles/package.mask                             |   1 -
 profiles/use.desc                                 |   1 -
 18 files changed, 691 deletions(-)

diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
deleted file mode 100644
index 3fe016c833a..00000000000
--- a/app-i18n/canna/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158

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 a5e3cf174d4..00000000000
--- 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 c83552b5cba..00000000000
--- 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 a8f5aa37163..00000000000
--- 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 293ffbb54c9..00000000000
--- 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 7ecfb4b9cd8..00000000000
--- 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@××××××××.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 b0b71b4442c..00000000000
--- 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 ef3b6ad1b95..00000000000
--- 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 1f98aaf5efd..00000000000
--- 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 d3fdce5425a..00000000000
--- 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 509143d8631..00000000000
--- 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 97dac733fa9..00000000000
--- 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 a57290ec3ba..00000000000
--- 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 af8866b3beb..00000000000
--- 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@g.o</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/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 971f51be2de..b65584cb430 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -82,7 +82,6 @@ dev-python/socketpool eventlet gevent
 # These pull in:
 # - direct ruby dependency:
 app-admin/augeas test
-app-i18n/canna doc
 sys-block/thin-provisioning-tools test
 # - texlive japan modules: ruby runtime scripts
 app-text/texlive l10n_ja context

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b1101daaaaf..d805d7c7b66 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -18,11 +18,6 @@ ruby_targets_ruby25
 # PostgreSQL 9.5 masked for removal
 postgres_targets_postgres9_5
 
-# David Seifert <soap@g.o> (2021-06-20)
-# Abandoned upstream, last release 17 years ago, unmaintained, tons of
-# QA bugs, eclass is terrible. Bug #796878, removal in 30 days.
-canna
-
 # Brian Evans <grknight@g.o> (2021-01-07)
 # PHP 7.2 is security vulnerable and end-of-life
 # Please upgrade to a newer slot

diff --git a/profiles/package.mask b/profiles/package.mask
index a45772f8145..0f02137172a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -305,7 +305,6 @@ dev-java/jvyamlb
 app-dicts/canna-cannadic
 app-dicts/canna-2ch
 app-emacs/yc
-app-i18n/canna
 
 # Volkmar W. Pogatzki <gentoo@××××××××.net> (2021-06-20)
 # no consumer, removal in 30 days

diff --git a/profiles/use.desc b/profiles/use.desc
index 271a22f65be..1e80f0ad87a 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -35,7 +35,6 @@ build - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for creating
 bzip2 - Use the bzlib compression library
 cairo - Enable support for the cairo graphics library
 calendar - Add support for calendars (not using mcal!)
-canna - Add support for the Canna kana to kanji conversion engine
 caps - Use Linux capabilities library to control privilege
 cdb - Add support for the CDB database engine from the author of qmail
 cdda - Add Compact Disk Digital Audio (Standard Audio CD) support