gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /app-i18n
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
60 files changed, 296 insertions, 1450 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index ed666528ec31..bffc569b3e5c 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/enca/Manifest b/app-i18n/enca/Manifest
index 633f6440c2a2..8e8eeff33690 100644
--- a/app-i18n/enca/Manifest
+++ b/app-i18n/enca/Manifest
@@ -1,3 +1,3 @@
 DIST enca-1.19.tar.xz 465412 BLAKE2B fefd58502cf345f9b88d620d5af349d72b9e2af70d61c9b5aa3632cf91011110dc1fa08e78dd04c02c5a333adfefeb88f529f3cadcb75d0cea2b500a5a70c057 SHA512 6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296
-EBUILD enca-1.19-r1.ebuild 2090 BLAKE2B 5d7958f57a2c021c252950f3da8b23d6230cf9c676fd4581a85c3fcbbb72191c6166c2ccdf37515a8647ea0dbfeb7d08e1e1af1c6c42fa68b326192bfd4926b7 SHA512 913cceec54ecbaa2a26c325f5eca1e994eb29a7eb4e9bce824f150c40ed4e9173877efb93e253c6e1a54e021c4a57bb64270545e12ccb280689d9efaed82a591
+EBUILD enca-1.19-r2.ebuild 2093 BLAKE2B 26b21d1475108c434fca10c2889eea1926df1f1961d3969151befec4f6e19abb6ac062ab67d7acaa052d058c690a1f43ef14efcfed3a3952f426af8efd2d9163 SHA512 bfc21dd2731eaf199c5c6f030ee7d26127b452cc8357e9ea64ced744257d1b0fffaadeb732ebbc3d2c726f217d595a9615632eeacec21e6c54822a47077fbcb2
 MISC metadata.xml 324 BLAKE2B 61e560fc5161d96f01841ebd42ce64012725667f0545fe3bfa463f94b61a536822e1109bfa044f17f6e12c6c45bd24c284aa4846f36db5836e24742b1cc171e9 SHA512 b10801cd8a372709601915899abe03282148aa9a0519160963f5a7734fbeadc082f5493e46ecfb887a16c4b9b5f28424b3b2b87ab4b34708b77cdf3cd4eba03f
diff --git a/app-i18n/enca/enca-1.19-r1.ebuild b/app-i18n/enca/enca-1.19-r2.ebuild
index 4344574406c0..b810849245fc 100644
--- a/app-i18n/enca/enca-1.19-r1.ebuild
+++ b/app-i18n/enca/enca-1.19-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="doc +iconv recode static-libs"
 
 RDEPEND="
 	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	recode? ( app-text/recode[${MULTILIB_USEDEP}] )
+	recode? ( app-text/recode:0=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/app-i18n/fbterm/Manifest b/app-i18n/fbterm/Manifest
index 46d15435b0f1..4260ab5c342d 100644
--- a/app-i18n/fbterm/Manifest
+++ b/app-i18n/fbterm/Manifest
@@ -1,5 +1,3 @@
-AUX fbterm-gcc6.patch 1627 BLAKE2B 80167f0616e8e17669f98347884b6d793f1f2331aa3d4341e99b6e44b1f66cfbd811921e488b29f3ba1a194150d0decfd97992bc6f0509dfe6e423b7ff413944 SHA512 742969c5b568006d0592e1c71480f38d63437f50ec4a213f561325ba7570f5ed7d7d6e700b4973bda4d74b8c4992e25f731fb69efb450eff2ed97fcd49d713b9
-DIST fbterm-1.7.0.tar.gz 188642 BLAKE2B 2f4e0a989a58d6dd67e7696786d820f15b18039d8912b967de55b09aa03c723cad1d76171a264c41487171f6650089f8a7e02e50bed267f2465fc8a6af62c57e SHA512 ba78b5118b5e4c65046f7f91ce88cb4f828e2debb34358df8518e1907a8d601a2be4dfcf144e84494dc30e4828d333574debe8dd3ffb59e2169c3e48ba1f6a10
-EBUILD fbterm-1.7-r4.ebuild 1349 BLAKE2B 151ef78477b5ccb1a2fb33684eca050431fb5cdaedd07c8bdb4e6113607ccfa72c2b47f9d72588a700a3b9a2bb97d95adca099bcf6ab618328c43641e3823ba4 SHA512 6f565086806d41c514b8084208c406f607fcc8f2ebaa843d5241f48b5734ecc564c85d10af13fa710aced02346519bac2b0a8386235e2c927ce83715d45d1327
-EBUILD fbterm-1.7-r5.ebuild 1253 BLAKE2B bab40d86a2589cc4e1295dcd0c8c4d2a6a55a9c88ce18a43d86cd03b5cd10f45e419b51cbea0ef5c4e2889387a275ced3d6242de097bae6457d53227f8499915 SHA512 9c019a5916cf66747c7fe07fa3915d7a991eb2da3cfbf2d2a22321a8c362897c85aaf56278be51b5bc6a6bdf772069d7ce69c117708fe44c4b31149b6d24fb47
-MISC metadata.xml 320 BLAKE2B e927f9410ab7cc7b6528a9b1b3dfcda79e208783786f7c9a8906328d8644f52c7c1aeea32abce83bd4f5b9c907adb4364577f3053200de2d202c031c3bb9c0ff SHA512 c6a430df744723fb4a59ea103f5a379d7d533b84a4286573dc29acb61cba3210b48f31c2b30b3c190bf0135a475f69fe51309ea68f10709715007e3d37646892
+DIST fbterm-1.7_p20190503.tar.gz 187225 BLAKE2B 9efa290c73dae49e12bb53d44c502a58fa5baaf517248b18ae1218285a3785fe276bf028613eac0a78ccee51c8b392153533dffd1e2b88201cccf8badb6d34e1 SHA512 13a57f8c5fff1d9c70021cd01f554a76e5465ae49b05a5aa49949caf31eb2b8fc231bdfba6ac42840542b73edc4ab66e487eebd0fa9d92761c7193294edadf81
+EBUILD fbterm-1.7_p20190503.ebuild 1352 BLAKE2B 89de8a5b38761d10f4ffb9ee068473d730d323573e1c4bf6b7f07a7ede104c9e7d0db38342cce16c8ef36331214a2f7f68b7c0b73c540f678785634173780a99 SHA512 4b9ba3b2e374a591d60d49db989fdc71454ea239d8cf86895d55e32c2fcc9648564c5e0ed36eb99165a9d44d8241eb0faa5e493e0acb9c48387bb0c40535106b
+MISC metadata.xml 313 BLAKE2B 75b2f15a670ffc2bf3aa397e6ee043442f326d0f9764e469e591dc495022b9df9df533bb2fe2b6715830c1ef780f0ce97fd635e00c2ba8def1e27bf222f0d59d SHA512 f5f73637bd468db6f5b40acd14c2cba5d4d27183099ee300e40ebf6d67673fa1b3f06410f1cbeca304cc321ec57f64bd0af23be8899dad0afefa63c636bcd1f7
diff --git a/app-i18n/fbterm/fbterm-1.7-r5.ebuild b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
deleted file mode 100644
index 45117addebe2..000000000000
--- a/app-i18n/fbterm/fbterm-1.7-r5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools fcaps
-
-DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
-HOMEPAGE="https://code.google.com/p/fbterm"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="gpm video_cards_vesa"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	gpm? ( sys-libs/gpm )
-	video_cards_vesa? ( dev-libs/libx86 )
-	>=sys-libs/ncurses-6.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
-
-FILECAPS=(
-	cap_sys_tty_config+ep usr/bin/${PN}
-)
-
-src_prepare() {
-	# bug #648472
-	sed -i "s/terminfo//" Makefile.am
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gpm) \
-		$(use_enable video_cards_vesa vesa)
-}
-
-src_install() {
-	default
-
-	use filecaps || fperms u+s /usr/bin/${PN}
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	elog "${PN} won't work with vga16fb. You have to use other native"
-	elog "framebuffer drivers or vesa driver."
-	elog "See ${EPREFIX}/usr/share/doc/${P}/README for details."
-	elog
-	elog "To use ${PN}, ensure you are in video group."
-}
diff --git a/app-i18n/fbterm/fbterm-1.7-r4.ebuild b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index b8952a615af8..c6271dc437cd 100644
--- a/app-i18n/fbterm/fbterm-1.7-r4.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -1,37 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit autotools fcaps
+inherit autotools fcaps toolchain-funcs vcs-snapshot
+
+EGIT_COMMIT="ccea326dd73f4d6b6442fde7ba7c2be9cd35c6df"
 
 DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
-HOMEPAGE="https://code.google.com/p/fbterm"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.0.tar.gz"
+HOMEPAGE="https://github.com/gjedeer/fbterm"
+SRC_URI="https://github.com/gjedeer/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="gpm video_cards_vesa"
 
-CDEPEND="media-libs/fontconfig
+BDEPEND="virtual/pkgconfig"
+DEPEND="media-libs/fontconfig
 	media-libs/freetype:2
+	>=sys-libs/ncurses-6.1
 	gpm? ( sys-libs/gpm )
 	video_cards_vesa? ( dev-libs/libx86 )"
