aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Roy <julien@jroy.ca>2024-02-22 19:46:50 -0500
committerJulien Roy <julien@jroy.ca>2024-03-25 12:28:56 -0400
commita6b3f15b1a76a2b066f9ff763fab5588bab902c6 (patch)
tree86f32d7074d66c79409440a9426b97d7efaf5df8 /app-i18n
parentprofiles: Unmask treecleaned packages (diff)
downloadguru-a6b3f15b1a76a2b066f9ff763fab5588bab902c6.tar.gz
guru-a6b3f15b1a76a2b066f9ff763fab5588bab902c6.tar.bz2
guru-a6b3f15b1a76a2b066f9ff763fab5588bab902c6.zip
*/*: treeclean stale/unmaintained packages
Closes: https://bugs.gentoo.org/885347 Closes: https://bugs.gentoo.org/885345 Closes: https://bugs.gentoo.org/885343 Closes: https://bugs.gentoo.org/885341 Closes: https://bugs.gentoo.org/885339 Closes: https://bugs.gentoo.org/885337 Closes: https://bugs.gentoo.org/885335 Closes: https://bugs.gentoo.org/885331 Closes: https://bugs.gentoo.org/885329 Closes: https://bugs.gentoo.org/869230 Closes: https://bugs.gentoo.org/860975 Closes: https://bugs.gentoo.org/859664 Closes: https://bugs.gentoo.org/900362 Closes: https://bugs.gentoo.org/887439 Closes: https://bugs.gentoo.org/887433 Closes: https://bugs.gentoo.org/855116 Closes: https://bugs.gentoo.org/855107 Closes: https://bugs.gentoo.org/897656 Closes: https://bugs.gentoo.org/887955 Closes: https://bugs.gentoo.org/885293 Closes: https://bugs.gentoo.org/847322 Closes: https://bugs.gentoo.org/843524 Closes: https://bugs.gentoo.org/860012 Closes: https://bugs.gentoo.org/852032 Closes: https://bugs.gentoo.org/887193 Closes: https://bugs.gentoo.org/859646 Closes: https://bugs.gentoo.org/901025 Closes: https://bugs.gentoo.org/921735 Closes: https://bugs.gentoo.org/901027 Closes: https://bugs.gentoo.org/887209 Closes: https://bugs.gentoo.org/859649 Closes: https://bugs.gentoo.org/855125 Closes: https://bugs.gentoo.org/921751 Closes: https://bugs.gentoo.org/859673 Closes: https://bugs.gentoo.org/799449 Closes: https://bugs.gentoo.org/901127 Closes: https://bugs.gentoo.org/921740 Closes: https://bugs.gentoo.org/901163 Closes: https://bugs.gentoo.org/887313 Closes: https://bugs.gentoo.org/847325 Closes: https://bugs.gentoo.org/884553 Closes: https://bugs.gentoo.org/859700 Closes: https://bugs.gentoo.org/857633 Closes: https://bugs.gentoo.org/857630 Closes: https://bugs.gentoo.org/857627 Closes: https://bugs.gentoo.org/857624 Closes: https://bugs.gentoo.org/884565 Closes: https://bugs.gentoo.org/855080 Closes: https://bugs.gentoo.org/855119 Closes: https://bugs.gentoo.org/901167 Closes: https://bugs.gentoo.org/887413 Closes: https://bugs.gentoo.org/861707 Closes: https://bugs.gentoo.org/859715 Closes: https://bugs.gentoo.org/901179 Closes: https://bugs.gentoo.org/901181 Closes: https://bugs.gentoo.org/901141 Closes: https://bugs.gentoo.org/887435 Closes: https://bugs.gentoo.org/859718 Closes: https://bugs.gentoo.org/901177 Closes: https://bugs.gentoo.org/890893 Closes: https://bugs.gentoo.org/901185 Closes: https://bugs.gentoo.org/887445 Closes: https://bugs.gentoo.org/884579 Closes: https://bugs.gentoo.org/901193 Closes: https://bugs.gentoo.org/859724 Closes: https://bugs.gentoo.org/886629 Closes: https://bugs.gentoo.org/859730 Closes: https://bugs.gentoo.org/861974 Closes: https://bugs.gentoo.org/887511 Closes: https://bugs.gentoo.org/861977 Closes: https://bugs.gentoo.org/861980 Closes: https://bugs.gentoo.org/887513 Closes: https://bugs.gentoo.org/897392 Closes: https://bugs.gentoo.org/861983 Closes: https://bugs.gentoo.org/861986 Closes: https://bugs.gentoo.org/861989 Closes: https://bugs.gentoo.org/861992 Closes: https://bugs.gentoo.org/861995 Closes: https://bugs.gentoo.org/887515 Closes: https://bugs.gentoo.org/861998 Closes: https://bugs.gentoo.org/862001 Closes: https://bugs.gentoo.org/887517 Closes: https://bugs.gentoo.org/862004 Closes: https://bugs.gentoo.org/862007 Closes: https://bugs.gentoo.org/862010 Closes: https://bugs.gentoo.org/862013 Closes: https://bugs.gentoo.org/862016 Closes: https://bugs.gentoo.org/862079 Closes: https://bugs.gentoo.org/915488 Closes: https://bugs.gentoo.org/884693 Closes: https://bugs.gentoo.org/901149 Closes: https://bugs.gentoo.org/855278 Closes: https://bugs.gentoo.org/921779 Closes: https://bugs.gentoo.org/921885 Closes: https://bugs.gentoo.org/835485 Closes: https://bugs.gentoo.org/887659 Closes: https://bugs.gentoo.org/834741 Closes: https://bugs.gentoo.org/884695 Closes: https://bugs.gentoo.org/901297 Closes: https://bugs.gentoo.org/807703 Closes: https://bugs.gentoo.org/862957 Closes: https://bugs.gentoo.org/922022 Closes: https://bugs.gentoo.org/923917 Closes: https://bugs.gentoo.org/923916 Closes: https://bugs.gentoo.org/923918 Closes: https://bugs.gentoo.org/901287 Closes: https://bugs.gentoo.org/852047 Closes: https://bugs.gentoo.org/852035 Closes: https://bugs.gentoo.org/860333 Closes: https://bugs.gentoo.org/848039 Closes: https://bugs.gentoo.org/897650 Closes: https://bugs.gentoo.org/849071 Closes: https://bugs.gentoo.org/842342 Closes: https://bugs.gentoo.org/860471 Closes: https://bugs.gentoo.org/887953 Closes: https://bugs.gentoo.org/863371 Closes: https://bugs.gentoo.org/887951 Closes: https://bugs.gentoo.org/860459 Closes: https://bugs.gentoo.org/901407 Closes: https://bugs.gentoo.org/847352 Closes: https://bugs.gentoo.org/922042 Closes: https://bugs.gentoo.org/860462 Closes: https://bugs.gentoo.org/901409 Closes: https://bugs.gentoo.org/897652 Closes: https://bugs.gentoo.org/848021 Closes: https://bugs.gentoo.org/901405 Closes: https://bugs.gentoo.org/887959 Closes: https://bugs.gentoo.org/901411 Closes: https://bugs.gentoo.org/887961 Closes: https://bugs.gentoo.org/860465 Closes: https://bugs.gentoo.org/885291 Closes: https://bugs.gentoo.org/901413 Closes: https://bugs.gentoo.org/887967 Closes: https://bugs.gentoo.org/860468 Closes: https://bugs.gentoo.org/863377 Closes: https://bugs.gentoo.org/922043 Closes: https://bugs.gentoo.org/901425 Closes: https://bugs.gentoo.org/863380 Closes: https://bugs.gentoo.org/847319 Closes: https://bugs.gentoo.org/863383 Closes: https://bugs.gentoo.org/860474 Closes: https://bugs.gentoo.org/887989 Closes: https://bugs.gentoo.org/860477 Closes: https://bugs.gentoo.org/887991 Closes: https://bugs.gentoo.org/901427 Closes: https://bugs.gentoo.org/887993 Closes: https://bugs.gentoo.org/901429 Closes: https://bugs.gentoo.org/887997 Closes: https://bugs.gentoo.org/860480 Closes: https://bugs.gentoo.org/897654 Closes: https://bugs.gentoo.org/922047 Closes: https://bugs.gentoo.org/887999 Closes: https://bugs.gentoo.org/897664 Closes: https://bugs.gentoo.org/860531 Closes: https://bugs.gentoo.org/784665 Closes: https://bugs.gentoo.org/860525 Closes: https://bugs.gentoo.org/888003 Closes: https://bugs.gentoo.org/860537 Closes: https://bugs.gentoo.org/922052 Closes: https://bugs.gentoo.org/897662 Closes: https://bugs.gentoo.org/901421 Closes: https://bugs.gentoo.org/785535 Closes: https://bugs.gentoo.org/784644 Closes: https://bugs.gentoo.org/804831 Closes: https://bugs.gentoo.org/885365 Closes: https://bugs.gentoo.org/922053 Closes: https://bugs.gentoo.org/840707 Closes: https://bugs.gentoo.org/836142 Closes: https://bugs.gentoo.org/836153 Closes: https://bugs.gentoo.org/783675 Closes: https://bugs.gentoo.org/888005 Closes: https://bugs.gentoo.org/887879 Closes: https://bugs.gentoo.org/860528 Closes: https://bugs.gentoo.org/901417 Closes: https://bugs.gentoo.org/922055 Closes: https://bugs.gentoo.org/842807 Closes: https://bugs.gentoo.org/810287 Closes: https://bugs.gentoo.org/888007 Closes: https://bugs.gentoo.org/860540 Closes: https://bugs.gentoo.org/885373 Closes: https://bugs.gentoo.org/888011 Closes: https://bugs.gentoo.org/800995 Closes: https://bugs.gentoo.org/885375 Closes: https://bugs.gentoo.org/863758 Closes: https://bugs.gentoo.org/809320 Closes: https://bugs.gentoo.org/809440 Closes: https://bugs.gentoo.org/863779 Closes: https://bugs.gentoo.org/901431 Closes: https://bugs.gentoo.org/860774 Closes: https://bugs.gentoo.org/860768 Closes: https://bugs.gentoo.org/901433 Closes: https://bugs.gentoo.org/852989 Closes: https://bugs.gentoo.org/885367 Closes: https://bugs.gentoo.org/860771 Closes: https://bugs.gentoo.org/901435 Closes: https://bugs.gentoo.org/887881 Closes: https://bugs.gentoo.org/901437 Closes: https://bugs.gentoo.org/784668 Closes: https://bugs.gentoo.org/901439 Closes: https://bugs.gentoo.org/901419 Closes: https://bugs.gentoo.org/888017 Closes: https://bugs.gentoo.org/888019 Closes: https://bugs.gentoo.org/901441 Closes: https://bugs.gentoo.org/885377 Closes: https://bugs.gentoo.org/901443 Closes: https://bugs.gentoo.org/807115 Closes: https://bugs.gentoo.org/885363 Closes: https://bugs.gentoo.org/888021 Closes: https://bugs.gentoo.org/888023 Closes: https://bugs.gentoo.org/901445 Closes: https://bugs.gentoo.org/888015 Closes: https://bugs.gentoo.org/887921 Closes: https://bugs.gentoo.org/863821 Closes: https://bugs.gentoo.org/907907 Closes: https://bugs.gentoo.org/887883 Closes: https://bugs.gentoo.org/908948 Closes: https://bugs.gentoo.org/908947 Closes: https://bugs.gentoo.org/908951 Closes: https://bugs.gentoo.org/892694 Closes: https://bugs.gentoo.org/801016 Closes: https://bugs.gentoo.org/922082 Closes: https://bugs.gentoo.org/852260 Closes: https://bugs.gentoo.org/901451 Closes: https://bugs.gentoo.org/922083 Closes: https://bugs.gentoo.org/860777 Closes: https://bugs.gentoo.org/901449 Closes: https://bugs.gentoo.org/901453 Closes: https://bugs.gentoo.org/921785 Closes: https://bugs.gentoo.org/860969 Closes: https://bugs.gentoo.org/817227 Closes: https://bugs.gentoo.org/921788 Closes: https://bugs.gentoo.org/921789 Closes: https://bugs.gentoo.org/835527 Closes: https://bugs.gentoo.org/897414 Closes: https://bugs.gentoo.org/921781 Closes: https://bugs.gentoo.org/897430 Closes: https://bugs.gentoo.org/848720 Closes: https://bugs.gentoo.org/883173 Closes: https://bugs.gentoo.org/921800 Closes: https://bugs.gentoo.org/921803 Closes: https://bugs.gentoo.org/921804 Closes: https://bugs.gentoo.org/921807 Closes: https://bugs.gentoo.org/901479 Closes: https://bugs.gentoo.org/901483 Closes: https://bugs.gentoo.org/901151 Closes: https://bugs.gentoo.org/896028 Closes: https://bugs.gentoo.org/921783 Closes: https://bugs.gentoo.org/897432 Closes: https://bugs.gentoo.org/905472 Closes: https://bugs.gentoo.org/921810 Closes: https://bugs.gentoo.org/843485 Closes: https://bugs.gentoo.org/921816 Closes: https://bugs.gentoo.org/921818 Closes: https://bugs.gentoo.org/921825 Closes: https://bugs.gentoo.org/921822 Closes: https://bugs.gentoo.org/816654 Closes: https://bugs.gentoo.org/921775 Closes: https://bugs.gentoo.org/921777 Closes: https://bugs.gentoo.org/848723 Closes: https://bugs.gentoo.org/921853 Closes: https://bugs.gentoo.org/921895 Closes: https://bugs.gentoo.org/921855 Closes: https://bugs.gentoo.org/897506 Closes: https://bugs.gentoo.org/921857 Closes: https://bugs.gentoo.org/880013 Closes: https://bugs.gentoo.org/897542 Closes: https://bugs.gentoo.org/921864 Closes: https://bugs.gentoo.org/922915 Closes: https://bugs.gentoo.org/921897 Closes: https://bugs.gentoo.org/921900 Closes: https://bugs.gentoo.org/921865 Closes: https://bugs.gentoo.org/887637 Closes: https://bugs.gentoo.org/839306 Closes: https://bugs.gentoo.org/921868 Closes: https://bugs.gentoo.org/921869 Closes: https://bugs.gentoo.org/862082 Closes: https://bugs.gentoo.org/921873 Closes: https://bugs.gentoo.org/897588 Closes: https://bugs.gentoo.org/901221 Closes: https://bugs.gentoo.org/921808 Closes: https://bugs.gentoo.org/897590 Closes: https://bugs.gentoo.org/848549 Closes: https://bugs.gentoo.org/921876 Closes: https://bugs.gentoo.org/921878 Closes: https://bugs.gentoo.org/921879 Closes: https://bugs.gentoo.org/921880 Closes: https://bugs.gentoo.org/921797 Closes: https://bugs.gentoo.org/862765 Closes: https://bugs.gentoo.org/921780 Closes: https://bugs.gentoo.org/921881 Closes: https://bugs.gentoo.org/921813 Closes: https://bugs.gentoo.org/921784 Closes: https://bugs.gentoo.org/800076 Closes: https://bugs.gentoo.org/921884 Closes: https://bugs.gentoo.org/822456 Signed-off-by: Julien Roy <julien@jroy.ca>
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/canfep/Manifest1
-rw-r--r--app-i18n/canfep/canfep-1.0-r1.ebuild38
-rw-r--r--app-i18n/canfep/files/canfep-1.0-respect-flags.patch24
-rw-r--r--app-i18n/canfep/files/canfep-1.0-utf8.patch190
-rw-r--r--app-i18n/canfep/files/canfep-posix-pty.patch67
-rw-r--r--app-i18n/canfep/files/canfep-termcap.patch266
-rw-r--r--app-i18n/canfep/metadata.xml9
-rw-r--r--app-i18n/im-canna/Manifest1
-rw-r--r--app-i18n/im-canna/files/im-canna-gentoo.patch35
-rw-r--r--app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild46
-rw-r--r--app-i18n/im-canna/metadata.xml9
-rw-r--r--app-i18n/scim-canna/Manifest1
-rw-r--r--app-i18n/scim-canna/files/scim-canna-1.0.1-fix_ftbfs_gtk3.patch201
-rw-r--r--app-i18n/scim-canna/metadata.xml8
-rw-r--r--app-i18n/scim-canna/scim-canna-1.0.1.ebuild54
15 files changed, 0 insertions, 950 deletions
diff --git a/app-i18n/canfep/Manifest b/app-i18n/canfep/Manifest
deleted file mode 100644
index 8b3ed0252..000000000
--- a/app-i18n/canfep/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST canfep-1.0.tar.gz 8067 BLAKE2B 1a6e8af357d2b7aaccf442b0f8bab577ed05a5a0fdf2fb4c189105c2c41f739c2e559e740584bf393fcc52d3f3bd0bb6216e06e2b685f62f7dded9d576e95bed SHA512 0fd7c8ca56282fa537b76fe33f46e03d4f0f4727528ccad95cd4726888372da9158fc8bed2cdc67d645defb479040cd4a4d0999f69d38fd8b4080f7ece4e67d6
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 5c5fdabb8..000000000
--- a/app-i18n/canfep/canfep-1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
-HOMEPAGE="https://web.archive.org/web/20170517105759/http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
-SRC_URI="https://web.archive.org/web/20181106043248if_/http://www.geocities.co.jp/SiliconValley-Bay/7584/${PN}/${P}.tar.gz"
-
-LICENSE="canfep"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- app-i18n/canna
- sys-libs/ncurses:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-utf8.patch"
- "${FILESDIR}/${PN}-posix-pty.patch"
- "${FILESDIR}/${PN}-termcap.patch"
- "${FILESDIR}/${P}-respect-flags.patch"
-)
-
-src_compile() {
- tc-export CXX
- LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" emake
-}
-
-src_install() {
- dobin "${PN}"
- dodoc 00{changes,readme}
-}
diff --git a/app-i18n/canfep/files/canfep-1.0-respect-flags.patch b/app-i18n/canfep/files/canfep-1.0-respect-flags.patch
deleted file mode 100644
index 4dbcbec77..000000000
--- a/app-i18n/canfep/files/canfep-1.0-respect-flags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,5 @@
- # Linux
--CC=c++
--LIBS=-lcanna -ltermcap
--CFLAGS=-O2 -g
-+LIBS += -lcanna
-
- # Solaris 2.6J
- #CC=c++
-@@ -19,10 +17,10 @@
- all: $(TARGET)
-
- $(TARGET): $(OBJS)
-- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIE -o $@ $(OBJS) $(LIBS)
-
- .C.o:
-- $(CC) $(CFLAGS) -c $<
-+ $(CXX) $(CXXFLAGS) -fPIC -c $<
-
- clean:
- rm -rf $(TARGET) $(OBJS)
diff --git a/app-i18n/canfep/files/canfep-1.0-utf8.patch b/app-i18n/canfep/files/canfep-1.0-utf8.patch
deleted file mode 100644
index e798d109d..000000000
--- a/app-i18n/canfep/files/canfep-1.0-utf8.patch
+++ /dev/null
@@ -1,190 +0,0 @@
---- a/canna.C
-+++ b/canna.C
-@@ -4,10 +4,87 @@
- #define FEP_KEY 15
- #define ESC_KEY 27
-
-+void Canna::write_utf8(int fd, char *p, int len)
-+{
-+ if (eucjp_to_utf8_cd == (iconv_t)-1)
-+ write(fd, p, strlen(p));
-+ else
-+ {
-+ char *putf8 = iconv_string(eucjp_to_utf8_cd, p, len);
-+ write(fd, putf8, strlen(putf8));
-+ free(putf8);
-+ }
-+}
-+
-+char * Canna::iconv_string(iconv_t fd, char *str, int slen)
-+{
-+ char *from;
-+ size_t fromlen;
-+ char *to;
-+ size_t tolen;
-+ size_t len = 0;
-+ size_t done = 0;
-+ char *result = NULL;
-+ char *p;
-+ int l;
-+
-+ from = (char *)str;
-+ fromlen = slen;
-+ for (;;)
-+ {
-+ if (len == 0 || errno == E2BIG)
-+ {
-+ /* Allocate enough room for most conversions. When re-allocating
-+ * increase the buffer size. */
-+ len = len + fromlen * 2 + 40;
-+ p = (char*)malloc((unsigned)len);
-+ if (p != NULL && done > 0)
-+ memcpy(p, result, done);
-+ free(result);
-+ result = p;
-+ if (result == NULL) /* out of memory */
-+ break;
-+ }
-+
-+ to = (char *)result + done;
-+ tolen = len - done - 2;
-+ /* Avoid a warning for systems with a wrong iconv() prototype by
-+ * casting the second argument to void *. */
-+ if (iconv(fd, &from, &fromlen, &to, &tolen) != (size_t)-1)
-+ {
-+ /* Finished, append a NUL. */
-+ *to = 0;
-+ break;
-+ }
-+ /* Check both ICONV_EILSEQ and EILSEQ, because the dynamically loaded
-+ * iconv library may use one of them. */
-+ if (errno == EILSEQ || errno == EILSEQ)
-+ {
-+ /* Can't convert: insert a '?' and skip a character. This assumes
-+ * conversion from 'encoding' to something else. In other
-+ * situations we don't know what to skip anyway. */
-+ *to++ = *from++;
-+ fromlen -= 1;
-+ }
-+ else if (errno != E2BIG)
-+ {
-+ /* conversion failed */
-+ free(result);
-+ result = NULL;
-+ break;
-+ }
-+ /* Not enough room or skipping illegal sequence. */
-+ done = to - (char *)result;
-+ }
-+ return result;
-+}
-+
- // コンストラクタだよん
- Canna::Canna(int ac, char** av, char* amsg, char* emsg):
- Pty(ac, av, amsg, emsg)
- {
-+ char *p_lang = getenv("LANG");
-+
- // かんなの初期化
- jrKanjiControl(0, KC_INITIALIZE, 0);
- jrKanjiControl(0, KC_SETAPPNAME, "canfep");
-@@ -15,6 +92,9 @@
- jrKanjiControl(0, KC_QUERYMODE, (char*) saveMode);
- jrKanjiControl(0, KC_SETWIDTH, (char*) 72);
-
-+ if (p_lang == NULL || strstr(p_lang, "-8"))
-+ eucjp_to_utf8_cd = iconv_open("utf-8", "euc-jp");
-+
- mode(saveMode);
- }
-
-@@ -25,6 +105,8 @@
- jrKanjiControl(0, KC_KILL, (char*) &ksv);
- jrKanjiControl(0, KC_FINALIZE, 0);
-
-+ if (eucjp_to_utf8_cd != (iconv_t)-1)
-+ iconv_close(eucjp_to_utf8_cd);
- mode(saveMode);
- }
-
-@@ -32,7 +114,7 @@
- void
- Canna::kakutei(unsigned char* p)
- {
-- write(wfd, p, strlen((char*) p));
-+ write_utf8(wfd, (char*)p, strlen((char*) p));
- }
-
- // 変換中(未確定)の文字列を出力する
-@@ -42,13 +124,13 @@
- write(rfd, sc, strlen(sc));
- write(rfd, rc, strlen(rc));
- write(rfd, us, strlen(us));
-- write(rfd, p, pos);
-+ write_utf8(rfd, (char*)p, pos);
- write(rfd, ue, strlen(ue));
- write(rfd, so, strlen(so));
-- write(rfd, p + pos, len);
-+ write_utf8(rfd, (char*)p + pos, len);
- write(rfd, se, strlen(se));
- write(rfd, us, strlen(us));
-- write(rfd, p + pos + len, strlen((char*) p + pos + len));
-+ write_utf8(rfd, (char*)p + pos + len, strlen((char*) p + pos + len));
- write(rfd, ue, strlen(ue));
- }
-
-@@ -73,7 +155,7 @@
- write(rfd, sc, strlen(sc));
- write(rfd, ts, strlen(ts));
- write(rfd, ce, strlen(ce));
-- write(rfd, p, strlen((char*) p));
-+ write_utf8(rfd, (char*)p, strlen((char*) p));
- write(rfd, fs, strlen(fs));
- }
-
-@@ -84,13 +166,13 @@
- write(rfd, sc, strlen(sc));
- write(rfd, ts, strlen(ts));
- write(rfd, ce, strlen(ce));
-- write(rfd, p, strlen((char*) p));
-+ write_utf8(rfd, (char*)p, strlen((char*) p));
- write(rfd, " ", 1);
-- write(rfd, l, pos);
-+ write_utf8(rfd, (char*)l, pos);
- write(rfd, so, strlen(so));
-- write(rfd, l + pos, len);
-+ write_utf8(rfd, (char*)l + pos, len);
- write(rfd, se, strlen(se));
-- write(rfd, l + pos + len, strlen((char*) l + pos +len));
-+ write_utf8(rfd, (char*)l + pos + len, strlen((char*) l + pos +len));
- write(rfd, fs, strlen(fs));
- }
-
---- a/canna.H
-+++ b/canna.H
-@@ -5,6 +5,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <errno.h>
-+#include <iconv.h>
- #include <canna/jrkanji.h>
-
- #include "pty.H"
-@@ -17,6 +19,7 @@
- jrKanjiStatus ks;
- jrKanjiStatusWithValue ksv;
- private:
-+ iconv_t eucjp_to_utf8_cd;
- unsigned char currentMode[BUFSIZ];
- unsigned char saveMode[BUFSIZ];
- private:
-@@ -25,6 +28,8 @@
- void delhenkan(int len);
- void mode(unsigned char* p);
- void gline(unsigned char* p, unsigned char* l, int pos, int len);
-+ void write_utf8(int fd, char *p, int len);
-+ char* iconv_string(iconv_t fd, char *str, int slen);
- public:
- void loop();
- };
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 caa451232..000000000
--- 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 afd215b07..000000000
--- 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 34e045e08..000000000
--- a/app-i18n/canfep/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <description>co-maintainers welcome</description>
- <name>Alessandro Barbieri</name>
- <email>lssndrbarbieri@gmail.com</email>
- </maintainer>
-</pkgmetadata>
diff --git a/app-i18n/im-canna/Manifest b/app-i18n/im-canna/Manifest
deleted file mode 100644
index 224e02e83..000000000
--- a/app-i18n/im-canna/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST im-canna-0.3.2.2.tar.gz 314633 BLAKE2B 971ab1d00645a0bd977a156abd6a1d3ad767505b5bd45792332a399685388b53b08e3133bc435adb7a7e27125fb1ad2d538f78af2420679c6d6d17878251b2ac SHA512 6ec4253038ca97e3e6319c024e4d11ca5418bf478280c4b19b81a9c628310a06bcd4ec35334d3a2bbdff0245bdfa660c1cdfd949ddd6b768d3b73d78648edc81
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 959e8697e..000000000
--- 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 2e14c27db..000000000
--- a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-
-RDEPEND="
- app-i18n/canna
- x11-libs/gtk+:2
-"
-DEPEND="
- ${RDEPEND}
- sys-devel/gettext
-"
-BDEPEND="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 34e045e08..000000000
--- a/app-i18n/im-canna/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <description>co-maintainers welcome</description>
- <name>Alessandro Barbieri</name>
- <email>lssndrbarbieri@gmail.com</email>
- </maintainer>
-</pkgmetadata>
diff --git a/app-i18n/scim-canna/Manifest b/app-i18n/scim-canna/Manifest
deleted file mode 100644
index d2bfe27c3..000000000
--- a/app-i18n/scim-canna/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scim-canna-1.0.1.tar.gz 516186 BLAKE2B 03b977e841d6263f6c980e8e729122ca4ff7c9a0966f6f9daf57543250e7119a84ddfb7805804e3c5afaecba91d50d21448f49335d5a28cb967de8370b9f5dd9 SHA512 711b67211c9d1f4cb8ca09b88d455718607aa2d99e47a753fa8d71d2e1f0df8c649b64d08149785eeaa98d1399b9ca92e3df7e1be8f150ce99f28f82491b8bc1
diff --git a/app-i18n/scim-canna/files/scim-canna-1.0.1-fix_ftbfs_gtk3.patch b/app-i18n/scim-canna/files/scim-canna-1.0.1-fix_ftbfs_gtk3.patch
deleted file mode 100644
index d9a99010a..000000000
--- a/app-i18n/scim-canna/files/scim-canna-1.0.1-fix_ftbfs_gtk3.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- a/src/scim_canna_imengine_setup.cpp
-+++ b/src/scim_canna_imengine_setup.cpp
-@@ -152,7 +152,9 @@
- // Internal data declaration.
- static bool __have_changed = true;
-
-+#if !GTK_CHECK_VERSION(2, 12, 0)
- static GtkTooltips * __widget_tooltips = 0;
-+#endif
-
- static BoolConfigData __config_bool_common [] =
- {
-@@ -284,11 +286,17 @@
- entry);
- gtk_widget_show (entry->widget);
-
-+#if !GTK_CHECK_VERSION(2, 12, 0)
- if (!__widget_tooltips)
- __widget_tooltips = gtk_tooltips_new();
-+#endif
- if (entry->tooltip)
-+#if GTK_CHECK_VERSION(2, 12, 0)
-+ gtk_widget_set_tooltip_text (entry->widget, _(entry->tooltip));
-+#else
- gtk_tooltips_set_tip (__widget_tooltips, entry->widget,
- _(entry->tooltip), NULL);
-+#endif
-
- return entry->widget;
- }
-@@ -324,11 +332,17 @@
- (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
- (GtkAttachOptions) (GTK_FILL), 4, 4);
-
-+#if !GTK_CHECK_VERSION(2, 12, 0)
- if (!__widget_tooltips)
- __widget_tooltips = gtk_tooltips_new();
-+#endif
- if (entry->tooltip)
-+#if GTK_CHECK_VERSION(2, 12, 0)
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), _(entry->tooltip));
-+#else
- gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget),
- _(entry->tooltip), NULL);
-+#endif
-
- return GTK_WIDGET (entry->widget);
- }
-@@ -351,31 +365,53 @@
- (GtkAttachOptions) (GTK_FILL), 4, 4);
- gtk_widget_show (label);
-
-+#if GTK_CHECK_VERSION(2, 4, 0)
-+ entry->widget = gtk_combo_box_text_new_with_entry ();
-+ gtk_label_set_mnemonic_widget (GTK_LABEL (label),
-+ gtk_bin_get_child (GTK_BIN (entry->widget)));
-+ gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (entry->widget))), FALSE);
-+#else
- entry->widget = gtk_combo_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label),
- GTK_COMBO (entry->widget)->entry);
- gtk_combo_set_value_in_list (GTK_COMBO (entry->widget), TRUE, FALSE);
- gtk_combo_set_case_sensitive (GTK_COMBO (entry->widget), TRUE);
-- gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (entry->widget)->entry),
-+ gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (entry->widget)->entry),
- FALSE);
-+#endif
- gtk_widget_show (GTK_WIDGET (entry->widget));
- gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (entry->widget),
- 1, 2, idx, idx + 1,
- (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
- (GtkAttachOptions) (GTK_FILL), 4, 4);
-+#if GTK_CHECK_VERSION(2, 4, 0)
-+ g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (entry->widget))),
-+ DATA_POINTER_KEY,
-+ (gpointer) candidates_p);
-+ g_signal_connect ((gpointer) gtk_bin_get_child (GTK_BIN (entry->widget)), "changed",
-+ G_CALLBACK (on_default_combo_changed),
-+ entry);
-+#else
- g_object_set_data (G_OBJECT (GTK_COMBO (entry->widget)->entry),
- DATA_POINTER_KEY,
- (gpointer) candidates_p);
--
- g_signal_connect ((gpointer) GTK_COMBO (entry->widget)->entry, "changed",
- G_CALLBACK (on_default_combo_changed),
- entry);
-+#endif
-+
-
-+#if !GTK_CHECK_VERSION(2, 12, 0)
- if (!__widget_tooltips)
- __widget_tooltips = gtk_tooltips_new();
-+#endif
- if (entry->tooltip)
-+#if GTK_CHECK_VERSION(2, 12, 0)
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), _(entry->tooltip));
-+#else
- gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget),
- _(entry->tooltip), NULL);
-+#endif
-
- return GTK_WIDGET (entry->widget);
- }
-@@ -403,11 +439,17 @@
- {
- GtkWidget *vbox, *frame, *table, *check, *widget;
-
-+#if GTK_CHECK_VERSION(3, 0, 0)
-+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-+#else
- vbox = gtk_vbox_new (FALSE, 0);
-+#endif
- gtk_widget_show (vbox);
-
-+#if !GTK_CHECK_VERSION(2, 12, 0)
- if (!__widget_tooltips)
- __widget_tooltips = gtk_tooltips_new();
-+#endif
-
- /* specify initialize file name */
- frame = gtk_frame_new ("");
-@@ -455,7 +497,11 @@
- {
- GtkWidget *vbox, *table;
-
-+#if GTK_CHECK_VERSION(3, 0, 0)
-+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-+#else
- vbox = gtk_vbox_new (FALSE, 0);
-+#endif
- gtk_widget_show (vbox);
-
- table = gtk_table_new (2, 2, FALSE);
-@@ -480,7 +526,11 @@
- GtkWidget *vbox, *label;
- gchar str[256];
-
-+#if GTK_CHECK_VERSION(3, 0, 0)
-+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-+#else
- vbox = gtk_vbox_new (FALSE, 0);
-+#endif
- gtk_widget_show (vbox);
-
- g_snprintf (
-@@ -547,8 +597,23 @@
- }
-
- static void
--setup_combo_value (GtkCombo *combo, const String & str)
-+setup_combo_value (GtkWidget *combo, const String & str)
- {
-+#if GTK_CHECK_VERSION(2, 4, 0)
-+ ComboConfigCandidate *data
-+ = static_cast<ComboConfigCandidate*>
-+ (g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (combo))),
-+ DATA_POINTER_KEY));
-+
-+ gint default_index = -1;
-+ for (unsigned int i = 0; data[i].label; i++) {
-+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(data[i].label));
-+ if (!strcmp (data[i].data, str.c_str ()))
-+ default_index = i;
-+ }
-+ if (default_index != -1)
-+ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), default_index);
-+#else
- GList *list = NULL;
- const char *defval = NULL;
-
-@@ -563,11 +628,12 @@
- defval = _(data[i].label);
- }
-
-- gtk_combo_set_popdown_strings (combo, list);
-+ gtk_combo_set_popdown_strings (GTK_COMBO (combo), list);
- g_list_free (list);
-
- if (defval)
-- gtk_entry_set_text (GTK_ENTRY (combo->entry), defval);
-+ gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), defval);
-+#endif
- }
-
- static void
-@@ -582,8 +648,13 @@
-
- for (unsigned int i = 0; i < __config_string_common_num; i++) {
- StringConfigData &entry = __config_string_common[i];
-+#if GTK_CHECK_VERSION(2, 12, 0)
-+ if (entry.widget && GTK_IS_COMBO_BOX (entry.widget))
-+ setup_combo_value (entry.widget, entry.value);
-+#else
- if (entry.widget && GTK_IS_COMBO (entry.widget))
-- setup_combo_value (GTK_COMBO (entry.widget), entry.value);
-+ setup_combo_value (entry.widget, entry.value);
-+#endif
- else if (entry.widget && GTK_IS_ENTRY (entry.widget))
- gtk_entry_set_text (GTK_ENTRY (entry.widget),
- entry.value.c_str ());
diff --git a/app-i18n/scim-canna/metadata.xml b/app-i18n/scim-canna/metadata.xml
deleted file mode 100644
index 0433bcab3..000000000
--- a/app-i18n/scim-canna/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <name>Alessandro Barbieri</name>
- <email>lssndrbarbieri@gmail.com</email>
- </maintainer>
-</pkgmetadata>
diff --git a/app-i18n/scim-canna/scim-canna-1.0.1.ebuild b/app-i18n/scim-canna/scim-canna-1.0.1.ebuild
deleted file mode 100644
index 242827847..000000000
--- a/app-i18n/scim-canna/scim-canna-1.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="SCIM IMEngine module using Canna"
-HOMEPAGE="https://osdn.net/projects/scim-imengine"
-SRC_URI="https://free.nchc.org.tw/osdn//scim-imengine/29155/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="
- app-i18n/canna
- app-i18n/scim
- dev-libs/atk
- dev-libs/glib:2
- dev-libs/libltdl
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/pango
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-fix_ftbfs_gtk3.patch" )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myargs=(
- --disable-static
- --enable-shared
- $(use_enable debug)
- )
- econf "${myargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}