-RDEPEND="${CDEPEND}
-	!>=sys-libs/ncurses-6.1"
-DEPEND="${CDEPEND}
-	sys-libs/ncurses
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
+RDEPEND="${DEPEND}"
 
 FILECAPS=(
 	cap_sys_tty_config+ep usr/bin/${PN}
 )
 
 src_prepare() {
-	sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|" terminfo/Makefile.am
+	# bug #648472
+	sed -i "s/terminfo//" Makefile.am || die "Can't remove terminfo"
 
 	default
 	eautoreconf
@@ -43,8 +42,11 @@ src_configure() {
 		$(use_enable video_cards_vesa vesa)
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_install() {
-	dodir /usr/share/terminfo
 	default
 
 	use filecaps || fperms u+s /usr/bin/${PN}
diff --git a/app-i18n/fbterm/files/fbterm-gcc6.patch b/app-i18n/fbterm/files/fbterm-gcc6.patch
deleted file mode 100644
index aa19fac96723..000000000000
--- a/app-i18n/fbterm/files/fbterm-gcc6.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=594308
-
-Author: Peter Levine <plevine457@gmail.com>
-
---- a/src/lib/vterm_states.cpp
-+++ b/src/lib/vterm_states.cpp
-@@ -39,14 +39,14 @@
- 	{ 0x1B, 0,	ESesc },
- 	{ 0x7F, 0,	ESkeep },
- 	{ 0x9B, 0,	ESsquare },
--	{ -1}
-+	{ (u16) -1}
- };
- 
- const VTerm::Sequence VTerm::escape_sequences[] = {
- 	{   0, 0, ESnormal },
- 
- 	// ESnormal
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESesc
- 	{ '[', &VTerm::clear_param,	ESsquare },
-@@ -65,7 +65,7 @@
- 	{ '8', &VTerm::restore_cursor,	ESnormal },
- 	{ '>', &VTerm::keypad_numeric,	ESnormal },
- 	{ '=', &VTerm::keypad_application,	ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESsquare
- 	{ '[', 0,	ESfunckey },
-@@ -104,7 +104,7 @@
- 	{ '`', &VTerm::cursor_position_col,	ESnormal },
- 	{ ']', &VTerm::linux_specific, ESnormal },
- 	{ '}', &VTerm::fbterm_specific, ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESnonstd
- 	{ '0' | ADDSAME(9), &VTerm::set_palette,    ESkeep },
-@@ -112,25 +112,25 @@
- 	{ 'a' | ADDSAME(5), &VTerm::set_palette,    ESkeep },
- 	{ 'P', &VTerm::begin_set_palette, ESkeep },
- 	{ 'R', &VTerm::reset_palette, ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESpercent
- 	{ '@', &VTerm::clear_utf8,	ESnormal },
- 	{ 'G', &VTerm::set_utf8,	ESnormal },
- 	{ '8', &VTerm::set_utf8,	ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// EScharset
- 	{ '0', &VTerm::set_charset, ESnormal },
- 	{ 'B', &VTerm::set_charset, ESnormal },
- 	{ 'U', &VTerm::set_charset, ESnormal },
- 	{ 'K', &VTerm::set_charset, ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// EShash
- 	{ '8', &VTerm::screen_align,	ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESfunckey
--	{ -1 },
-+	{ (u16) -1 },
- };
diff --git a/app-i18n/fbterm/metadata.xml b/app-i18n/fbterm/metadata.xml
index 165c6df0ed29..d76dd2993d24 100644
--- a/app-i18n/fbterm/metadata.xml
+++ b/app-i18n/fbterm/metadata.xml
@@ -1,11 +1,11 @@
 <?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>
-  <upstream>
-    <remote-id type="google-code">fbterm</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gjedeer/fbterm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index 9d4a25b212f5..20a2d7ad3ff7 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32da85f27701741cbe77b576afcd8685c4f2209aaf24ef84420cbeec1614b251d2903c1ea4e7175a1014f92615399847 SHA512 963b1dfba18259aad2296c10de35f9f321b0169d6f85afa058ed57b6894fe4e1d44514ffadeee3c3108aac77f54aa645096ddf4bdb353fafaedb83d27d8c5d47
 DIST ibus-anthy-1.5.11.tar.gz 809725 BLAKE2B b12139e208c401e3fdda0d3a184b0246d039e077b827d1aeb2da20470deeb62551026c68ba39c289e7876467147a6ba93d318d0582a9b45866c2f5a4f52e85aa SHA512 2ac85bf4ddba56e3f84c3732082b3b63a07175ea712aad2865de4f87b8c0967da303ee1edccbed0890095e8ddab10e58307a47b72ee11b51de3927fdb9e72418
-EBUILD ibus-anthy-1.5.10-r1.ebuild 1285 BLAKE2B 570cb96794d1fbb1964980ec302e9e120b34a0c8daff255e70fe29c921d7675920df9f93d27ae668268f83e64973d17acf3a2f82d35ffbc313ec8c7cade6e484 SHA512 b27e6034f3740078f1a0a6278b6ec3934ac9f7d89ada688e18a9430f9f903ba20451ad8a871203a2801bad30a9d5ced244e25dc1976055aba102091b760c63ee
-EBUILD ibus-anthy-1.5.11.ebuild 1268 BLAKE2B 5bf626b2b42182645e30a4cc81fb202f3f375fa2ec830bc8ae0e747588217b18b2d03cdd3c380fa22ffbbd061aa87bd43578186b10da113377abe438add3aa4d SHA512 54ccf4f6a937c652f2bb2ddc35435bd8c8e7f7c0f341f8037982bdc92fc58f5e316f27fef4f42cd6dc9b84603569f26dc934d77f80e742e643804fbc4d414090
+EBUILD ibus-anthy-1.5.10-r2.ebuild 1328 BLAKE2B d4a5f82c9cc64baf8c7a85ea96fd086720f5c035bbbc77775db9fb024e49bf9d881c67fcaa4e0fc3712e430bfe427c1dcd2f8d9e9a4d935bff9dfdbf5691ef4a SHA512 e40b42973bdde6c303e2efdee020fb5b30fdfcce71bd0003d25f4bfed1f5921728736252194de8dc074b3fdbc93c201053913c975ce5684f36f8bf9148b9f682
+EBUILD ibus-anthy-1.5.11-r1.ebuild 1311 BLAKE2B 7f5f22fb4b5d1c86c73ebaa93ba6d8df6c77ad8324d3321e289435b0bbdfc9824c7cf6570c96c020512d8a73e77891ea4347298ac890bafcad7149acda591f2b SHA512 16fd92d4d98914cbea997132d7727e38700ad422ebd2e0974b66f6873730be71ad330dd82719e506493e141edf9a0516869bcd5ac784f83fdfc3e5fbdd1a5f6c
 MISC metadata.xml 476 BLAKE2B 33f4115e9bafa5d3f491ea05b8395123c9cb6b844959df2ee8b2cc9609b8fd20d25cc870adc117c9e96e17f215c806d82ff138b01c2b02e2e63eb99d568ea626 SHA512 024c387b5eb01279f8803df81b1d7dc2b86969ffee5986bef75987c066cce48f7d1fe8ea35790be4fafbff2281850f2b03904f41e06bc37fc9d40537eca96c07
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
index f8d2fd9b0ff5..b70a75b59869 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2-utils python-single-r1
+inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Japanese Anthy engine for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -26,7 +26,7 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 BDEPEND="dev-util/intltool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext"
 
 src_prepare() {
 	default
@@ -53,11 +53,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	gnome2_schemas_update
 
 	if ! has_version app-dicts/kasumi; then
 		elog "app-dicts/kasumi is not required but probably useful for you."
@@ -65,5 +67,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_update
 }
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.11.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
index b818978cb1ad..3b04c215cea5 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.11.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2-utils python-single-r1
+inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Japanese Anthy engine for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -25,7 +25,7 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext"
 
 src_prepare() {
 	default
@@ -52,11 +52,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	gnome2_schemas_update
 
 	if ! has_version app-dicts/kasumi; then
 		elog "app-dicts/kasumi is not required but probably useful for you."
@@ -64,5 +66,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_update
 }
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 26ba9cd6754c..36c06a89af65 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-hangul-1.5.1.tar.gz 460517 BLAKE2B 913d0d8b8995fac3cd73ca40280761d5bf44f35134cb7e73075c233f9c1ef5aa00bb7d7b8da20a69273cd0eb8202b9deb409e1b8d1b6ebbeccccb5f0ef98d341 SHA512 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec
 DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
-EBUILD ibus-hangul-1.5.1-r1.ebuild 921 BLAKE2B 0b9f3d9c07594dd3598c3a04eda66ecfbabbbb000ea801fc1d46ec964a18bd1d1160a71cc24f8a5cadd483ff26499dce9ca3528c99244262b2501d17828af02d SHA512 c88bbf13ee0a04602d805cf0115db5bc9e1c0ed7dc96f024b6608d9ba71b008d73ee99deb89d9dd70119b141b577c1409461025cf2589eec9e0af60232abe393
-EBUILD ibus-hangul-1.5.3.ebuild 908 BLAKE2B a1039fa2a166dbecb6b104b7e3b3adc58b2107d66a44d0a19f314f3d3f8f294d7b907620ad08388175899b69d9ced68e6bc28f0cff0af47811dd4fd297c8cffd SHA512 05bf2c00cbee52ea4b57fd4ed74effd97c68210957456794c25a30f533238a1ab923a8b01e5ad1e77f45c31c553a99c94fcee73fee412c3d657674e65b0fbbae
+EBUILD ibus-hangul-1.5.3-r1.ebuild 1001 BLAKE2B 7d007bf60bb77d245c2121e987e72e87037527b60060dc89bbb23b500c9fc0d06d0c6005a16207fc7a2cb01d321a34f0d3b17e07b9a086ed664ac51a43865c06 SHA512 d400092fc0c62f43064227fca1d815a4ea19b66588c92d3294f3dda9465b59fff8997ea2a70f47df3230fd13e4defe0c990a777a896a0d81e0484a9e95cde5c4
 MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
index 87d78aa62e74..6d04d1fec63d 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2-utils python-single-r1
+inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Korean Hangul engine for IBus"
 HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
@@ -23,10 +23,9 @@ RDEPEND="${PYTHON_DEPS}
 	')
 	>=app-i18n/libhangul-0.1
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
 
 src_configure() {
 	econf \
@@ -34,10 +33,17 @@ src_configure() {
 		--with-python=${EPYTHON}
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_update
 }
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.3.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3.ebuild
deleted file mode 100644
index 393fcb686cec..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome2-utils python-single-r1
-
-DESCRIPTION="Korean Hangul engine for IBus"
-HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
-SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=app-i18n/libhangul-0.1
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-python=${EPYTHON}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index b21f679f8e7b..a131fb814fb6 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,6 +1,5 @@
-DIST boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 55907 BLAKE2B 16ac81094457c80b418109104139c1604e38ec58d6065474cc512668601f12896c4d470fe15c9a366a5ec63d50135265df71f28f4202fa283231879fafb0efbc SHA512 382c7f8a94059ae9816783b12c2d27ee6ca69e23ef7085bf2ee5a31109e6ab0c3d0b0042a3dc290b89276b6315d767aedf073dca390fa688a9aae07e837f83c9
-DIST ibus-libpinyin-1.10.0.tar.gz 1693440 BLAKE2B 5e0d9debddfbb81fcb45ac86d1fe8fb1220a50c527222fb3c3431149231f41dcc59ae87da9ae9485e2585f0e3051ac4d1792407ba62d90e5e0323c482d52318f SHA512 c9fdc28562714bddc889805e1d439a7dd425f721a8236b8f8ec4727ce24e5053693b3e5bd9b06ced22ceb66bc7621715f7ee52e00af3b8b113503a5ce6963ca0
 DIST ibus-libpinyin-1.11.1.tar.gz 1728202 BLAKE2B 6e2273c4ff1be76bb8b0e65b915e039c0a181981d20ed94662184e161e8639ad3d548de981d7bbae950ab8b5019bedaed9593e03282e2f9d207f831929d422bc SHA512 48691952a10f4ab545d8e233dc3cd75fc54270c03a687820048152636df26d233ee0fba89e4ec2ccd5a6e410b41e556872e3dd2468d59d44b3440e904b93528b
-EBUILD ibus-libpinyin-1.10.0-r1.ebuild 1535 BLAKE2B ba5b503f5c0724adc46ed8c63bed0486d880a881a968da41d613185b2182a077cc5ab98c7d82ba61ea4ff35cf928ae3bd045757f9fb8916aabdd9aab75723af2 SHA512 d490ea04593c0eba188b3fb4c0fdf7d93a962b91fa0a15e5bda13da12e1032ea97be1292ea4145d30ecbce6e2176e3a3358da3db5f6052d3698ed1fa76fc9c4a
-EBUILD ibus-libpinyin-1.11.1-r1.ebuild 1235 BLAKE2B 9503b44dc768975032afc2efb7a744f65a184bc7240448484a0bc758e357354c7bd8f0b3f3cd27a7a6f1f53fbb6db7d9d96da8507a765582cd6a646cf0826e0b SHA512 7a42024472def6263fe9668bfb172bbb74c667e7eea98a5aff49d33137e4618614eca7f41ba26e018b8cce6b67c50355661658b22d616a574ac029998ea4cb57
+DIST ibus-libpinyin-1.11.92.tar.gz 1730065 BLAKE2B 376bec6fa7616364c8ed4dc5b269edabda892ba4759ff03e93b4099c99440925126800ea3bf11eef91ea62c558fa7dbf05f3d68be5e25e701aaaeb37618b90a8 SHA512 b875b2fed6875806971b91e2abc62cdab1f70baef78840915f89466a7bcf3d1dfc70438ba85e7580bba92dec0ade50a2b05955fe6cd148bffd3888fa69f1c851
+EBUILD ibus-libpinyin-1.11.1-r1.ebuild 1233 BLAKE2B 9b1587e1c4d5b1d48e2f7d4f1ab3638146b051930ae9cddc0dacbca7e649831932991d214861bb961504d7d1cd113873a63b2fc871ca74498332a723a7d9faf3 SHA512 197112d524a17ef36f8d1ff1d3b89ffef0ae06c00238d6e385232af98dd3d4251fb79fdcc67f12e1f161f32e089ccf673e1a457e73bf5076972f3d470715dc92
+EBUILD ibus-libpinyin-1.11.92.ebuild 1239 BLAKE2B 62defde979d60c4433dbb2dbaa004d9cb978859d7ed4ecbcc5d42aeab5bbbc80fa8fd38d37c293ed94a418234c845aacdfeba605a4a2b42d235b62247d1934fe SHA512 953af51dee5887b986afccbdd59e79e0efdd7ae98f2239e12c163b31eebc517b3faed7000b52dc5daca88b17b090696d88c402efbd4dac7ea7e436bc75065983
 MISC metadata.xml 807 BLAKE2B 864c61e2dac53fc0b95541bf79e8f27a183f879bab95574f7cf462bfe276c89c8a5d2b65c899f4734c487feff1113a20ee02debd48b4ff955a24ace70ed5006e SHA512 c92e0e2c47a1272285c3a36cfc18c739df2a69dc911a8849cdc9c517183309908fdae894e88ed7511645b1c90c3611670b046f1a2c7c48fd0ff7c79d2de0a5b0
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
index 280d6386f779..6975e7f0c49f 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="boost lua opencc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92.ebuild
index 3d7dd517debe..8a889ffe9868 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2015-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite(+)"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit autotools gnome2-utils python-single-r1
 
-BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
-
 DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
 HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
 SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
 "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="boost lua opencc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+BDEPEND="dev-db/sqlite:3
+	virtual/pkgconfig"
+
+DEPEND="${PYTHON_DEPS}
 	>=app-i18n/libpinyin-2.1.0:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	virtual/libintl
 	$(python_gen_cond_dep '
 		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
@@ -32,15 +34,9 @@ RDEPEND="${PYTHON_DEPS}
 	lua? ( dev-lang/lua:0 )
 	opencc? ( app-i18n/opencc:= )"
 
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	if use boost; then
-		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
-			|| die "copying newer version of boost.m4 file failed"
-	fi
 	default
 	eautoreconf
 }
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 5aced37d4416..d3934175abc4 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-m17n-1.3.4.tar.gz 436687 BLAKE2B 66c1138101b1c3634ebeef4657ef9d4accb30e9db0047d7232d1c25a5d061e705fb1f1bd2800c951baadeddf999a4eb24a581d59e261df4fd68d23b29ef3c530 SHA512 9e9bc290b0f0d68558d408f6e69aa3bd9bb767db827a95839b576b58c7a5056dedcbd9b0bf1aab5e26ab21e601acd67a53404a5fd54b436efaf2a706489f25c4
-EBUILD ibus-m17n-1.3.4.ebuild 754 BLAKE2B 6564070e8d07b4ea14b9272785c12610d061ef05c88c3427fe37b4dbb2a6ff4c0bf6216d77453cc3789d4f7349a7d2a8106d66f4cb9b160aefd84a03492123df SHA512 ee3ae78bc8aede6146d9d5460ee053711927db126f7cdcbf090f73c41bc840aaae455e5be683222a5ec95b50cde3e67125c3a8da6c204c302099efd6e2e2bc46
-MISC metadata.xml 706 BLAKE2B 26b96ef11039182056e63f34f5bfa5f105e3eff9cd996aabaf0fde26bc650b51e1a176f700c7189cc568310c1ea6f8ef15c0316801526b3556142a0473731736 SHA512 b5da8f8cf77fe9028b052e0a546667342116e16c79ef044032443f30ff2814c5e534ee70b99419fbb509db2d4d755d570f8a8900a139594518eb7b6a5971b0f2
+DIST ibus-m17n-1.4.2.tar.gz 488603 BLAKE2B b916e1cc799eca2f042a0496a1184ccf32174eef1399f9ef7e3b7f3fc6ef2177514159706f1f4a4d696df136e7a5e7967af90ce0e1b4a021ac84e44973fe446c SHA512 5f865bd5d6dcd29828b14ea991effa6e883777173c48dd88cf676890dd2a980f95b3859b90fb44fb8cfe84df6da14335d3060605c4ce517f5eb179497a7b146b
+EBUILD ibus-m17n-1.3.4.ebuild 720 BLAKE2B 3298a1d7210d4352da864718e433f8492f7b00f5da58461d11edaccea1ca42791c9b3c3b4beaa22d59d270291367a3127d2b6c62cd69b66658eaa009f6426b53 SHA512 071d3c02802dadf2c135caab8772855de848caeb78ca31d8c6cc7d18fc23e6cdaaf945ec65d09796832266100bf4a4aa29b1ab08994a360a92a83be38323e773
+EBUILD ibus-m17n-1.4.2.ebuild 896 BLAKE2B b93209f806529562d0e9d9ab83eb21951dab9ed8ebdfd594ba0ea4aea0c6f205775b25f3079e3eccbf72418b4cfade4d7707dd5b55f07dff85949b49907abd00 SHA512 7fd515019c35c3e7edb1efc49aa9994e91ef2053635d1d6525171e6f290999aaf3573320fc3c4f7106302adc2121ee4967548a5976d8d101fabb2f062eec6b5f
+MISC metadata.xml 679 BLAKE2B a374aafbf949a9cb71906396787329ea1cd31775b29bf1675b30c98098e1025ee5e96dcdce2e8324bd6d3bfc05e854f89b1120a2e9410834a4dab767db1336b0 SHA512 c07286ebfb6f8bcf82c4fe6b5d02cf0a49287c7609daa42a356b8bfe7b3c074558d39d987decbffd15b10a33d475630b5f7194ff9941c9762c87dbcbefada953
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
index c17acb485e0b..e4d15371acb1 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="M17N engine for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="gtk gtk2 nls"
 REQUIRED_USE="gtk2? ( gtk )"
 
-CDEPEND="app-i18n/ibus
+DEPEND="app-i18n/ibus
 	dev-libs/m17n-lib
 	gtk? (
 		gtk2? ( x11-libs/gtk+:2 )
 		!gtk2? ( x11-libs/gtk+:3 )
 	)
 	nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
+BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
 
 src_configure() {
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
new file mode 100644
index 000000000000..ed8610ca2b2e
--- /dev/null
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit gnome2-utils xdg
+
+DESCRIPTION="M17N engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk2 nls"
+REQUIRED_USE="gtk2? ( gtk )"
+
+DEPEND="app-i18n/ibus
+	dev-libs/m17n-lib
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index 905cdaedd1a9..481dbcd8c9d1 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    The M17N engine for IBus. It allows input of many languages using the input
-    table maps from <pkg>dev-libs/m17n-lib</pkg>.
-  </longdescription>
-  <use>
-    <flag name="gtk2">
-      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
-    <remote-id type="github">ibus/ibus-m17n</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		The M17N engine for IBus. It allows input of many languages using the input
+		table maps from <pkg>dev-libs/m17n-lib</pkg>.
+	</longdescription>
+	<use>
+		<flag name="gtk2">
+			Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
+		<remote-id type="github">ibus/ibus-m17n</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 643a120e1b3b..422d0e0808aa 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-2.8.0.tar.gz 8018809 BLAKE2B 9306b980623094a8b72d6824292d8d52a90df69b7f1f7df11c0df63c5d2c4f2aa1ca4e2765320096915b30cc807fbe24f64a219c3beb1bec4a1d81be4511779a SHA512 64c112275ec63ac3d3c13202256be8bfded152da7b08dde7e6eb01dd38fd48535d63daaa6c2fcc09e64dcd4927931380ccd0a0be739f04330fb15dc0d4fe1823
-DIST ibus-typing-booster-2.8.2.tar.gz 8161995 BLAKE2B 79c7bacb7c5a07139c710ddf063b58ed6bc15d1f58529dfaa0d8f1935cb513fe27ad5e95af0ca7383922f5642d1197cf74183ba2463a3fa81637add5d8376691 SHA512 3dffc21aae59ebc8c7b3ef3df588f958b4a42a2025dc6a82613e9bb1b324f8c999d01b8d98ed48794b3ea8fd5c3221df489a88f8c54c154a69be9908beda85b5
-EBUILD ibus-typing-booster-2.8.0.ebuild 904 BLAKE2B 2342c11d4ed30313c166d1860b16f1a9ad0fb93898290041a0ac5e9c1974c5210d29f6590b251ee72d6074b648357ae6f0e1a72b0af80d8d42e3a23f9c1759ed SHA512 eb48fb3e05cbea35d04bfd521d6b3d941c095e5b1a1446d204dd7fcd4cf6464d62e002eea446749177270b564abf9cad5a6dbd3cc4e311152f0eeaa1e3e89340
-EBUILD ibus-typing-booster-2.8.2.ebuild 904 BLAKE2B 2342c11d4ed30313c166d1860b16f1a9ad0fb93898290041a0ac5e9c1974c5210d29f6590b251ee72d6074b648357ae6f0e1a72b0af80d8d42e3a23f9c1759ed SHA512 eb48fb3e05cbea35d04bfd521d6b3d941c095e5b1a1446d204dd7fcd4cf6464d62e002eea446749177270b564abf9cad5a6dbd3cc4e311152f0eeaa1e3e89340
+DIST ibus-typing-booster-2.8.3.tar.gz 8184044 BLAKE2B 06b7bc3c39f8c135d5e6d2c90ceaa2df8c38041cb4cc7d583cc335bb3bbdbf4915a6bcb0fff80bbaae797e8bda74bed26077ab4739a8f9584ecfaade833eefbb SHA512 18cee36b5f5c3d6da1cb455e785317c0e2b9826e49e3b2655f4f7a3fce4bdd279ff24614083559996031876702879530799a709e196dc5d68345f0d942972dff
+DIST ibus-typing-booster-2.9.0.tar.gz 8191076 BLAKE2B 4b0e53679b907fce56361c60aed2d50f0ac3bef422f9c56b4b5ca8733734c0341f90dfbcf2a9db747a801d999a49198de2b091badf8efe141d22fddb9b35ec6c SHA512 33e0c53e3f16e312eee7db2395d0a5506150e60a47882a7531c9d082e0ca405aabd922b4774a507399d31f38feed78fb87a09efc5550f08dd3794703f1fab235
+EBUILD ibus-typing-booster-2.8.3.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
+EBUILD ibus-typing-booster-2.9.0.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.3.ebuild
index f22450c777f4..ed1abe745449 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.3.ebuild
@@ -5,13 +5,13 @@ EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite(+)"
 
-inherit python-single-r1
+inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Completion input method for IBus"
 HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
 SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -31,3 +31,18 @@ RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
 BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.2.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.0.ebuild
index f22450c777f4..ed1abe745449 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.2.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.0.ebuild
@@ -5,13 +5,13 @@ EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite(+)"
 
-inherit python-single-r1
+inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Completion input method for IBus"
 HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
 SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -31,3 +31,18 @@ RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
 BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
deleted file mode 100644
index c46f8f81b288..000000000000
--- a/app-i18n/man-pages-de/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST manpages-de-v2.12.tar.bz2 10242050 BLAKE2B fa497a6fce2c2387dad2ab9443584174d8d5fab530b94e0123e71286c588cb3a2e52aa96760dbfd6545bed013c460e1bf61eb4a5af0673bb84c1c0f0c960a357 SHA512 548d3dd500ce1eadc71365119e35072b71e3fbe36eba664d992e94897f442fb93f9397053f72363f83dff2e931d93e2af995976736d8513d11d7c42bdb471862
-DIST manpages-l10n-v2.16.tar.bz2 26569385 BLAKE2B ff5877a2a58e48fb7411559bbc22dae5918bda2d1fa38b5239bb6fc0561d85c44a276a491a368fee75ee26508f0128b5f4a5d0afe344321b4d4c653dd6a24898 SHA512 e534276b693c124a70a409ba9318a4a3e168c3d10c8e2837811f27d471ebb25eb4235eff9910cfc57624560fbc6273379a2d813b4a8cec2dd7ca1a0cd09ed78d
-EBUILD man-pages-de-2.12-r1.ebuild 1926 BLAKE2B fd7935fb04cd30a4f95ef605d07d8f7adafd27de1f49cb2556184cb3e31f37866642044812db1872f0d3096427254149f7e01390b11e63f1927e3e72fe6500af SHA512 e8d4f6faaf180952704e73f02dfcbae019793c6d4e850f4b01aa42934fe6a37a6400dd2c5aa854e421291074125724b752cb344c284c408b4fdee3444f6e276b
-EBUILD man-pages-de-2.16.ebuild 1439 BLAKE2B e7b8b5c572c04a6308faa4841b8e2125d5d3cec25c493148f5a7e117bb3d480cfd16e0cab46a88333e6ff948498e0d70e9de213afb7224adc431b2b67ef61033 SHA512 4518beb6324e3a658b4c610a763b3755e98f4c0ff9b2fef32ac37aa16b86291ee2f4b0f7eaad8eaa3fe3806fcbdc6b58541cd85d6e094311d8888a924b54eadc
-MISC metadata.xml 369 BLAKE2B 41170815bcde0a65831b0453eee7b99359594bc67d345e31d1228d6b5def740d73087b96473511a8249528ac16a80b0eeee91791f9d4f113cb5caed918b40552 SHA512 e36208b3689927021e51ad2348ba3f5a5598b9657ffd7156d928dc817b90ed91a57d43605eb8a3e2fde1caf04349ba76b68ebc7ead1061ecca66280095179658
diff --git a/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
deleted file mode 100644
index 32ea4ba3acfc..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN/-/}-v${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="https://salsa.debian.org/manpages-de-team/manpages-de"
-SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-BDEPEND="app-text/po4a"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	sed '/gzip --best/d' -i po/Makefile.am || die
-
-	# sys-apps/shadow has it's own translated man-page for this
-	local manpage
-	local noinst_manpages=(
-		upstream/debian-unstable/man1/groups.1
-		po/man1/free.1.po
-		po/man1/groups.1.po
-		po/man1/su.1.po
-		po/man1/uptime.1.po
-	)
-	for manpage in ${noinst_manpages[@]} ; do
-		rm "${manpage}" || die
-	done
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	local PORTAGE_COMPRESS_FLAGS_LOCAL=${PORTAGE_COMPRESS_FLAGS}
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)
-				PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-
-	# Fix source files for symlinks
-	local LINKSOURCE
-	case ${PORTAGE_COMPRESS_LOCAL} in
-		bzip2)
-			for LINKSOURCE in upstream/*/links.txt ; do
-				sed -i -e 's/\.gz/\.bz2/g' "${LINKSOURCE}" || die
-			done
-		;;
-		gzip)
-			# pass
-		;;
-		xz)
-			for LINKSOURCE in upstream/*/links.txt ; do
-				sed -i -e 's/\.gz/\.xz/g' "${LINKSOURCE}" || die
-			done
-		;;
-		*)
-			ewarn "Unexpected compression command ${PORTAGE_COMPRESS} found, symlinks will not work."
-		;;
-	esac
-
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES.md README.md
-}
diff --git a/app-i18n/man-pages-de/man-pages-de-2.16.ebuild b/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
deleted file mode 100644
index f802bbdaabd6..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="manpages-l10n-v${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="https://salsa.debian.org/manpages-l10n-team/manpages-l10n"
-SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-BDEPEND="app-text/po4a
-	dev-lang/perl"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# some packages have their own translations
-	local noinst_manpages=(
-		# sys-apps/shadow
-		po/de/man1/groups.1.po
-		po/de/man1/su.1.po
-		# sys-process/procps
-		po/de/man1/tload.1.po
-		po/de/man1/pwdx.1.po
-		po/de/man1/uptime.1.po
-		po/de/man1/pmap.1.po
-		po/de/man1/pgrep.1.po
-		po/de/man1/free.1.po
-		po/de/man5/sysctl.conf.5.po
-		po/de/man8/sysctl.8.po
-		po/de/man8/vmstat.8.po
-		# app-arch/xz-utils
-		po/de/man1/xz.1.po
-		po/de/man1/xzdiff.1.po
-		po/de/man1/xzgrep.1.po
-		po/de/man1/xzless.1.po
-		po/de/man1/xzmore.1.po
-	)
-	rm "${noinst_manpages[@]}" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-compression="none"
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES.md README.md
-}
diff --git a/app-i18n/man-pages-de/metadata.xml b/app-i18n/man-pages-de/metadata.xml
deleted file mode 100644
index 71052039f476..000000000000
--- a/app-i18n/man-pages-de/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bureau@jonglieren-jena.de</email>
-		<name>Markus Oehme</name>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-i18n/man-pages-fr/Manifest b/app-i18n/man-pages-fr/Manifest
deleted file mode 100644
index eb5b1d1db9a2..000000000000
--- a/app-i18n/man-pages-fr/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX man-pages-fr-3.70-r1-fix-unpack.patch 701 BLAKE2B 7ad8cc9877f8bc0a206258e4ff661e5df7176e4acce6e0130eb1ee5773f5f54c78dc7482b35546d85e6766a493e162fa76afa219958001934f84faf0367cb326 SHA512 9d98710f0005ae6e37c081c007988900a744390ed91ef11b2fa35f845a526f8361bf2a95029d92eebe581b59c68e63ce00a5593042164b54f3e1086ec09d4c22
-DIST man-pages-3.70.tar.xz 1266044 BLAKE2B 00aa14ac7c9aafb9883713c4d13fe9318cf10cfe844663226bcd374b0a77b8b8a60cefeada7ca058f9d4e8b4e1056f4c8c6d762f46507f08f454bbe450f49fe3 SHA512 3e5590fe5181a914bb49531b7786eefc9d13d1ce1e3a80b09500dfc31a7fa01543f36c44484194613d2c87b840e4bdd9774eedc67251d3378014698078cb3ca3
-DIST man-pages-fr-3.70-1-r1.tar.gz 4669973 BLAKE2B 2fd32c5e922f8d74dbec74724c9acb8f5fdc0fd7a88f4687465713b22ddee5589b4a54383bdf14eb76076538e9d28a20ffdac2415c521b21e21f5186606121d6 SHA512 002ca3b7066437ce3a42f9c0396940ffc8593d2acdd05a3150c54b8d1f272ef6a448a18e6f3de0f90ac6eb4e616c132eb4e11e3e052b2e6f83a820a7d56f32d1
-DIST perkamon-man-pages-3.70.tar.gz 24292 BLAKE2B 60848a93d95c1eedc50b10a4b8cfd68c3847ae5e6d13de06058f1c89218d953f68f5428fe3d422c11078f80a5bcb678abd51388b6ee4ea20c2db2e9a87fc51e6 SHA512 648f16c958d1ed5933da1e971f94391761cad94414eb4d0d3eee612f9cabef3a56f07c5f83b72be3f98d49a9956d3ccceb1568ea76572f6d4a6fb8b50a8225a5
-EBUILD man-pages-fr-3.70-r1.ebuild 1207 BLAKE2B 8a7ef9c4b44e116871e08b35895861dfbe0c88987db25ee8e8ebdcaee97fad692819cd92f7f5eb4ba7b4a0b6349f26bdc9e1f917bf279a481d3cf73119e45a76 SHA512 48fc118b6776326798ac40abaf8c482b59d8c6fc20a2ff2966672a444549c4d61c8fe1750a396336911764c2277227373442c53bb3f6e7b0f035af455742a79b
-MISC metadata.xml 546 BLAKE2B a22dfeb81d1ca03f415767c7666bf5575e9c6bffb6a12b7f75b3c1921c05f21d7cd2eac020facc5b161ca89204d6d1d64b47e7436b577dbf2939b0799820cca6 SHA512 dcda3faede9782291b4ee3a1022434bea5c1807fe1099f84f3869f6d4276a918fb0eefef6879db96497d1106deb490d0a993dd5636d36b4e7455f71b6b809c17
diff --git a/app-i18n/man-pages-fr/files/man-pages-fr-3.70-r1-fix-unpack.patch b/app-i18n/man-pages-fr/files/man-pages-fr-3.70-r1-fix-unpack.patch
deleted file mode 100644
index 8d24981fc260..000000000000
--- a/app-i18n/man-pages-fr/files/man-pages-fr-3.70-r1-fix-unpack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.old b/Makefile
-index a4e4285..b3b3690 100644
---- a/Makefile.old
-+++ b/Makefile
-@@ -39,7 +39,7 @@ stamp-unpack-git:
- 	touch $@
- 
- setup: stamp-setup
--stamp-setup: stamp-unpack
-+stamp-setup:
- 	$(MAKE) -C perkamon setup
- 	mv perkamon/build .
- 	touch $@
-diff --git a/perkamon/Makefile.old b/perkamon/Makefile
-index 3a3aa32..57e532c 100644
---- a/perkamon/Makefile.old
-+++ b/perkamon/Makefile
-@@ -99,7 +99,7 @@ stamp-unpack-git:
- #  Prepare sources for being used by po4a.
- #  This target is called once after manual pages are unpacked.
- setup: stamp-setup
--stamp-setup: stamp-unpack
-+stamp-setup:
- 	-rm -rf build
- 	mkdir -p build/C
- 	for i in $$(seq 8); do mkdir build/C/man$$i; done
diff --git a/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild b/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
deleted file mode 100644
index a3c05f2063e3..000000000000
--- a/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV}-1"
-DESCRIPTION="A somewhat comprehensive collection of French Linux man pages"
-HOMEPAGE="https://traduc.org/perkamon"
-
-SRC_URI="
-	https://gitlab.com/perkamon/${PN}/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.gz -> ${PN}-${MY_PV}-${PR}.tar.gz
-	https://gitlab.com/perkamon/man-pages/-/archive/${PV}/man-pages-${PV}.tar.gz -> perkamon-man-pages-${PV}.tar.gz
-	https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-${PV}.tar.xz
-"
-
-LICENSE="BSD GPL-2+ man-pages"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="app-text/po4a"
-
-RDEPEND="virtual/man"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PF}-fix-unpack.patch"
-)
-
-src_unpack() {
-	unpack "${PN}-${MY_PV}-${PR}.tar.gz"
-
-	cd "${S}" || die
-	unpack "perkamon-man-pages-${PV}.tar.gz"
-	mv "man-pages-${PV}" "perkamon" || die
-
-	cd "perkamon" || die
-	unpack "man-pages-${PV}.tar.xz"
-	mv "man-pages-${PV}" "man-pages" || die
-}
-
-src_compile() {
-	emake translate
-}
-
-src_install() {
-	einstalldocs
-
-	doman -i18n=fr build/fr/man*/*
-}
diff --git a/app-i18n/man-pages-fr/metadata.xml b/app-i18n/man-pages-fr/metadata.xml
deleted file mode 100644
index 673d3ce10a31..000000000000
--- a/app-i18n/man-pages-fr/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>beatussum@protonmail.com</email>
-		<name>Mattéo Rossillol‑‑Laruelle</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<name>perkamon</name>
-		</maintainer>
-		<remote-id type="gitlab">perkamon/man-pages-fr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/man-pages-nl/Manifest b/app-i18n/man-pages-nl/Manifest
deleted file mode 100644
index 925b2f99746d..000000000000
--- a/app-i18n/man-pages-nl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST manpages-nl-0.13.3.tar.gz 303975 BLAKE2B 645447f850f9b6621e190629892b5caef566e718052cea226584cf0ce6990bb8155080f19ceb45f86aee22b09730d3e1167a5ed02ebdf725867a48cdc6df03bd SHA512 2fe12911105366e3355a46f7da988ccb888ada5f20760a4651dd34a7dcb354e85796ca70f54c06b921dd7fffc7b5c9141b4a09b0a53bff383540621652e59591
-EBUILD man-pages-nl-0.13.3.ebuild 518 BLAKE2B c182d3f10cfc3bd417fd14238aa2496056b15c961a3abf5651a42933cfbbf9a6983e7c4b25cdb18330bde4a95d27732a297eeb4f97509200731dfd0e0a86b396 SHA512 db3356395e077ba014e24b6ce9fed4b18fdea09af5d6aee09d72814201b922b313878c761743848509214b9aa2479db1d37d866336bbef9cbd0e4eb12f9a4e42
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild b/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
deleted file mode 100644
index 2999045c7ce9..000000000000
--- a/app-i18n/man-pages-nl/man-pages-nl-0.13.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A somewhat comprehensive collection of Dutch Linux man pages"
-HOMEPAGE="http://doc.nl.linux.org/MANPAGE/"
-SRC_URI="ftp://ftp.nl.linux.org/pub/DOC-NL/manpages-nl/manpages-nl-${PV}.tar.gz"
-
-LICENSE="man-pages GPL-2+ GPL-2 BSD LDP-1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-S=${WORKDIR}/manpages-nl-${PV}
diff --git a/app-i18n/man-pages-nl/metadata.xml b/app-i18n/man-pages-nl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-i18n/man-pages-nl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-i18n/man-pages-pl/Manifest b/app-i18n/man-pages-pl/Manifest
deleted file mode 100644
index 12ecf53c3aaa..000000000000
--- a/app-i18n/man-pages-pl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST manpages-pl-0.7.tar.bz2 3791061 BLAKE2B 81809280c78ecafc67c59a5353a589c119fe6b590c9d655dae4accb5247a178df9f3f186822834f3426b0d41ed9ab83f335204eb654acf2cf5a472dd7ca4cafb SHA512 79293e1bbfbaed5f97e63cb86fc1b445ea960fdee96567899ba9f6836d4188e0d80d4788180c29fdca3d358359b6fd3768c195857657819534942ece2c43694b
-EBUILD man-pages-pl-0.7-r1.ebuild 774 BLAKE2B ba82a8059064d61ce8f433d25abe00a000fed83857c0f6c4ebfdaa40e6af2bb494e995161125bd99f249c5729aa2cd37216719da95257b462f6711adec3c213e SHA512 bcf6069555e7de2c7ab39b77ab677eedb68bb8cf28f1376e9fabb5d51cf51b932025542617de654a4886adc0879807d1bf5e8c17e04019a5710074e02e2706d2
-EBUILD man-pages-pl-0.7.ebuild 729 BLAKE2B 34d969250f694f90d47fff4f8bc89883f3aaca376436adf7174c0b15013e79ebad574bdbad399413f3d3d2c15e3ea260b0f1d5d84b6e9a28a552677e324992a5 SHA512 c519003af9d0433ed0e17cf793726ea79dfaadc1d9a3cee37f96e600c78e3c9fe41b361586067cbff87afd1878dc50cae5f664c68c7e7406fe70e1467188233e
-MISC metadata.xml 447 BLAKE2B e8f0a2348cf7a9937b9aeaf647ed1da769201f131b377f965ac3965ee0d86a5fec00b61b804f4145e0c31c274a850481f756c8510e6ed49a951d533a94a427ce SHA512 ce47231649316f102bc2b2318d51b548efd9159b3c2df9edfc0e17dda5710cac2a39c1cd86961d842f627c4b6b83fcf32da0b6194518109b7fd69355ec337f54
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
deleted file mode 100644
index 822ed83e0f5b..000000000000
--- a/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PKG=manpages-pl-${PV}
-
-DESCRIPTION="A collection of Polish translations of Linux manual pages"
-HOMEPAGE="https://sourceforge.net/projects/manpages-pl/"
-SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-DOCS=( AUTHORS README )
-
-S="${WORKDIR}/${MY_PKG}"
-
-src_prepare() {
-	default
-
-	#mans provided by other packages
-	rm generated/man1/{free,groups,uptime}.1 \
-		po/man1/{free,groups,uptime}.1.po \
-		|| die "Failed to clean up duplicates from build directory!"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" COMPRESSOR=:
-}
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
deleted file mode 100644
index 6d996a06feb0..000000000000
--- a/app-i18n/man-pages-pl/man-pages-pl-0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PKG=manpages-pl-${PV}
-
-DESCRIPTION="A collection of Polish translations of Linux manual pages"
-HOMEPAGE="https://sourceforge.net/projects/manpages-pl/"
-SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-DOCS=( AUTHORS README )
-
-S="${WORKDIR}/${MY_PKG}"
-
-src_prepare() {
-	default
-
-	#mans provided by other packages
-	rm generated/man1/groups.1 po/man1/groups.1.po || die "Failed to clean up duplicates from build directory!"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" COMPRESSOR=:
-}
diff --git a/app-i18n/man-pages-pl/metadata.xml b/app-i18n/man-pages-pl/metadata.xml
deleted file mode 100644
index 0023617aeee6..000000000000
--- a/app-i18n/man-pages-pl/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>yoshi3@autograf.pl</email>
-		<name>Marcin Kowalski</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">manpages-pl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 44bd33cb9568..ff8f73bc0f4f 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,10 +1,9 @@
-AUX nkf-2.1.3-strip.patch 328 BLAKE2B 8cf9585ce7285ab5227bb5ace9d92fa559e5cee377b665e76792bd0d921ab8c638a60bdab1510879dbbc2dc4ac131fcd7e9d6ef7f525a02d44cbcbaa6b5a3db1 SHA512 a23bf0164bcf765f3b846a564c55bd783362e6f84b6f582d4d84b5ec8b711ca07d23d104ef5de2e84de5d6754b064034736ecadc5ceab6bda9ad59f00f2f527d
-AUX nkf-2.1.4-python.patch 285 BLAKE2B 439d4009b56cd6469fc7d717b91bf0b89fcbf275d87081359eeb7ade447c76261465703ba33836b9d9a87b4da482dd9cea8bdd46818a43a0b27eb4e7182ae371 SHA512 4c9bc8468656ffb09033f6564775686e1bc2bc99c8e4856c7f38de87b4c3c842bdf6798924ea97a5da2b1b697d7aaca62556c836d122dd496e278b223c3d48f3
-DIST NKF_python20090602.tgz 2318 BLAKE2B 54399912fce0f4486e4051825319294a214089a59fa9b40e93bdc77859e79e5586abf2d197511cb158b094663993a692c981885e9db8fe260a5a746771168509 SHA512 3baee969daaba43e7ddee0d3b6d3d73ed67cfb0a3c3cbdabcdcda9fa1e61ccf374cd686ee096d031c3c48541c6be6daacf82e3b05885de63b88344d137c306d9
-DIST nkf-2.1.3.tar.gz 195020 BLAKE2B 7ffd2acdc16d98cfe1e7a73ff5999756a1c46e5dbbbf349d296f11526c077c42a64b1657d3a6bf8bee1326768ec06fe9d2aea02e5f8ba02e77626bb1316d1484 SHA512 e40798d4084657b545bdaa9904229b0a424a9be076c16993b97d206c3e82490c45288eaab417c6eea70b770f89530f90e98e1a659f8f7e4b928eea4396d1e738
+AUX nkf-2.1.4-test.patch 145 BLAKE2B 8e8fc2069b8f2fc039cd4bb791c90f37eeb17d26289ca485998530c7ae400e1d4b4ad5d188a2550b42881ff1e85000c0c80034ecc8642f8a53ca1c9d8f029d8c SHA512 c5086a135667440ac289079f401ccf674110db88d0c170652caf9ad5ad341513737c42cf01481b468fbcbf612f250cd0fa5c734a625c66cfdd5702a295707efc
+AUX nkf-python.patch 285 BLAKE2B 439d4009b56cd6469fc7d717b91bf0b89fcbf275d87081359eeb7ade447c76261465703ba33836b9d9a87b4da482dd9cea8bdd46818a43a0b27eb4e7182ae371 SHA512 4c9bc8468656ffb09033f6564775686e1bc2bc99c8e4856c7f38de87b4c3c842bdf6798924ea97a5da2b1b697d7aaca62556c836d122dd496e278b223c3d48f3
 DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca50e1fbeef7be4f50af9ba9b64ef140163e325e57c351dd384ee8b09849bad7c37b03d48a9cb4b88f2ee199 SHA512 8667c20a6c5e9c0c6df7ebe2571bcf24090f04dafd306d32f07312acd659ea026a91d31521b4b213f77aba8218159effd73607d0b7236b7287e4a4cde8cc62b9
-DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
+DIST nkf-2.1.5.tar.gz 215879 BLAKE2B b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5acb64bfba48881555931eade5fcb772e7956a7401399008ec33bd57c8d6d8b5790eefe4d69d4e1dabed7c SHA512 fa5b683184481b25249872e7902033a72b6a6219b4c63d508a738710029430733e78cfa13b3d69dc281676762765e0452c92244a3855d3acbb5e23aa63214847
 DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
-EBUILD nkf-2.1.3-r2.ebuild 1684 BLAKE2B 8d163de8197a52c0ad0054d14b8899cd6f05f4ac0468318d58a345b0afcfaf1c4ad36ad028686b42a568022226c45124e9f022e421136757edc001c1f8831502 SHA512 1ecddea3aef41246748bda0b999afbf3b0acaef17c02f4dbd6d8a36b41a0cfff1669b871f5b9f69f5924c898ee7c1674e9ddca76e336b95709835468c808e147
-EBUILD nkf-2.1.4.ebuild 1787 BLAKE2B 290bdfbaeeeb51ebc69f74843ccb1724e879941c713a09caa7843f66fe4e752ce18e081cf2836ec7821d4c249f68a86c000f2cd9d4a7477c5382a540894a7b39 SHA512 7b5444e0a3da445f58627ebbbefb88b1d60571a2ec4b7664571507b2ffcbe752f6d1d7dd604e62f4152a4a1a68a0e3ef5983f0c2de4f6a6bb424362fdd56a8c8
+DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d SHA512 ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
+EBUILD nkf-2.1.4.ebuild 2284 BLAKE2B d1f140750fe2115ec9db10d9800b80506c4c6e6f40bb7abaf0db0ac06a557554587db35affd02bc21d7c0efe2b648db67149d4eadb9afae92c3c3a07d66a4950 SHA512 918615a41b12f6db0a6801087e95369eeb13fb206115f74b71c97b7d4b43276260483d1af65ce82732eb71767cbcf5e1b71ebe8cd02e395f8d29d282526b1c48
+EBUILD nkf-2.1.5.ebuild 2246 BLAKE2B 480d9cfffaac6349a9e1282db886741d13a48f130c0050d2a50a134480b511080aefb8b87fd5609ebe59cec6ac78e2c4df499c17f1e195284f70092b0247cb53 SHA512 c4fd73ad50bbfa01baadf62969871e3badbfeb8307855d38e6bcd2b6c4e93b0c9127630d758f992c16fc5c295912385c6577636d364525de2e938a879130d272
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/files/nkf-2.1.3-strip.patch b/app-i18n/nkf/files/nkf-2.1.3-strip.patch
deleted file mode 100644
index 5cfac8820f82..000000000000
--- a/app-i18n/nkf/files/nkf-2.1.3-strip.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/NKF.python/setup.py
-+++ b/NKF.python/setup.py
-@@ -8,5 +8,4 @@
-        author="Matsumoto Tadashi",
-        author_email="ma2@city.plala.jp",
-        ext_modules = [
--               Extension("nkf", ["NKF_python.c"],
--                         extra_link_args = ['-s'])])
-+               Extension("nkf", ["NKF_python.c"])])
diff --git a/app-i18n/nkf/files/nkf-2.1.4-test.patch b/app-i18n/nkf/files/nkf-2.1.4-test.patch
new file mode 100644
index 000000000000..26964ef4d64b
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.4-test.patch
@@ -0,0 +1,11 @@
+--- a/test.pl
++++ b/test.pl
+@@ -120,7 +120,7 @@
+     return;
+ }
+ 
+-do "nkf_test.pl";
++do "./nkf_test.pl";
+ unlink "nkf.in";
+ unlink "nkf.out";
+ 
diff --git a/app-i18n/nkf/files/nkf-2.1.4-python.patch b/app-i18n/nkf/files/nkf-python.patch
index 6f9e2e687e07..6f9e2e687e07 100644
--- a/app-i18n/nkf/files/nkf-2.1.4-python.patch
+++ b/app-i18n/nkf/files/nkf-python.patch
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 25f4cbcc3d49..a470fb8bf853 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
 
@@ -10,14 +12,29 @@ PY_P="python-${PN}-0.2.0_p20141211"
 PY_COMMIT="000915e115acac57a1fdbceb1e6361788af83a3d"
 
 DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="https://ja.osdn.net/projects/nkf/"
+HOMEPAGE="https://osdn.net/projects/nkf/"
 SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz
 	python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )"
 
 LICENSE="ZLIB python? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
 IUSE="perl python l10n_ja"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
+src_unpack() {
+	use python && vcs-snapshot_src_unpack || default
+}
 
 src_prepare() {
 	sed -i \
@@ -26,7 +43,10 @@ src_prepare() {
 		Makefile
 	if use python; then
 		mv "${WORKDIR}"/${PY_P} NKF.python || die
-		eapply "${FILESDIR}"/${P}-python.patch
+		eapply "${FILESDIR}"/${PN}-python.patch
+		cd NKF.python
+		distutils-r1_src_prepare
+		cd - >/dev/null
 	fi
 
 	default
@@ -39,6 +59,11 @@ src_configure() {
 		perl-module_src_configure
 		cd - >/dev/null
 	fi
+	if use python; then
+		cd NKF.python
+		distutils-r1_src_configure
+		cd - >/dev/null
+	fi
 }
 
 src_compile() {
diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index ee2518acd6d2..718622f52d28 100644
--- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -1,33 +1,50 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
 
-inherit distutils-r1 perl-module toolchain-funcs
+inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
+
+PY_P="python-${PN}-0.2.0_p20191121"
+PY_COMMIT="c2c6724714b66f295137c8818dae4c09fc09e0a3"
 
 DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="https://ja.osdn.net/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
-	l10n_ja? ( https://dev.gentoo.org/~naota/files/${PN}.1j )
-	python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
+HOMEPAGE="https://osdn.net/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
+	python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )"
 
-LICENSE="ZLIB"
+LICENSE="ZLIB python? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
 IUSE="perl python l10n_ja"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	use python && vcs-snapshot_src_unpack || default
+}
 
 src_prepare() {
 	sed -i \
 		-e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
 		-e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
 		Makefile
-	if use l10n_ja; then
-		cp "${DISTDIR}"/${PN}.1j ${PN}.ja.1 || die
-	fi
 	if use python; then
-		mv "${WORKDIR}"/NKF.python . || die
-		eapply "${FILESDIR}"/${P}-strip.patch
+		mv "${WORKDIR}"/${PY_P} NKF.python || die
+		eapply "${FILESDIR}"/${PN}-python.patch
+		cd NKF.python
+		distutils-r1_src_prepare
+		cd - >/dev/null
 	fi
 
 	default
@@ -40,6 +57,11 @@ src_configure() {
 		perl-module_src_configure
 		cd - >/dev/null
 	fi
+	if use python; then
+		cd NKF.python
+		distutils-r1_src_configure
+		cd - >/dev/null
+	fi
 }
 
 src_compile() {
@@ -70,6 +92,7 @@ src_install() {
 	doman ${PN}.1
 
 	if use l10n_ja; then
+		iconv -f ISO-2022-JP-3 -t UTF-8 ${PN}.1j > ${PN}.ja.1 || die
 		doman ${PN}.ja.1
 	fi
 	dodoc ${PN}.doc
@@ -84,7 +107,7 @@ src_install() {
 		cd NKF.python
 		docinto python
 		DOCS= distutils-r1_src_install
-		dodoc README
+		dodoc CHANGES README.md
 		cd - >/dev/null
 	fi
 }
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index e2c9f64ee7e6..12692763a279 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,6 +1,4 @@
 AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37e37522a54883d06c954f2804ad4c04dfd3b3518fc5401ad5185e85a85a68d80e38dbbd728eef SHA512 1cfe95fdbf840b9fa43c980bb3f2e16fc6008714f8807650582ca906cb91ddd28b3b7b3c9f1325035e2c614d587d172071b2b7e3c6b30ca3128902b335773893
-DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
-EBUILD scim-1.4.17.ebuild 2538 BLAKE2B 3ca60959c635b3a69e751e15da5b37eaccc2c333b583e03cd74df4df6c77a3644da488e1cca0d94f6610c2100051555a285d2b04e395926e1aabe208a254c9b0 SHA512 64a44ba9cff1ba10d01c8bdaf72292f411d4aab33dff8c9125a21ff3995670d36b4bd091d7675d519deca1b4fb80e2c9e02aa11a8eee35148b1c21f6675c1486
 EBUILD scim-1.4.18.ebuild 2556 BLAKE2B e6314c763a236c56cb8dfd06d1dda577f64a4468b23e29230c76c9d47cb03fcc284daeebeb554c3455fbf6045138a0e366f13b665cbcecbbb6c2673b67ab4477 SHA512 8f2dd0f47e380e979dbe7d00db9965dbb271149635b86224a4458341910664455308b1d7b8d0b17984605430eaea32232ddbde026dc8e6ab8fc5c32a8d053147
 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
deleted file mode 100644
index 1365db6b815e..000000000000
--- a/app-i18n/scim/scim-1.4.17.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib gnome2-utils autotools qmake-utils
-
-DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
-HOMEPAGE="https://sourceforge.net/projects/scim"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
-IUSE="doc gtk3"
-
-RDEPEND="x11-libs/libX11
-	dev-libs/glib:2
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		>=app-text/docbook-xsl-stylesheets-1.73.1 )
-	dev-lang/perl
-	virtual/pkgconfig
-	>=dev-util/intltool-0.33
-	sys-devel/libtool"
-DOCS=(
-	README
-	AUTHORS
-	ChangeLog
-	docs/developers
-	docs/scim.cfg
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug #83625
-	filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
-	econf $(use_with doc doxygen) \
-		--enable-ld-version-script \
-		$(usex gtk3 --with-gtk-version={3,2}) \
-		--disable-qt3-immodule \
-		--disable-qt4-immodule
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}/docs/html/" )
-	default
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/${PN}.conf"
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog "export GTK_IM_MODULE=\"scim\""
-	elog "export QT_IM_MODULE=\"scim\""
-	elog
-	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
-	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
-	elog
-	elog "To use Chinese input methods:"
-	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
-	elog "To use Korean input methods:"
-	elog "	# emerge app-i18n/scim-hangul"
-	elog "To use Japanese input methods:"
-	elog "	# emerge app-i18n/scim-anthy"
-	elog "To use various input methods (more than 30 languages):"
-	elog "	# emerge app-i18n/scim-m17n"
-	elog
-	elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
-	elog "/SupportedUnicodeLocales entry."
-	elog
-	ewarn
-	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-
-	gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index 76242abb3772..39933c45b34a 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,6 +1,6 @@
-DIST skk-jisyo-201805.tar.xz 6133180 BLAKE2B 52408eb2f1fa5e5146fd4db55c249f80b5ede7d2ce1e7a3c11fb69507f87f86d778e25b04ce4e39dd241ea2d8000d829b34c47df991cb91f886923e330b652eb SHA512 13675502332609857b66391bdb9dc252b9f7a48814f6db10c60106b9cc3ce823df7615d77e0579d13b9d3da93dae2006cedc145d8dd80af39b9d4ecfe94373d5
 DIST skk-jisyo-201905.tar.xz 6198572 BLAKE2B a26e0be0406699424b24a8d1b004317b5d274fc02ed50ef6c4c696de8e039a6cfd7b34b292b7b7ecbdc2fee1950f6cc2a122ef457ba12f96972584560d3ac355 SHA512 db32fab5d5bf232838a3d502d4f648dde556381df9f96acec13d011274dedf5443676ce36324430dbe8cacb6a037e7bf70e72ef46b94fc6b57b9448e76aab38b
-EBUILD skk-jisyo-201805.ebuild 1346 BLAKE2B 754722d85b3b23412273542324d18f9896dbf44be1c1f16b0115ba3df8ae1c47e2435e6bfc0127571e06f9eae72e1bf3c24a776b878aba547967c063db82b1a3 SHA512 20ef913647bab0cc898f64564743545c982d235fd02288f8fad50e50af21510ab08bdc9742316c979b006d78df8ba1eca59ec7a1faf6d8cf67061396e172c238
+DIST skk-jisyo-202005.tar.xz 6836292 BLAKE2B 6d73e6d2e38de178c6683ae447b0ea79054036739b7a01fe386d677cc99556d37f47adf4156e1d571681195b85a2134cac710b12fa08df87e4fe5e5098289119 SHA512 7cc639b307d56d4cb5d04280a003ffa2cfb326f7821d70dddb619e117c1b8358417e44f8137de1b8027ec7f97df8bff8fba845019c015cf8c48ed5d91753155c
 EBUILD skk-jisyo-201905.ebuild 1338 BLAKE2B 29aeef80385bb3b2cc98e2ddbce82ccf02eac160c4d3969763ea41357075fa00e0efcb6aa29b8f20094377765bd0ef2bc4bf6d5f48a89ca8fbb37408977296f4 SHA512 86a5c1f7d692f98746b123daf5742b707c4c2e0afb2fc963eda39087d983bfe6e8543d390fb558e0a89701ec5d39b40dcad66203a12499f79275b839a620f440
-EBUILD skk-jisyo-999999.ebuild 1675 BLAKE2B b909d798fc8f06cb569fa6a38652b2b4af4e0b6c29739fc5c5f7c31e02b378d05d3dde328a22f1dfa9341fd6cba0b40fb5998fc80eb0be839e330f123055102a SHA512 ee18969559c73b008ecce1fb10c1ff0386de7049c74eecc09dc16e83da40a1b1bdad660095e7872050ae5a962df731df9ddfa701b7ab167aa301b1336640a273
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
+EBUILD skk-jisyo-202005.ebuild 1373 BLAKE2B 816d5f1d5af5e7fb4f5d8be9ae9975de735612e745cf5b730d6a6b2514005362b875db0232c9ae004e99865bfa5b04962d65d639f0d2d74b853198ad3d2a20b3 SHA512 58d922c3cc6502d4091c8570350dd607dd7a4ac187bf41f88084f5d07e82cdba0f2482573083f018c5771e673c8bc452328187c32797757385af624e9b9af101
+EBUILD skk-jisyo-999999.ebuild 1686 BLAKE2B b8c2a969ea50a520fc71e650bce78b592fd0b91ecee61f59238530d1a09fc1f3ee13f3c16b409f5ad850ee2c283b97de4b6f25aebb6e36f21a3a2e48fa1a502b SHA512 e5db18cd2aac54da50df591db378b3746bfe31d7bc09380d3330c5588b70d2e356098f42ce2801e60b1283a9c81a3aae456798f74bf436dc96b19f21db9066e8
+MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-i18n/skk-jisyo/metadata.xml b/app-i18n/skk-jisyo/metadata.xml
index e1a49f498885..6f2ca22da233 100644
--- a/app-i18n/skk-jisyo/metadata.xml
+++ b/app-i18n/skk-jisyo/metadata.xml
@@ -1,8 +1,8 @@
 <?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>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
index ccadac7decec..ab1e56cf1b19 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 MY_PN=${PN^^}
 
@@ -10,9 +10,9 @@ HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
 SRC_URI="mirror://gentoo/${P}.tar.xz
 	https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz"
 
-LICENSE="GPL-2 freedist public-domain"
+LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="cdb"
 
 DEPEND="virtual/awk
@@ -24,10 +24,11 @@ DEPEND="virtual/awk
 	)"
 RDEPEND=""
 
-DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt )
+DOCS=( ChangeLog{,.{1..3}} committers.md )
+HTML_DOCS=( edict_doc.html )
 
 src_prepare() {
-	rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
+	rm -f ${MY_PN}.{hukugougo,noregist,notes,pubdic+,requested,unannotated,*wrong*}
 
 	default
 }
@@ -66,5 +67,5 @@ src_install() {
 
 	einstalldocs
 	docinto zipcode
-	dodoc zipcode/README.ja
+	dodoc zipcode/README.md
 }
diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
index 2268f975ecd0..b0a562228fc7 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
@@ -9,7 +9,7 @@ inherit git-r3 ruby-single
 MY_PN=${PN^^}
 
 DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="https://skk-dev.github.io/dict"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
 EGIT_REPO_URI="https://github.com/skk-dev/dict"
 
 LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode"
@@ -34,7 +34,7 @@ HTML_DOCS=( edict_doc.html )
 SKKTOOLS_DIR="${EPREFIX}/usr/share/skktools/convert2skk"
 
 src_prepare() {
-	rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
+	rm -f ${MY_PN}.{hukugougo,noregist,notes,pubdic+,requested,unannotated,*wrong*}
 
 	default
 }
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index cc3a57323eac..80c57e79a055 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,5 +1,3 @@
-DIST transifex-client-0.12.4.tar.gz 179349 BLAKE2B 4287bf32a31a5319f54ae5f141f53fa00554c542d7f0f1000e985547f01029b05dc18f38ef992d37c08c6c0ab54d934a4ab37c37f0bfee299d824224316acbad SHA512 516531a0c5a7242da27e8b34a0513b24b806d3b3a271cfe29b31ef7969472f82a37e6fbb1d6198feb1c5bd99d7503bacf3f162808504415ea46670af3fe2369e
 DIST transifex-client-0.13.9.tar.gz 197283 BLAKE2B 9fd6f63a54d09f190f7dd6701e4994e4fd67e23cf630dcb49641a3c7356e55f1146be7c2a590fb09a52cccfa99e709c48fffd7df416d1d4c10231c4f42919380 SHA512 3dc4a1e713a797ce1ea626c9e85dd353fec3034ba21ab04bc89e5b927e0298b4f6560a793eec50d1a99c7ab340462c33d18c1e159697c476001be868cb7f87fa
-EBUILD transifex-client-0.12.4.ebuild 638 BLAKE2B 0b53b4af9264e9b5bfe96cbfe08da48a16ecce00fc06779c2cf54c622efddb4096fbe414fc9d45c74c51f058f9795ea765c29b371768041ddb2435d592786b46 SHA512 1273f8da1fb49837fe52447fca6010b9054239b0d9599ae5ba0d9ffde40f9bf9d993a6c31e849450a46d6d1f1641589c1350cb0117bc40a96faa3a7325ae7f20
 EBUILD transifex-client-0.13.9.ebuild 752 BLAKE2B 0ddbf4e4a08f2890dd3da509f2d3ae52a2235268a8f845960a7c92279aa3bb573adf6d3102219c8c7e399a080fb28d6f18ed689b01244f523bc0bc723eed7212 SHA512 7eb6b8ddfc035f0331b0bb4f0b0dde20131c54c4553429a486ef97b338e8b458083f642807e8834b1e30b727ed51982279d8648ae991fffb12c25671d73d0dc5
 MISC metadata.xml 511 BLAKE2B cb47fd7af2c99fe027060cd09a0ed4943faf219f1a9117be347e317c651d68f4a8d6967a51d899f6e125110138cfd47242b8818ef0bdf51f8b08d3989680ed79 SHA512 e1ff78568bc8bc8c80a48ffe569deb6fe36f431443ef10903a3fe03ea3f2b1452e0c145388c7225d0dfcac126b692276b27e8973a8875788234924a1d2cd8c31
diff --git a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
deleted file mode 100644
index 44dd3f5483d8..000000000000
--- a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index f66266050004..cc123110bd39 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,16 +1,9 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
-AUX uim-1.8.6-gentoo.patch 618 BLAKE2B 339602558ab7f8d09ef49f9be948f735c6f262961e82d74d22f83a47b9a4072c64d1d197147a168caaa9fbe3fd4b9b1cbc2364576130d400d06cc77551544a75 SHA512 b48d80d26d15956ece6457df32ea35c8ccb2b37cd222699bd35a1cbf40cd6fec14ae424cac17ee91db159a9369a37cc7b8af29c2613d55eb1e82be4e06324d86
-AUX uim-1.8.6-libressl.patch 2041 BLAKE2B d13fc555ce0351b46a08f6fd258a5f222ac104e5107281548a97d2251cfcec89ece8addc2bd5be51f192a854b72701bb9abdc1f97e2c717cd2ae907a088579c1 SHA512 a1af2af13b26b631064165c8f6d6dafaba09d236b489e0e8fd84a7ab6d9c0720a8a91cd9f8baabcc1e640157559fd77f68e18d5e85aaf0c335e25b69e0ef120a
-AUX uim-1.8.6-qt.patch 755 BLAKE2B dccef1b392e331b230f99f34c3dfc2829a49d5c5a15ac7c41eef201f06e5e6bd5c78ea7a3253b7bbcbbccb77feee7bfae677368cdccc1090c4dd8df26a38a5eb SHA512 ba3b80fe5951e2d508c8fc280038f17523a2de5a0bb136179a486c076aa3dd343112dcc976b2d2e4ae157aaa81682ea85031fcb51682776ecdcdb929f6aceb65
-AUX uim-1.8.6-tinfo.patch 2646 BLAKE2B edb4fde474b7264ed8a4a4db329ac06068ddb68e4b0bb6bd33e011018b5450de8ecc2b94716ca486a8a3b965867ee62eb0b3be2b2e939155a0cc34a02264a7a6 SHA512 34c2df710f0053c40b858369036d2e4bbac6a5da6f81794c3d97f6c58713d14c4bffffda555d9fc10ce2d70406578b2a50c9397b23c008ec4b106aa0a4582338
 AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
 AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
 AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716e1c27200a9b4d29a649beb333fe61c30cd36718494b05cb5217d486fb929cd617fe7038bf168d7 SHA512 4e86e051dd05ec0b56d423a079b0b285fdd9b256ae66528781a68ee0bfcf1be15530346facb28eab0a1401f2f27f9dce8cc8e215fe3195879f66e7e4241d80fc
 AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
-DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.6-r1.ebuild 4905 BLAKE2B ee4345c48c89c562b3737bd0b9869f07dbacb89d48bcf4babe4210afdcaaa6f61ee10a0658003ff50c2bff9185f182268d141b206e399f652fdb1c900111bdf7 SHA512 d51ca040b24bee9c496c397654651882cc3f413ca02dad9bba525b77db4cbe2be44646678d4f4698e13df43c2b0f48bda5b0d2e895291ba4f41d6199b7cfbab9
-EBUILD uim-1.8.6-r2.ebuild 5009 BLAKE2B dae5ee163f218c32bbb8b20feff326380d8bd4af4051268f1b453302df1ef533358f883c5a391a86b0b917a240ed604b5246a20641deb1e22d94c05bd7422203 SHA512 7bdc3aad39e88f6bd4241de8718aed676611db8d6fddf377b763ee36d92eafb9ac1eb1b795c07314d7d4d972757f831e30e0def92c96a226f04ebe36144b5672
 EBUILD uim-1.8.8.ebuild 5474 BLAKE2B 55ef0e1a31bbe7448b7803ab02f5f303ab352fb35febec28f433f8e3f9cd58419ea70c11da6a7e9b14223bc8b67deaca45ed7b56f5e6e17b70c9814569d20c11 SHA512 99fe55bc3576f0d210b8aa3a0371b1efedbf139c3c2c0345bafa790c18fdb22c89b61ae99dcc517b540116c2df2215c4f120138546c849d13202ccf8da8c7a5c
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
deleted file mode 100644
index 0feee5a70997..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,6 +36,7 @@
- AC_PATH_PROGS(SHA1, sha1 sha1sum)
- AC_PATH_PROGS(SED, sed gsed)
- AX_PATH_QMAKE4
-+PKG_PROG_PKG_CONFIG
- 
- AM_MAINTAINER_MODE
- 
-@@ -1792,7 +1793,7 @@
-   fi
-   AX_LANG_WNOERROR  # end AC_LANG_WERROR
- 
--  QT_CONFIG_OPTS="debug"
-+  QT_CONFIG_OPTS="debug nostrip"
- else
-   CFLAGS="$CFLAGS -DNDEBUG"
-   CXXFLAGS="$CXXFLAGS -DNDEBUG"
-@@ -1810,7 +1811,7 @@
-   AX_CFLAGS_GCC_OPTION([-Wno-unused-variable],  [SCIM_CFLAGS])
-   AX_LANG_WNOERROR  # end AC_LANG_WERROR
- 
--  QT_CONFIG_OPTS="release"
-+  QT_CONFIG_OPTS="release nostrip"
- fi
- 
- AC_ARG_ENABLE(warnings-into-error,
diff --git a/app-i18n/uim/files/uim-1.8.6-libressl.patch b/app-i18n/uim/files/uim-1.8.6-libressl.patch
deleted file mode 100644
index b14de58433aa..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-libressl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 7a281b1131399f04627986e6f9a54499b08e239d Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Thu, 21 Apr 2016 23:12:10 +0200
-Subject: [PATCH] Make openssl SSLv2 and SSLv3 support optional
-
-Fixes compilation with libressl
----
- uim/openssl.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/uim/openssl.c b/uim/openssl.c
-index ba1b238..35ca1ca 100644
---- a/uim/openssl.c
-+++ b/uim/openssl.c
-@@ -208,34 +208,64 @@ c_SSL_write(uim_lisp s_, uim_lisp buf_)
- static uim_lisp
- c_SSLv2_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
-   return MAKE_PTR(SSLv2_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv2_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv2_server_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
-   return MAKE_PTR(SSLv2_server_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv2_server_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv2_client_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
-   return MAKE_PTR(SSLv2_client_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv2_client_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- 
- /* SSLv3 */
- static uim_lisp
- c_SSLv3_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
-   return MAKE_PTR(SSLv3_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv3_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv3_server_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
-   return MAKE_PTR(SSLv3_server_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv3_server_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv3_client_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
-   return MAKE_PTR(SSLv3_client_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv3_client_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- 
- /* SSLv3 but can rollback to v2 */
diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch
deleted file mode 100644
index 6c0cb7eee667..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-qt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/m4/ax_path_qmake4.m4
-+++ b/m4/ax_path_qmake4.m4
-@@ -23,10 +23,10 @@
- #   the copyright notice and this notice are preserved.
- 
- AC_DEFUN([AX_PATH_QMAKE4], [
--  ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
-+  ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin"
-   AC_PROG_EGREP
--  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"])
--  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
-+  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"])
-+  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"])
- 
-   AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
-     ax_cv_path_QMAKE4=no
diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
deleted file mode 100644
index 51105c909f54..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-tinfo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1058,27 +1058,25 @@
-       ;;
-       yes|*)
-         use_uim_fep="yes"
--	AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
--	  [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
--	    AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
--	AC_CHECK_FUNCS(forkpty)
--	if test $ac_cv_func_forkpty = no; then
--	  AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
--	fi
--	AC_SUBST(FEP_LIBADD)
-       ;;
-     esac
-   ],
--  [ use_uim_fep="yes"
--    AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
--      [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
--        AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
--    AC_CHECK_FUNCS(forkpty)
--    if test $ac_cv_func_forkpty = no; then
--      AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
--    fi
--    AC_SUBST(FEP_LIBADD)
--  ])
-+  [use_uim_fep="yes"])
-+
-+if test "x$use_uim_fep" != "xno"; then
-+  PKG_CHECK_MODULES(CURSES, ncurses,
-+    [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
-+    [
-+      AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
-+        [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-+          AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
-+    ])
-+  AC_CHECK_FUNCS(forkpty)
-+  if test $ac_cv_func_forkpty = no; then
-+    AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
-+  fi
-+  AC_SUBST(FEP_LIBADD)
-+fi
- 
- AC_ARG_ENABLE(emacs,
-   AC_HELP_STRING([--disable-emacs],
-@@ -1210,10 +1208,14 @@
-     saved_LDFLAGS=$LDFLAGS
-     CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
-     LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
--    AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
--        [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
--            AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
--            use_libedit="no")])
-+    PKG_CHECK_MODULES(CURSES, ncurses,
-+        [LIBEDIT_LIBS="$CURSES_LIBS"],
-+        [
-+            AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
-+                [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
-+                    AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
-+                    use_libedit="no")])
-+        ])
-     if test "x$use_libedit" != "xno"; then
-         AC_CHECK_LIB(edit, el_init,
-             [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
deleted file mode 100644
index 5b032d6a9eab..000000000000
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-	gtk2? ( X )
-	xft? ( X )"
-
-CDEPEND="!dev-scheme/sigscheme
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-	anthy? ( app-i18n/anthy )
-	canna? ( app-i18n/canna )
-	curl? ( net-misc/curl )
-	eb? ( dev-libs/eb )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	expat? ( dev-libs/expat )
-	libffi? ( virtual/libffi )
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( x11-libs/libnotify )
-	m17n-lib? ( dev-libs/m17n-lib )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		l10n_ja? (
-			|| (
-				media-fonts/font-jis-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_ko? (
-			|| (
-				media-fonts/font-daewoo-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-CN? (
-			|| (
-				media-fonts/font-isas-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-TW? ( media-fonts/intlfonts )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-qt.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with X x)
-		$(use_with anthy anthy-utf8)
-		$(use_with canna)
-		$(use_with curl)
-		$(use_with eb)
-		$(use_enable emacs)
-		$(use_with emacs lispdir "${SITELISP}")
-		$(use_with expat)
-		$(use_with libedit)
-		$(use_with libffi ffi)
-		$(use_with gtk gtk3)
-		$(use_with gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_enable ncurses fep)
-		$(use_enable nls)
-		--without-qt4
-		--without-qt4-immodule
-		--disable-qt4-qt3support
-		$(use_with skk)
-		$(use_with sqlite sqlite3)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_with xft)
-		--without-anthy
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
-		--disable-gnome-applet
-		--disable-gnome3-applet
-		--disable-kde-applet
-		--disable-kde4-applet
-		--without-mana
-		--without-prime
-	)
-
-	if (use gtk || use gtk2) && (use anthy || use canna); then
-		myconf+=( --enable-dict )
-	else
-		myconf+=( --disable-dict )
-	fi
-
-	if use libnotify; then
-		myconf+=( --enable-notify=libnotify )
-	fi
-
-	if use gtk || use gtk2; then
-		myconf+=( --enable-pref )
-	else
-		myconf+=( --disable-pref )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	# bug #222677
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-
-	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	insinto /etc/X11/xinit/xinput.d
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX}:g" \
-		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
-	doins "${T}"/${PN}.conf
-
-	if use emacs; then
-		elisp-install ${PN}-el emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
-	fi
-}
-
-pkg_postinst() {
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-gtk3."
-
-	if use emacs; then
-		elisp-site-regen
-		echo
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
deleted file mode 100644
index 153a4f272422..000000000000
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-	gtk2? ( X )
-	xft? ( X )"
-
-CDEPEND="!dev-scheme/sigscheme
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-	anthy? ( app-i18n/anthy )
-	canna? ( app-i18n/canna )
-	curl? ( net-misc/curl )
-	eb? ( dev-libs/eb )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	expat? ( dev-libs/expat )
-	libffi? ( virtual/libffi )
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( x11-libs/libnotify )
-	m17n-lib? ( dev-libs/m17n-lib )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		l10n_ja? (
-			|| (
-				media-fonts/font-jis-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_ko? (
-			|| (
-				media-fonts/font-daewoo-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-CN? (
-			|| (
-				media-fonts/font-isas-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-TW? ( media-fonts/intlfonts )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-libressl.patch
-	"${FILESDIR}"/${P}-qt.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with X x)
-		$(use_with anthy anthy-utf8)
-		$(use_with canna)
-		$(use_with curl)
-		$(use_with eb)
-		$(use_enable emacs)
-		$(use_with emacs lispdir "${SITELISP}")
-		$(use_with expat)
-		$(use_with libedit)
-		$(use_with libffi ffi)
-		$(use_with gtk gtk3)
-		$(use_with gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_enable ncurses fep)
-		$(use_enable nls)
-		--without-qt4
-		--without-qt4-immodule
-		--disable-qt4-qt3support
-		$(use_with skk)
-		$(use_with sqlite sqlite3)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_with xft)
-		--without-anthy
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
-		--disable-gnome-applet
-		--disable-gnome3-applet
-		--disable-kde-applet
-		--disable-kde4-applet
-		--without-mana
-		--without-prime
-	)
-
-	if (use gtk || use gtk2) && (use anthy || use canna); then
-		myconf+=( --enable-dict )
-	else
-		myconf+=( --disable-dict )
-	fi
-
-	if use libnotify; then
-		myconf+=( --enable-notify=libnotify )
-	fi
-
-	if use gtk || use gtk2; then
-		myconf+=( --enable-pref )
-	else
-		myconf+=( --disable-pref )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	# bug #222677
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-
-	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	insinto /etc/X11/xinit/xinput.d
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX}:g" \
-		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
-	doins "${T}"/${PN}.conf
-
-	if use emacs; then
-		elisp-install ${PN}-el emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
-	fi
-}
-
-pkg_postinst() {
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-gtk3."
-
-	if use emacs; then
-		elisp-site-regen
-		echo
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /app-i18n
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)