gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-i18n
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
62 files changed, 659 insertions, 196 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 1b292b832429..dcf121882f52 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index 7cf8f5c90886..6570b6a24d06 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -1,5 +1,5 @@
 AUX 50anthy-gentoo.el 63 BLAKE2B 8680f0a54f0c16a4d869f52d1589c6af39d29c151a5f7e7182f7afb2417aa5ba2fea002d7638271f486f95931036a1e4e4a83af8d796c3b751760d5750adf1d6 SHA512 ca11bd44d092da07278905555513e8b5215413af64c46cfb9213cbd27948727133c06fb1fcfc1a48d67d196c693ed2835e8dbae142a52ff4dbd5ea8d49e6e65a
 AUX anthy-anthy_context_t.patch 174 BLAKE2B 0a38c7a467b5a0331762fa1083c2dffef8f4c39c8bfbf7ce0ec431f6f865dc8727fac391ff77a6a1cf5e455ca274c78b7a6ebf7a2326ba90c6cd979f8e3c7a3f SHA512 3f252628f77f53dd96eac50f08a36bb782f0ddc37446c1bdd5bd94fffa3454b9adcaff7118d76fdc7e8bc3f86b1a84e9830da5b67b2b0d281847b26ff62cdee3
 DIST anthy-9100h.tar.gz 4446148 BLAKE2B b07da205694db9223c22ebcf6158158247611be41448457ee112766d1ea5fe72eee3f2292276363245d751eb49bd582c39330cc6df5e52547b6188386439d29a SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b
-EBUILD anthy-9100h-r2.ebuild 1308 BLAKE2B 65a5aaee9b07d75cd7a047ed5492cb6b3b59c2881e4ca98fd713c325f329f1230cc2431821d615ea1abf9b3426c7e69aeb41e87f9ea6a39faa93cfaf402c5b8c SHA512 9824f69db445997eb75d6fc7b7fbae3779439c8616858e78bd0895b17d14d65663545fa3c98a1bc05e2a92b294fb01fee66907a88b5ae71ad1d5a9db7fa2d409
-MISC metadata.xml 903 BLAKE2B 29e0a9ae0eb05a56ce23659a1693e7d118bb5f7803170e4df02a0515adb841a26c66bf652baea4d921f613424863168500ce69b7282f027fd6a9d6cc7a66f9fa SHA512 6fed9f2dd2b723292db8348fa4977659600b2d755f74bdfd7d9007b60d2c505473af01f5277d41155e9cdee6243d6e8faf9254c9e6963787509ea4a3f37117c9
+EBUILD anthy-9100h-r2.ebuild 1321 BLAKE2B 85a79406fe461f006866e2722a8819e33c92b25309f8ba4f0ce1f759216e65b33a4eaad9621409a5dfdd32bfd4ffda6ceb2b227a70f80a1557d9c736d9ad63c1 SHA512 3fd43fc1980732bcebf394cd3af2a07d50576ea761711bc10982d6a4f06ef70927bf23a2f691f1ba1c555b10d24d6f29b221a16dc5f277a403c7480d8c4a26e9
+MISC metadata.xml 907 BLAKE2B 4192793f866cd1747335aef0bcf556db1e39c80a8dd5661b66887ebd6deb498db52bf86020a426a0828d192dec0a41600cf328af344cad07cd20cf81e77776eb SHA512 1a57ac78da70868dd6580bac2c85b4510e1f4b1db2bb3629c17a16fbf9e44d711a355d3c488479d00a466930d4cce9980803e526f4b574e48a1a5b6e3bd3d24c
diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
index 2ae79f831a70..9649482b7f9d 100644
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x8
 IUSE="canna-2ch emacs static-libs"
 
 BDEPEND="canna-2ch? ( app-dicts/canna-2ch )
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND=""
 RDEPEND="${BDEPEND}"
 
diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
index 0b8350b78af9..7b0ba62c9e0a 100644
--- a/app-i18n/anthy/metadata.xml
+++ b/app-i18n/anthy/metadata.xml
@@ -12,8 +12,8 @@
     Anthy is a free and secure Japanese kana-kanji server.  This ebuild includes
     cannadic as a server-side dictionary, so you don't need any extra package to
     run it.  You can use anthy with <pkg>app-i18n/uim</pkg> (XIM, GTK+ immodule)
-    and <pkg>virtual/emacs</pkg> (to enable Anthy support for emacs, build this
-    package with emacs USE flag).
+    and <pkg>app-editors/emacs</pkg> (to enable Anthy support for emacs, build
+    this package with emacs USE flag).
   </longdescription>
   <use>
     <flag name="canna-2ch">Enable support for <pkg>app-dicts/canna-2ch</pkg></flag>
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index bbd61eac3b0e..a5b6555f68e7 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.9.tar.gz 765672 BLAKE2B 88a2b935bfe1007bdcbd70af358509da77533a67df4b6d0be218b5f9d5e1c0ca093e62618765f1e2d7c06c2127458319bbf482ce8598398b9562ecec8a258301 SHA512 2f57db784ddbd4ea57afba245dc532fe4ee8c9fea5fc7df9b3ca26600816ef4c0626b4ebdbbd976826c391890216af587863707caa26c3926a6278cc6b720ef6
-EBUILD ibus-anthy-1.5.10.ebuild 1239 BLAKE2B 33177009f35d376e79b5ab5a803c9ce97be9fef2fc32376d848e2ebfb9f63af21e1ae0e73678c76cdd9538c2975f2ac9389bf0dae7bcb1ac470bd349d076a3ff SHA512 40ee86d57da6ed8494d929724efc7e87deaaf3fc0888fa40bad1993e45a8ef093f4cf58e5682d047e59414d497af4191075ee13990419e34ef093057d22cbb28
-EBUILD ibus-anthy-1.5.9.ebuild 1218 BLAKE2B 5f4af481d435f5407a8a809c44e31c97f5f1a2428b56ffbbbb92f6c269e4c32677f055d808975ca28a01d8b693d411b96dfc4f6a80017c6bd7d46f6d66eaed25 SHA512 62996d9904397e44e257a07d6ae4156100fa399ba43186fbf755a519ee6d9ed05ae358e10354a61f14c445f3b7be5cf3fb2efc1fcad54037b6feb0048a8a2e0f
+EBUILD ibus-anthy-1.5.10.ebuild 1235 BLAKE2B 3c17b64497a76a0edb1303988ec782983a8332e38b4597ee1a4b739524d4564b90f590942b2719a86e0be522df9eb14d159f1ba82343c1ac386fe732c2705874 SHA512 a5fff16b8ec2f683e03dcfdb1973d925159aad766803029ab68aad1cbe68f0a48fd5386b4520190e6d4b8377326495459b2759b0d9a89d34c0f237a76b8249fb
+EBUILD ibus-anthy-1.5.9.ebuild 1214 BLAKE2B a600ee7dab05eda80dbc3c134eab8571e0989e6d500c5ed7c7e4d1adc4ca1ce8a02fbd009c0f449664b74e4150bd464eca998d2ffd2635861e95b2a0d084a053 SHA512 19dcc539f8ff8ed8a300bf09e04bba433056a84c397352c9173171cc7de4604edfb8d537836796cbd4b986317d8237519437c36cbffbdfd818797365e975e215
 MISC metadata.xml 476 BLAKE2B 33f4115e9bafa5d3f491ea05b8395123c9cb6b844959df2ee8b2cc9609b8fd20d25cc870adc117c9e96e17f215c806d82ff138b01c2b02e2e63eb99d568ea626 SHA512 024c387b5eb01279f8803df81b1d7dc2b86969ffee5986bef75987c066cce48f7d1fe8ea35790be4fafbff2281850f2b03904f41e06bc37fc9d40537eca96c07
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
index 4c762fdefae3..10be5957f6b7 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit gnome2-utils python-single-r1
 
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
index 1d42f37ae5ff..ba81764f9f0d 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit gnome2-utils python-single-r1
 
diff --git a/app-i18n/ibus-cangjie/Manifest b/app-i18n/ibus-cangjie/Manifest
index b90b1b8619c3..a35a0c2f784d 100644
--- a/app-i18n/ibus-cangjie/Manifest
+++ b/app-i18n/ibus-cangjie/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-cangjie-2.4.tar.xz 150616 BLAKE2B 2e59acc1b05ce0dc3dad26ba663440d067bf28a549e79ec9d127de414d715f5e376f426db5b415255eb63aa13677e59643889481f5e39c946399d4d4fe15a468 SHA512 cef9562fc4a5f3b78881c09b43e502f02322148e501022d3f80989caef4ca98ae26903e9a3dcc422feeba7712a8321c731ba229429e52fe919db5144aa0ead47
-EBUILD ibus-cangjie-2.4-r1.ebuild 913 BLAKE2B c4ee955eb638d7d50a0d52e5763b39e71fe1a35340719575c683ba10693018f902b6366ab1acb89c578a75073c9c0e83774b54f007ebd2534bc78e198840eb27 SHA512 609bb55b71cabc71e6f70cea7177cff3cdc7da0f5130116933afb0e1cf3791b3ef0f490fee54b5dc528f8314cb2d531aa31a30105020a5699f69149a9fb75bb5
+EBUILD ibus-cangjie-2.4-r1.ebuild 907 BLAKE2B 88eb239b187d1df15a1214db7ebbca12e14b4830deeebf02b893a085de98c8909fd32a268702c92d28061ff3ef86c3a5790ad3b8ab795452c4aaf9357671ffbe SHA512 9649b8edb49766db2e1794444c36351175b28838cf15c11241076a85f0734190569092b794a2e83278220f2af2b6cc036a8711c2770fa11f13996ba4d434bfcd
 MISC metadata.xml 321 BLAKE2B f6906dfe6babd501643f94145258a76d52aabdf44274f8989d88b513157d178a3e564089e97b694371d85b750214d359213ed7ab00dab78c6262bc23314342ef SHA512 5681abe463968d6ac39a94d5b30428be7bcb9fa5ebb2318223ca9ab4261b303fa37eecb1d506f7131609856eba12deddccf7c8cd4d01954f5bd71a4e327551e7
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
index fe7e210389a8..b217f0feaf8c 100644
--- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2-utils python-r1
 
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 3824251bb543..31a12333a992 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-hangul-1.5.1.tar.gz 460517 BLAKE2B 913d0d8b8995fac3cd73ca40280761d5bf44f35134cb7e73075c233f9c1ef5aa00bb7d7b8da20a69273cd0eb8202b9deb409e1b8d1b6ebbeccccb5f0ef98d341 SHA512 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec
-EBUILD ibus-hangul-1.5.1.ebuild 888 BLAKE2B 305410e7da6777cbfec80e1ae38b87c8dab2f62e2bdc7c9c3347e0a96a4a2d48664ceffecf6e09ee289e10f293e5346789bc30b947948b93bd41f8ece7b74074 SHA512 75301abd0f15d1201958eb8fff122d73d7a739251198872d702787a505b266c5aa1f3748903c37dca28993d414bc303a685d1ea17a37098968f2a22bbc013f6b
+EBUILD ibus-hangul-1.5.1.ebuild 884 BLAKE2B a6a2ab992c8366ba579a9c3bbe9771e415d0d6f25b527a1faed8a0da66f14c9b1355da3aad484b6ff28b41c134557d3cad1d601329150f5f416acd0b9c7a1912 SHA512 a32e4a5905d270eec0faabe72603070e5edc2748b227384fe961c9d8ee5d299c52947ee403fab5d4b6a71dba7cf7fb8666631fe49ada8f3c7c33e78f15a89574
 MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
index ec232f0cb01f..5fae9262586e 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit gnome2-utils python-single-r1
 
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 08f0cb40a1c8..3b1f91cf248f 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,6 +1,6 @@
 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.ebuild 1502 BLAKE2B 31f87c7b2f7d26f681383d86f19f1e3a5a8659dd8b3e0879143e3153ab5c41b9a2e9c24f308d48ac9f2715d983d4f45cfaad0a179a677e4fc8a75745c5b1259f SHA512 4a27ce65b03e5dc0c7ae5f54ed1f8aa3f155907e008a97ff5460d587c8f507f04ce099c83c44de59fe34ce1faf06ccd2136bb78169bcf88e53f40eec901fbe13
-EBUILD ibus-libpinyin-1.11.1.ebuild 1168 BLAKE2B 61ff0f1bdbde3e2b3457daf7305f26426e22c9a5e8662d85e19b98fc87a1688051d5d77777b65d01464bcfd3dec6e0ec21b9de65cb43932d4c7424c70c9a1e90 SHA512 c0ba8a5cd462971fca1d4413b4631550dd3920599dfbc6339ff3be46cd32a82c81ce8cc1ba2bff558f850cfff309bb46ed24866b9a5ea9bbf4e9e034356d0371
+EBUILD ibus-libpinyin-1.10.0.ebuild 1498 BLAKE2B d448d1f16bf63347a0aaccad094d0f6ad0b89a0e05318f86e2593711f3800f36d2c064ebf0e6c113fb1e3e3800f49b6f070e0140abbb32b5c9f3b591ca6d201a SHA512 fe81e55e6f6b2e7cdc7dc1615b0d0c2435458a9e4e3f44f44633853add01710b904138a2e967a16d94f8633d9623bc21f57477d3f871c2acadb85510b3bda686
+EBUILD ibus-libpinyin-1.11.1.ebuild 1164 BLAKE2B f5d8d47ccf6efde76cb0a3193a54816f1bebd9755196552e1f07bad76224ae7b09beb2f0592d3e040cdc66f0e2da930760fff2c3e0baef843751837a12d6f92b SHA512 7933a6669b7481dd39ea12bf3b23574c7ec6acc369a4fd47518be167554465fab2059fc6e580f9097ee258bb8815380b0bee7a22703192bd49d466d5e040bc84
 MISC metadata.xml 807 BLAKE2B 864c61e2dac53fc0b95541bf79e8f27a183f879bab95574f7cf462bfe276c89c8a5d2b65c899f4734c487feff1113a20ee02debd48b4ff955a24ace70ed5006e SHA512 c92e0e2c47a1272285c3a36cfc18c739df2a69dc911a8849cdc9c517183309908fdae894e88ed7511645b1c90c3611670b046f1a2c7c48fd0ff7c79d2de0a5b0
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
index 3f5e863d4a58..a686aaa32ec4 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit autotools gnome2-utils python-single-r1
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
index 5f6789fe339c..5f64ebaf5818 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools gnome2-utils python-single-r1
 
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 10280bdc8989..4b8ce1eccc08 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-table-1.9.18.tar.gz 585309 BLAKE2B 42d7d130bd2695c1c1a7010c0bcf29c1ecaa3899c8ef8d24b11e10434771415bfd8b91723ef4c489721f0276d05dce08de3472c49632b9d30da5be1a53f82dc7 SHA512 3f28269be1987023402eb6075b8e68b3bbba3c572a94551d072281677fde5fa14f8f4186455f8f9156b252934580c7a3837555d0edb46c76f13c8b109e26aca2
 DIST ibus-table-1.9.21.tar.gz 615801 BLAKE2B f6b3fb4fe67e5f43cc7d21bd03cc530c03b3a161e099fbca0b116319f1590374ddcef2e97c2f4702c2cd8748e8009d703abfff51f93ffb933a1aecb028e03362 SHA512 354f7e8ece5c23b84251bd0d5ff06d7a368678ade25e340341ef9f85571b440c455d56660c743be97ff6776ff041c4da35079ce090955c5f87b8f3b587e35866
-EBUILD ibus-table-1.9.18.ebuild 785 BLAKE2B fdb1d82614b2c0ba9d9a120b85be61a42795423dcdf24c6a169f76b6b9b1cd5c1d105c203b196a6bdb1c718710c4f920777b00a18005b7d43391c0d29f770097 SHA512 77dbd58a7f0ef9ecee460564fa7d9055c272168cff1affc98319fe9dd356315521054ef78547d0671160ef1750d4cf4e2c899ed49c7d07037c5fa530a0d3d083
-EBUILD ibus-table-1.9.21.ebuild 803 BLAKE2B e084570380e2bf7f0be03ca013d35339cf154ab99227b1a1481e3be2ee4eace3e373ac435588f0e76facae3853fe40ee3c476a388bd15382a8f456183abed17b SHA512 4d1efc11bfa639ab814f4c7565ce23c513b8e627d213eaf9df074f76936ffb0dd12d39dd98ab0f6271938b702292b749b0cd33b9f68f338ac7ee91c80d0650c3
+EBUILD ibus-table-1.9.18.ebuild 779 BLAKE2B d18ec4ac954123ad2ef8fc55c9ffee37b63b3d9e9c91d1f220fa159ff43da746fe373225870e477373e335362266ceff02ff68d6d8f25a29db36b1cb19a401f7 SHA512 cdc2ef0a22b6b1fe35fbf4335ffa96f7a955b0448b876eb5eef143fccec2e48848be5068b80840673437bcda94fae4fde75938b0a799e5d81fbd84605e02f8a8
+EBUILD ibus-table-1.9.21.ebuild 797 BLAKE2B 635fc01b04621e32e73f5ef510f7c09369a1a398748836b8ecfd89b5550c65e43ecb869f7791e39756bcebd507eaa0bc48041fdbc6b07bce60bd9b974976e9da SHA512 b5e390a6997dfe71dd983a9d2a1cbc923966e3f1d58a88c7a3ddd8d318e151146429061185547b65aaa902552e1503e6c073fa3f995c8290e30fba0e893fc076
 MISC metadata.xml 419 BLAKE2B 7d8e333e50af2c6d8032fbae3455032febd51e3e7209c55fbfb28b52bb80482d4b95f7ba3ce02465218a93741abd016366a5356d8febcbe50881c55c27a0d6d3 SHA512 b75c10c039ede5a9840b7ca4edf556a22d0072605b6e74d0e6f36e09ec32f66bc81f0db967a90716c5748dd3a5d2a4a64e6da704f7620e4ef2e4a041c9c9d389
diff --git a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild b/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
index bfe8ff20eb88..025526aa8b12 100644
--- a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit python-single-r1
diff --git a/app-i18n/ibus-table/ibus-table-1.9.21.ebuild b/app-i18n/ibus-table/ibus-table-1.9.21.ebuild
index 875c6e7ee5f1..7da7fff419c8 100644
--- a/app-i18n/ibus-table/ibus-table-1.9.21.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.9.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit python-single-r1
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index a9541732e359..849fee3529bc 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-typing-booster-2.6.0.tar.gz 6863400 BLAKE2B e399ebaa19a2949882de41cb3b11dfc161a0ddb300e23daf216857dea9bb4b3d31db6dcd02846214b8ac677df92672a342c7c9e992ab791f97bdf8abc514ba4a SHA512 7e916eaba5d3f14bde383acedd5ce9cd74e72328f25a84936055ee9183b4aeff79d5297fffdd27713491f23a949377cafc39bc52efa0f7d5995672176cb808c8
 DIST ibus-typing-booster-2.7.0.tar.gz 7364094 BLAKE2B 60a45121b398032b2581d1f3e5929e74e69ee22bf0807b069529afb30797daacece47e83b0696397e6b9c3f6adc28012c7f2b7102387e03eb360383946e836b2 SHA512 a11d2cad660dc813022eda89bb690e3fe7cd517ad6a3cbc7f31879afb60c5d1628f25beb423f922b26d7dd92c685471c767084cdd3a35aff1e2314a21cd757c1
-EBUILD ibus-typing-booster-2.6.0.ebuild 857 BLAKE2B 4c68182ecbf141868ce5560bd2046fecd279bc8831679ef3b88eb07220cbf364d0e8bcb3d7d0e4d30d96c6a2b67ad1fe74ff6579a3a8c40eda0dadf75f8da0e7 SHA512 60560906ff65573aadef3270db06c9dbb3156f6b851dc79de0dfe86f4027041ecbe1cf92f31e8382c2f43d9f9903b83f5e4c15ceec3d0297742f24f566461820
-EBUILD ibus-typing-booster-2.7.0.ebuild 857 BLAKE2B 4c68182ecbf141868ce5560bd2046fecd279bc8831679ef3b88eb07220cbf364d0e8bcb3d7d0e4d30d96c6a2b67ad1fe74ff6579a3a8c40eda0dadf75f8da0e7 SHA512 60560906ff65573aadef3270db06c9dbb3156f6b851dc79de0dfe86f4027041ecbe1cf92f31e8382c2f43d9f9903b83f5e4c15ceec3d0297742f24f566461820
+EBUILD ibus-typing-booster-2.6.0.ebuild 853 BLAKE2B 168f8674e9ea224bbd5cca5687573b3ae6a44517d86eac44e776b233f4431fc314f07028a4bc9cc9cf4b772afd7b523d69fbafcb20ac1ec42ab1c98f99bebc76 SHA512 a0fb1bee927ffea4daa028d63b0401ede40fbd37146f0cfbf51714b2ea85cc607b7bafee8b0595f024ca39f4276e25f9dec33a37b9aa0c1af2de93777b36f485
+EBUILD ibus-typing-booster-2.7.0.ebuild 853 BLAKE2B 168f8674e9ea224bbd5cca5687573b3ae6a44517d86eac44e776b233f4431fc314f07028a4bc9cc9cf4b772afd7b523d69fbafcb20ac1ec42ab1c98f99bebc76 SHA512 a0fb1bee927ffea4daa028d63b0401ede40fbd37146f0cfbf51714b2ea85cc607b7bafee8b0595f024ca39f4276e25f9dec33a37b9aa0c1af2de93777b36f485
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
index b026527d36a3..55d27fd99d77 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit python-single-r1
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
index b026527d36a3..55d27fd99d77 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit python-single-r1
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 33e449cd1718..3ed28bfea845 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -5,8 +5,8 @@ DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
 DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
 DIST ibus-1.5.21.tar.gz 3463069 BLAKE2B 75b9e7cc4d84b69941d53321da1fe63ad911740a36ed51c7fceaa2a7bc30f6ae39d3f575b4b5fc4268d7c3b3e1c0bae11881dd7a8b7bd441ecf89c83c7279858 SHA512 c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331
-EBUILD ibus-1.5.18.ebuild 4320 BLAKE2B 4c11c27b9c2b902c5a86f14e060a7a5ca636356390739fba6613046e9a00604dfcafa6310dddf2e5a011206739558b1ec232e60a55d8152c9f4a99129684d655 SHA512 466943377d1d185c81a2dff168b4d7bf460d7bbe73f16da66fbc8c40c2bb0fafc19387550d30a2852e326a0b7ab7dd73aceffebf45fac7e44e20c54462a7aa4a
-EBUILD ibus-1.5.19.ebuild 4433 BLAKE2B c6ada7d08ba240828fff33f8afb598ed33845fc53e82d495ce67fc0e193fb1657af98a661f42ecccd04e6c2c365c26c024a3afa3b9ade0ab01a35e36e9870ae0 SHA512 0c89a0700529cc32bc8b66b94984cb4754e5d5c9854ae5ba6c27e689a52ce27256b79804c054db4f5252ddf0b65182149c92dfec7ebb7627838d2a02289df49a
-EBUILD ibus-1.5.20.ebuild 4145 BLAKE2B cedfa79fd3bc4b19a0150c1d4c5bf346ed7e589f8de4f32912660831b0dc44fc42700fb1b1f2e592c4108e8302b180f3595873c21303cdd42d36017be7cba555 SHA512 a107ebb3a60c0aad7a24968f4cff7fec7fd0ea958d436fbaaeab551dd0079aff9ba3bd218fa7b83eb20d5dcd17726a4cfe1bb3e811e86e08a4b0ea00c24cb4d3
-EBUILD ibus-1.5.21.ebuild 4154 BLAKE2B fa77813cccaa76dd524a448cfa40adfd9628ebaf3e371809bb560ac0262e18720e41aba0af29187886c722991b123a26266dc0b58b399defbecf3ed1277ac7ca SHA512 67314ea69d567f14871fb8fd8a5e4cb8500af56021171115070e354894f0f7aa5c3ee9e95eea7b330101168bf9d3424ba53ddf2e4921719dd147e2bb1427c0ed
+EBUILD ibus-1.5.18.ebuild 4316 BLAKE2B cc42fec879ac78c3f427c5647c9f911165501b1f1bf94da56b5711f8d9218d634e958bcf48a5a489b32f84a1cb62974879ffed5d84bb8f961c0de2fc7d4eaf69 SHA512 6dfaa351b156432037595996f27b7591e1cda5bfd344a13a6712eb7d393bda78de7b91595b56d3f070e5b6ee19c99a92d319c40acc70ca9e754d097a7f2c6b77
+EBUILD ibus-1.5.19.ebuild 4430 BLAKE2B 9b4e9a249d0cc7ad6d53e182dba4e2148cb8371c51e5bcefd3645476056b6d52c2fa1b5a3c394958615691a8bc653bfed22b9f1699058658a427c406a974d672 SHA512 7ddba78484fde243624bf08d12f9e5f96c2d8f698675bbd3dc08f17841032d06c5f1d71b5723a467ef85523525e9a2cd674666491a9199758d54465327d7e6f0
+EBUILD ibus-1.5.20.ebuild 4141 BLAKE2B 4d7ed5c0cdff19717dfe53e1cec64b9c1e668e4f4647b4adac8173289c05e77167decf4b8ec1af6b0c815ffcb58432f394947815a8e647dcf1bfc4e73bc88987 SHA512 e8b53200439ff6a215080bd1ac1bb0d624ea70e75baf63aa0563f071af3ccc8012e1fc34c98f33799cdac97b6489f45373643ff00e13ab889bdb443145396f19
+EBUILD ibus-1.5.21.ebuild 4150 BLAKE2B 538ed0faf3ad25242f9c5e5ec8b8cd0e40d9a0665f7acd37c4e703f6302b4d06488a4e22ec1af63835329909b821da53f94f38733b432e52d0c87c54d0a8c06d SHA512 e0fc70e73398d013bc206f4eb2b493133674e48d9fff443c25159d60b174dc22e5ad36120504ed692853c49a9d5a28e6c6eb76814f31f945b91fb6c88e757400
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index a1f9b3f4ba30..1003cb41c9f5 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"
diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index d137852cd60a..c7617f71f019 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )
diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index dd77ef68a165..b7cea4e3f068 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/app-i18n/ibus/ibus-1.5.21.ebuild b/app-i18n/ibus/ibus-1.5.21.ebuild
index a30fdc9d6e61..7d58048b6672 100644
--- a/app-i18n/ibus/ibus-1.5.21.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 26ac70e3f6cd..702b85237f8f 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,5 +1,6 @@
+AUX librime-1.5.3-log_files_mode.patch 458 BLAKE2B acd2f59f409b3643807ea845fd08bfcfe730cfedaacb7d70a4b1ba017a299cb95b8d815bbbf53b2c0e3c86c4482a2d71a97fef362a6f0404dd45e96b57f78be7 SHA512 d8b12367916ed1ad5deb2e982437d3e5e04592baa6c1e12f6b78ff99b8cc407f2c9fc6f47c0715054572f6f8a5edafcb6f6da033902175cc4357a07faad04420
 DIST librime-1.4.0.tar.gz 8609316 BLAKE2B cce58c398057ac82f076e3b9e9a25cd6410e738460bd58277a9e3ed6cd11e80922bbb30e8b42828cdd5dd83f6058794b4b32fedb359315186b018ca88161794d SHA512 da68983638c6f25d994060a607f2ccab8917a71dbf10b9c6f1140c87c9ef4124e29a1d0ef16bbd0edc9a3a22bd5845aa894888d678607db372750f300638f562
 DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3
 EBUILD librime-1.4.0.ebuild 843 BLAKE2B cf3ddd814e996bc0e8633ffb4b918281d232729773d23fc72449ebb9ddeb126ad2eba9c5e0d31dd96ecb3ebd2ac40b023144f713191e25330e3d841c90267a3a SHA512 fa8c3031447238f9015fdb43dded2c874fb711e2c24282bb8fd4dda0967513aede1170a05c82dccabb19b5d088f87b35256ede0f7cf5778e4cc91b8201a89410
-EBUILD librime-1.5.3.ebuild 1453 BLAKE2B 1a743ba7061b07020c8e4ac114c12fbfff81809df5c7549c150f09a463ef26366eff774634807f938f0f7fb93f4196e808c1d8703c429bed8dd749f21daea569 SHA512 6f2e81396c26ceb7d79a74d05bdd7557cd59bbe62a8e475be3dcb5eb5b0050f7e40e4af7839689ca839d4522ce96dede31c6d67f075916d5cea5a01496c2f6c7
-MISC metadata.xml 532 BLAKE2B 200096c7c818b877dd156ab1456309ae4e42a8bf78075d8aeee30a79f09bbf57c6053a41369102becf87aaf3ea4481a0bf6edf1dee258f650661b61c65a9aaee SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800
+EBUILD librime-1.5.3-r1.ebuild 1605 BLAKE2B a1e91aa0248c50d3561e47e4e81982137978fc77d797040768136997d8cdd1d2250e45b2b6d73e7a68b4a787426acf75507efb619713eaa893c2ab07a2a19fbf SHA512 2fe3d9cdef8176f38e3c4346542bf09181863fbd62e6968fb452da64c63ba5645ef73588f01eb3fbd1307dbde96a3867754e77c869587b33cf74ec89e02aa4f8
+MISC metadata.xml 647 BLAKE2B 2837d0505f1721cbb6a60414b846ad95ddbaca6d682e9f93acc82998430cdbc73038b124c1a0a73d7aedf132535276e6bd88015a47e4f4ebb86619aad38e9061 SHA512 a388004662d39511749e6fcf618fc28411f81ebbf2078ea2b3e4123d63544790fb017ced2df16556fdf763c854d34a7fcf5a59931153f6c94841d9cdcff4d3ec
diff --git a/app-i18n/librime/files/librime-1.5.3-log_files_mode.patch b/app-i18n/librime/files/librime-1.5.3-log_files_mode.patch
new file mode 100644
index 000000000000..7a36dea64d24
--- /dev/null
+++ b/app-i18n/librime/files/librime-1.5.3-log_files_mode.patch
@@ -0,0 +1,14 @@
+https://github.com/rime/librime/issues/316
+https://github.com/rime/librime/commit/90839b0b3d47cbfef715ea5f061c7505666ff75d
+
+--- /src/rime/setup.cc
++++ /src/rime/setup.cc
+@@ -35,6 +35,8 @@
+ 
+ RIME_API void SetupLogging(const char* app_name) {
+ #ifdef RIME_ENABLE_LOGGING
++  // Do not allow other users to read/write log files created by current process.
++  FLAGS_logfile_mode = 0600;
+   google::InitGoogleLogging(app_name);
+ #endif  // RIME_ENABLE_LOGGING
+ }
diff --git a/app-i18n/librime/librime-1.5.3.ebuild b/app-i18n/librime/librime-1.5.3-r1.ebuild
index 074f50244aa8..91569d76fae8 100644
--- a/app-i18n/librime/librime-1.5.3.ebuild
+++ b/app-i18n/librime/librime-1.5.3-r1.ebuild
@@ -22,13 +22,13 @@ fi
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
+IUSE="debug test"
 RESTRICT="!test? ( test )"
 
 BDEPEND=""
 RDEPEND="app-i18n/opencc:0=
-	dev-cpp/glog:0=
+	>=dev-cpp/glog-0.3.5:0=
 	dev-cpp/yaml-cpp:0=
 	dev-libs/boost:0=[nls,threads]
 	dev-libs/leveldb:0=
@@ -39,6 +39,10 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-log_files_mode.patch"
+)
+
 DOCS=(CHANGELOG.md README.md)
 
 src_prepare() {
@@ -52,6 +56,12 @@ src_prepare() {
 src_configure() {
 	local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/utf8cpp"
 
+	if use debug; then
+		CXXFLAGS+=" -DDCHECK_ALWAYS_ON"
+	else
+		CXXFLAGS+=" -DNDEBUG"
+	fi
+
 	local mycmakeargs=(
 		-DBOOST_USE_CXX11=ON
 		-DBUILD_TEST=$(usex test ON OFF)
diff --git a/app-i18n/librime/metadata.xml b/app-i18n/librime/metadata.xml
index 1ef87e42d3d5..777c41df84a4 100644
--- a/app-i18n/librime/metadata.xml
+++ b/app-i18n/librime/metadata.xml
@@ -9,6 +9,9 @@
     <email>cjk@gentoo.org</email>
     <name>Cjk</name>
   </maintainer>
+  <use>
+    <flag name="debug">Enable debugging (including logging of input of RIME input methods)</flag>
+  </use>
   <upstream>
     <maintainer>
       <email>chen.sst@gmail.com</email>
diff --git a/app-i18n/man-pages-da/Manifest b/app-i18n/man-pages-da/Manifest
deleted file mode 100644
index e4d29863afd5..000000000000
--- a/app-i18n/man-pages-da/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST manpages-da-0.1.2.tar.gz 8962 BLAKE2B 27a0ee206f137b818019ee74fb4091a9b30e526c16a40f763f4070c9fe5932ef48d50f06c2443c377c86af78c3f7f50a9275db258863bfb800f93c703c86e623 SHA512 7642908f5952f54c0db6af6886b6592e10889d8734776d8d42fe923b084ef85732820d40a095936e6f1bf48d9430b401afeb28202e530b5a48e4a3447ed5c4c6
-EBUILD man-pages-da-0.1.2.ebuild 623 BLAKE2B c73f16335c6b777e774059ec7ee02f8e760f5ddb50da5a305c4fa5e8184a71166b799994d3ad7967f6d8af73b3dea0e062e9c29803cb471ac3120f09005a92da SHA512 5a0415da50fe3448653f3b281a1b5dbd8948be33fb8ce518ee5fa0ab5a57f2190e189ca77d94c8b29cd2cc533e61a155de05e378d8baa1525edbf811554edae3
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-da/man-pages-da-0.1.2.ebuild b/app-i18n/man-pages-da/man-pages-da-0.1.2.ebuild
deleted file mode 100644
index e779e638333b..000000000000
--- a/app-i18n/man-pages-da/man-pages-da-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A somewhat comprehensive collection of Danish Linux man pages"
-HOMEPAGE="http://www.sslug.dk/locale/man-sider/"
-SRC_URI="http://www.sslug.dk/locale/man-sider/manpages-da-${PV}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-S=${WORKDIR}/manpages-da-${PV}
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/man
-	emake install-data PREFIX="${D}"/usr/share
-	dodoc AUTHORS ChangeLog
-}
diff --git a/app-i18n/man-pages-da/metadata.xml b/app-i18n/man-pages-da/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-i18n/man-pages-da/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/mozc/Manifest b/app-i18n/mozc/Manifest
index ffd1c3bb3200..aed1d056cd1e 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,13 +1,15 @@
 AUX 50mozc-gentoo.el 121 BLAKE2B 0cad49e4a5a04d1cbdcd063cfd5a06c14bf4bab47890bbc089d8bba9889abb5197bea2cfb912f638052f912d7aca51a7e71b743b4742fd90b9d5ab5a60779fe5 SHA512 2d67a6723374872717ab7132f02f4030f00ddecabb8a1fc20c9d69d64406dc2ba2a1109734378fae7b4718a8ae9601beff4b6f27cb43a280fa2e0f946da70685
 AUX mozc-2.20.2673.102-tests_build.patch 1037 BLAKE2B 8f3c0b3361371a994957a89f5b86020902262de65aef75f82e58fcfcea211b8a8d3c8418898781ac1de2a2c9bdc73ffc4cf68102122a22691d9592d5a02e6c62 SHA512 d99ee7edbb406e123b26ec186933608b42d36193b7bfe67232810c0fbd7a92bd8cfff26dc45eae4f020e82e9a8370cf2033c750250455585b6b3d88cc8c973ef
 AUX mozc-2.20.2673.102-tests_skipping.patch 2086 BLAKE2B a104d6a83b02b49e1208be1b39699b90ad419d8befa29ed0366f7cbc454fe9ce27361f21897a5c74dadfc2d9eb31a30d7237e20db8c1fb205b8e71b40f4a0e57 SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e
+AUX mozc-2.23.2815.102-environmental_variables.patch 4636 BLAKE2B 2c1d952899b50d0205127fe5f708c8cc8ad115db35f1ebfe5b589550203ee64fe06b0d66b10989c12063feff96f679ebd6ee4562651ac81681019634e6e9c462 SHA512 40e87a52d96794a91f5cf77f387d341b7d58a4b27e3d1455c4230fbe75107c09c3bd4784394437265548ee2704a4d1838cc0965f0333e554484dafe8b106cb7b
 AUX mozc-2.23.2815.102-gcc-8.patch 496 BLAKE2B 318fcda19cf4f7e95920b5df4f5638621bcae992891941fa6f220d4dac1b2eac0faeda7a857a587baed41b361608f20c4bbda0d9a69a60b823572482c6789f46 SHA512 9c2b0e9695f4cd050f0d5f35d0e23f22715b9c6e5607629c7dc023560a5191bd755497fe6fe5306789c00e68d5bd9b7179d5515c982967788fca432134b71cad
 AUX mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296 BLAKE2B 982f43fa68031eb0f779ec4d034fef838a4fce7834291db889c9edffba3df4acd5bfdf187dd4a52ee8fd0714de943f9d5112070cd69502e1449dab4dbf8543b2 SHA512 6e05b2f22663ddbfb24a8344928ec24c0b4cf523728c1623367970b8f263142af95c056c82d0827414833d5b9f26c3a024a04a688851021601a5cbcc1474e754
 AUX mozc-2.23.2815.102-reiwa.patch 924 BLAKE2B 3893f975d43ce29a962c5e712503442b178847acebd92e797040b6b699a37cb051f88a37965e0f194f73bca2e2397a8b070eb6d14bbe92adbba3e17a864e8c8b SHA512 df3f98ab93d7662b5ab038c732d3342b3f5860774559242eca1d0f1cd67275f315c6e4ffad83c6990ef5eb23fc19c0379ed7d3bdd0a377fcb080c066aecd16cc
+AUX mozc-2.23.2815.102-server_path_check.patch 3447 BLAKE2B 8e18cf2f7100cdfeb8e6b1420d773e955994cc7bd5e4bf56e0ffe78cd9a96b044c726c1045c2cd2c326ca151c8bf527b6447b2f509a20e4a912b535f5180ec80 SHA512 106c3170112bde2c6b9eb9ad5d5d460be53bb9162eb5613445170c2ce00f88385946360d13514167a6279c610744784079f8969b8f901f22e51e6397db22b0d3
 AUX mozc-2.23.2815.102-system_libraries.patch 9064 BLAKE2B 0cdf732a1bbf16d4af1d6dee81aacf3f3cb1f1c00c6aeb0fc12dac9dcd8611124e388e5fc721eb9b9472e073515d7457b182ee7cfe466b83bf319d572ae55240 SHA512 2d5b06e855f8c1889367b9b672e3ec81a037bc592872e28319e0180a0dcd177cdff817775a1a0f74ebf48e0b7558cf3b67953120411be753c662c43f409b05ce
 DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
 DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
-EBUILD mozc-2.23.2815.102.ebuild 9674 BLAKE2B f36a730420f6e6b2dc9fb1643458f942581b04991c1f87508dec3239d28228e545460c15960fe70d77642923bbd2d728e4e63b459e5fe4381f0040b2809c7837 SHA512 309c0975e2c9c2575c1cbf29039127e450837a214a4bb2a343cac0a58e9ea6ed45a096f0cdb72c1ab2846fc73aa44a4b6c3f2f0c79ceffc6b6b6a6131966f164
-EBUILD mozc-9999.ebuild 9514 BLAKE2B 23d6960f9eb6551808b264bc278e647339afadd34133397c55538fe3e361cf174edb9f6654204df25cd51306347cdaed97ac530774aceb1b7b48772737992075 SHA512 4caf2575ff9a41e89c4196e7babd321d7abe14f73eeb2d6b03cfccbb2d488a8d2f69761c447a6f7a70cc51178fa3c580651297d394b38bb85d7b3ab699cf226b
-MISC metadata.xml 1127 BLAKE2B 55c44374c1d0c03845435544fb8bcd254bfa59faa54e773110fe2a9bcfba0f6863a1f5c167e3ca7d2a1108e566ae4d7d4155a1a1994bef006bbde906265fffe1 SHA512 8d1ee79d5e359c746627cc10ddae170088dd1be8a69379f60969e588c0c6141fea80ebcba0183a91e786116e8937c14e76888c9232526244aab584ed4ef27a54
+EBUILD mozc-2.23.2815.102.ebuild 10873 BLAKE2B 0402f153f37cd286c38c2d14753af354bc8c2433546e56b670983f5e6d3167e7d091673be84ff4e37a9c36b0b3749298a109a15e0b863d9c5a31d3324334043d SHA512 ea21a724c331befdb6b5ffc8c6f065de40d3ead15aa26c4a230224966dd728962476efa097e3abc510f9cfc5872a4c822d0a5ac3305f7e959dab86a44e2efbcb
+EBUILD mozc-9999.ebuild 10713 BLAKE2B 8c22d2a713e01605abe92717e3b4021c76b11dc7fb0e1f6c4bd93b8000810deb1f95f506f9b17899449b0e67b62d3b5d6ce6bc557b04f3aa244a0f2300c2ef75 SHA512 709319d9bea172d9d0233657ec53831d2cc622cf93c2c57bd334c8474ccb9ab6be87324add7b96ed3cd50dae877822997dfeb2fad2b4ce42cc7a52cbac4485ee
+MISC metadata.xml 1149 BLAKE2B 62ba0c21b06854dc0873cd3677245f083cb21923de1f6aeea41065b8d216f54c485f11474afae8901682d5bdb9fe79c19e4e54af2051984a0e69639d80de72d3 SHA512 55c96d85f11cca6cb6b00ab81e2b84905c20db880f0c0dc7484e4b7210e31699fc340ce4a5e32234fda68e20de9d3fef635091658b916dd238a556a60ce9476a
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch
new file mode 100644
index 000000000000..02e522a32e9e
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch
@@ -0,0 +1,132 @@
+https://github.com/google/mozc/issues/470
+
+--- /src/base/system_util.cc
++++ /src/base/system_util.cc
+@@ -208,28 +208,39 @@
+   dir_ = "/";
+   return;
+ #else  // MOZC_USE_PEPPER_FILE_IO
++  const char *configuration_directory_env;
+   string dir;
+ 
+ #ifdef OS_WIN
+-  DCHECK(SUCCEEDED(Singleton<LocalAppDataDirectoryCache>::get()->result()));
+-  dir = Singleton<LocalAppDataDirectoryCache>::get()->path();
++  configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++    dir = configuration_directory_env;
++  } else {
++    DCHECK(SUCCEEDED(Singleton<LocalAppDataDirectoryCache>::get()->result()));
++    dir = Singleton<LocalAppDataDirectoryCache>::get()->path();
+ #ifdef GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish);
+-  FileUtil::CreateDirectory(dir);
++    dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish);
++    FileUtil::CreateDirectory(dir);
+ #endif  // GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, kProductNameInEnglish);
++    dir = FileUtil::JoinPath(dir, kProductNameInEnglish);
++  }
+ 
+ #elif defined(OS_MACOSX)
+-  dir = MacUtil::GetApplicationSupportDirectory();
++  configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++    dir = configuration_directory_env;
++  } else {
++    dir = MacUtil::GetApplicationSupportDirectory();
+ #ifdef GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, "Google");
+-  // The permission of ~/Library/Application Support/Google seems to be 0755.
+-  // TODO(komatsu): nice to make a wrapper function.
+-  ::mkdir(dir.c_str(), 0755);
+-  dir = FileUtil::JoinPath(dir, "JapaneseInput");
++    dir = FileUtil::JoinPath(dir, "Google");
++    // The permission of ~/Library/Application Support/Google seems to be 0755.
++    // TODO(komatsu): nice to make a wrapper function.
++    ::mkdir(dir.c_str(), 0755);
++    dir = FileUtil::JoinPath(dir, "JapaneseInput");
+ #else  //  GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, "Mozc");
++    dir = FileUtil::JoinPath(dir, "Mozc");
+ #endif  //  GOOGLE_JAPANESE_INPUT_BUILD
++  }
+ 
+ #elif defined(OS_ANDROID)
+   // For android, we do nothing here because user profile directory,
+@@ -237,14 +248,24 @@
+   // is injected from Java layer.
+ 
+ #else  // !OS_WIN && !OS_MACOSX && !OS_ANDROID
+-  char buf[1024];
+-  struct passwd pw, *ppw;
+-  const uid_t uid = geteuid();
+-  CHECK_EQ(0, getpwuid_r(uid, &pw, buf, sizeof(buf), &ppw))
+-      << "Can't get passwd entry for uid " << uid << ".";
+-  CHECK_LT(0, strlen(pw.pw_dir))
+-      << "Home directory for uid " << uid << " is not set.";
+-  dir = FileUtil::JoinPath(pw.pw_dir, ".mozc");
++  configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++    dir = configuration_directory_env;
++  } else {
++    const char *home_env = ::getenv("HOME");
++    if (home_env) {
++      dir = FileUtil::JoinPath(home_env, ".mozc");
++    } else {
++      char buf[1024];
++      struct passwd pw, *ppw;
++      const uid_t uid = geteuid();
++      CHECK_EQ(0, getpwuid_r(uid, &pw, buf, sizeof(buf), &ppw))
++          << "Can't get passwd entry for uid " << uid << ".";
++      CHECK_LT(0, strlen(pw.pw_dir))
++          << "Home directory for uid " << uid << " is not set.";
++      dir = FileUtil::JoinPath(pw.pw_dir, ".mozc");
++    }
++  }
+ #endif  // !OS_WIN && !OS_MACOSX && !OS_ANDROID
+ 
+   FileUtil::CreateDirectory(dir);
+@@ -356,6 +377,10 @@
+ #endif  // OS_WIN
+ 
+ string SystemUtil::GetServerDirectory() {
++  const char *server_directory_env = ::getenv("MOZC_SERVER_DIRECTORY");
++  if (server_directory_env) {
++    return server_directory_env;
++  }
+ #ifdef OS_WIN
+   DCHECK(SUCCEEDED(Singleton<ProgramFilesX86Cache>::get()->result()));
+ #if defined(GOOGLE_JAPANESE_INPUT_BUILD)
+@@ -409,6 +434,10 @@
+ }
+ 
+ string SystemUtil::GetDocumentDirectory() {
++  const char *documents_directory_env = ::getenv("MOZC_DOCUMENTS_DIRECTORY");
++  if (documents_directory_env) {
++    return documents_directory_env;
++  }
+ #if defined(OS_MACOSX)
+   return GetServerDirectory();
+ #elif defined(MOZC_DOCUMENT_DIRECTORY)
+--- /src/handwriting/zinnia_handwriting.cc
++++ /src/handwriting/zinnia_handwriting.cc
+@@ -31,6 +31,7 @@
+ 
+ #include "handwriting/zinnia_handwriting.h"
+ 
++#include <cstdlib>
+ #include <memory>
+ #include <string>
+ 
+@@ -48,6 +49,10 @@
+ 
+ // static
+ string ZinniaHandwriting::GetModelFileName() {
++  const char *zinnia_model_file_env = ::getenv("MOZC_ZINNIA_MODEL_FILE");
++  if (zinnia_model_file_env) {
++    return zinnia_model_file_env;
++  }
+ #if defined(MOZC_BUILD)
+   return MOZC_ZINNIA_MODEL_FILE;
+ #else
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch
new file mode 100644
index 000000000000..dd606e27fb56
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch
@@ -0,0 +1,95 @@
+https://github.com/google/mozc/issues/471
+
+--- /src/ipc/ipc_path_manager.cc
++++ /src/ipc/ipc_path_manager.cc
+@@ -332,9 +332,21 @@
+     return false;
+   }
+ 
++  // Expand symbolic links in the expected server path to avoid false negatives
++  // during comparisons of the expected server path and the actual server path.
++  string real_server_path = server_path;
++#ifndef OS_WIN
++  char real_server_path_[PATH_MAX];
++  if (realpath(server_path.c_str(), real_server_path_) == NULL) {
++    LOG(ERROR) << "realpath failed: " << strerror(errno);
++    return false;
++  }
++  real_server_path = real_server_path_;
++#endif
++
+   // compare path name
+   if (pid == server_pid_) {
+-    return (server_path == server_path_);
++    return (real_server_path == server_path_);
+   }
+ 
+   server_pid_ = 0;
+@@ -344,17 +356,17 @@
+   {
+     std::wstring expected_server_ntpath;
+     const std::map<string, std::wstring>::const_iterator it =
+-        expected_server_ntpath_cache_.find(server_path);
++        expected_server_ntpath_cache_.find(real_server_path);
+     if (it != expected_server_ntpath_cache_.end()) {
+       expected_server_ntpath = it->second;
+     } else {
+       std::wstring wide_server_path;
+-      Util::UTF8ToWide(server_path, &wide_server_path);
++      Util::UTF8ToWide(real_server_path, &wide_server_path);
+       if (WinUtil::GetNtPath(wide_server_path, &expected_server_ntpath)) {
+-        // Caches the relationship from |server_path| to
+-        // |expected_server_ntpath| in case |server_path| is renamed later.
++        // Caches the relationship from |real_server_path| to
++        // |expected_server_ntpath| in case |real_server_path| is renamed later.
+         // (This can happen during the updating).
+-        expected_server_ntpath_cache_[server_path] = expected_server_ntpath;
++        expected_server_ntpath_cache_[real_server_path] = expected_server_ntpath;
+       }
+     }
+ 
+@@ -371,9 +383,9 @@
+       return false;
+     }
+ 
+-    // Here we can safely assume that |server_path| (expected one) should be
++    // Here we can safely assume that |real_server_path| (expected one) should be
+     // the same to |server_path_| (actual one).
+-    server_path_ = server_path;
++    server_path_ = real_server_path;
+     server_pid_ = pid;
+   }
+ #endif  // OS_WIN
+@@ -399,7 +411,7 @@
+ #ifdef OS_LINUX
+   // load from /proc/<pid>/exe
+   char proc[128];
+-  char filename[512];
++  char filename[PATH_MAX];
+   snprintf(proc, sizeof(proc) - 1, "/proc/%u/exe", pid);
+   const ssize_t size = readlink(proc, filename, sizeof(filename) - 1);
+   if (size == -1) {
+@@ -412,18 +424,18 @@
+   server_pid_ = pid;
+ #endif  // OS_LINUX
+ 
+-  VLOG(1) << "server path: " << server_path << " " << server_path_;
+-  if (server_path == server_path_) {
++  VLOG(1) << "server path: " << real_server_path << " " << server_path_;
++  if (real_server_path == server_path_) {
+     return true;
+   }
+ 
+ #ifdef OS_LINUX
+-  if ((server_path + " (deleted)") == server_path_) {
+-    LOG(WARNING) << server_path << " on disk is modified";
++  if ((real_server_path + " (deleted)") == server_path_) {
++    LOG(WARNING) << real_server_path << " on disk is modified";
+     // If a user updates the server binary on disk during the server is running,
+     // "readlink /proc/<pid>/exe" returns a path with the " (deleted)" suffix.
+     // We allow the special case.
+-    server_path_ = server_path;
++    server_path_ = real_server_path;
+     return true;
+   }
+ #endif  // OS_LINUX
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 5b85ef8a79d9..967561182aee 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -15,8 +15,8 @@
 	<use>
 		<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
 		<flag name="gui">Install graphical user interface tool (mozc_tool)</flag>
-		<flag name="handwriting-tegaki">Use handwriting recognition model from <pkg>app-i18n/tegaki-zinnia-japanese</pkg></flag>
-		<flag name="handwriting-tomoe">Use handwriting recognition model from <pkg>app-i18n/zinnia-tomoe</pkg></flag>
+		<flag name="handwriting-tegaki">Use handwriting recognition model from <pkg>app-i18n/tegaki-zinnia-japanese</pkg> by default</flag>
+		<flag name="handwriting-tomoe">Use handwriting recognition model from <pkg>app-i18n/zinnia-tomoe</pkg> by default</flag>
 		<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="renderer">Enable native candidate window</flag>
 	</use>
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index f198c294cea6..425b785cbfab 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -44,10 +44,10 @@ BDEPEND="${PYTHON_DEPS}
 	dev-util/gyp
 	dev-util/ninja
 	virtual/pkgconfig
-	emacs? ( virtual/emacs )
+	emacs? ( app-editors/emacs:* )
 	fcitx4? ( sys-devel/gettext )"
 RDEPEND=">=dev-libs/protobuf-3.0.0:=
-	emacs? ( virtual/emacs )
+	emacs? ( app-editors/emacs:* )
 	fcitx4? (
 		app-i18n/fcitx:4
 		virtual/libintl
@@ -108,7 +108,9 @@ src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
@@ -304,9 +306,33 @@ src_install() {
 }
 
 pkg_postinst() {
+	elog
+	elog "ENVIRONMENTAL VARIABLES"
+	elog
+	elog "MOZC_SERVER_DIRECTORY"
+	elog "  Mozc server directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
+	elog "MOZC_DOCUMENTS_DIRECTORY"
+	elog "  Mozc documents directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
+	elog "MOZC_CONFIGURATION_DIRECTORY"
+	elog "  Mozc configuration directory"
+	elog "  Value used by default: \"~/.mozc\""
+	if use gui; then
+		elog "MOZC_ZINNIA_MODEL_FILE"
+		elog "  Zinnia handwriting recognition model file"
+		if use handwriting-tegaki; then
+			elog "  Value used by default: \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
+		elif use handwriting-tomoe; then
+			elog "  Value used by default: \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
+		fi
+		elog "  Potential values:"
+		elog "    \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
+		elog "    \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
+	fi
+	elog
 	if use emacs; then
-		elisp-site-regen
-
+		elog
 		elog "USAGE IN EMACS"
 		elog
 		elog "mozc-mode is minor mode to input Japanese text using Mozc server."
@@ -324,6 +350,9 @@ pkg_postinst() {
 		elog
 		elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
 		elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+		elog
+
+		elisp-site-regen
 	fi
 }
 
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 037a8d2d2567..d7c66b558d92 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -44,10 +44,10 @@ BDEPEND="${PYTHON_DEPS}
 	dev-util/gyp
 	dev-util/ninja
 	virtual/pkgconfig
-	emacs? ( virtual/emacs )
+	emacs? ( app-editors/emacs:* )
 	fcitx4? ( sys-devel/gettext )"
 RDEPEND=">=dev-libs/protobuf-3.0.0:=
-	emacs? ( virtual/emacs )
+	emacs? ( app-editors/emacs:* )
 	fcitx4? (
 		app-i18n/fcitx:4
 		virtual/libintl
@@ -108,7 +108,9 @@ src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
@@ -303,9 +305,33 @@ src_install() {
 }
 
 pkg_postinst() {
+	elog
+	elog "ENVIRONMENTAL VARIABLES"
+	elog
+	elog "MOZC_SERVER_DIRECTORY"
+	elog "  Mozc server directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
+	elog "MOZC_DOCUMENTS_DIRECTORY"
+	elog "  Mozc documents directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
+	elog "MOZC_CONFIGURATION_DIRECTORY"
+	elog "  Mozc configuration directory"
+	elog "  Value used by default: \"~/.mozc\""
+	if use gui; then
+		elog "MOZC_ZINNIA_MODEL_FILE"
+		elog "  Zinnia handwriting recognition model file"
+		if use handwriting-tegaki; then
+			elog "  Value used by default: \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
+		elif use handwriting-tomoe; then
+			elog "  Value used by default: \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
+		fi
+		elog "  Potential values:"
+		elog "    \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
+		elog "    \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
+	fi
+	elog
 	if use emacs; then
-		elisp-site-regen
-
+		elog
 		elog "USAGE IN EMACS"
 		elog
 		elog "mozc-mode is minor mode to input Japanese text using Mozc server."
@@ -323,6 +349,9 @@ pkg_postinst() {
 		elog
 		elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
 		elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+		elog
+
+		elisp-site-regen
 	fi
 }
 
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 0ca47c34dc22..85964b21e6cd 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -6,5 +6,5 @@ DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca5
 DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
 DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
 EBUILD nkf-2.1.3-r2.ebuild 1686 BLAKE2B 857479545baf5c7cd0c5786e839b1c0adcd6d296b02d99326d7ddd0f437e9720cb6ee36830f82f07c28cfea6c6b105285842bf5075c1f0064b7a5766ad3a09b4 SHA512 167cd508e69495ed1646a535ccd65b1202cba8aedd875872d81c2f0be5eee789cf11f6c2173db3af5cd824cab2d8c7b3f8e26933e1a428345bbebce96ef631f6
-EBUILD nkf-2.1.4.ebuild 1801 BLAKE2B 9c7bd03df2ba6c858d51c948bf466142562f98d839fe0c2882fc892f8ab5cb22bde1d51111ad2b07f2b77e02e6cef6f166df8f82584e2cb90d36d5768d8570d3 SHA512 32c61a571fa435aaa4df2317935b3208c7097b35e09fa0cec80e4782ad61b8c32bc240143214ec8420bb8e3efab6a6aa95d6d8502c4e254513df5d0745c655ac
+EBUILD nkf-2.1.4.ebuild 1797 BLAKE2B b69b716e3dce6e7033a3b8fcd6d69aa1c6a1789ab3df7bfd0c8f8a3a4919a2c01597896e1e5b240abe47d210a1c5826c9b1dc6dd51e7499c3da4aff7cab780aa SHA512 87bdba65f903aa753cb72b47573c81972066157d24c795e485d1437641ec69e017793a04e6521fa1e87881df6a650bbf14aa29c51de0494ddb5d3c5030ad77fa
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 1c8e0e68da49..2735d8fc373e 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
 
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 04f002bf675a..3e35ff0c3d04 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,6 +1,6 @@
 AUX opencc-stop-copy.patch 625 BLAKE2B ab2f98a03bb079ad116994c4d05e59e3638f648b3e03ea4e6a357a8658612a1425f2578989c0086e31d749e3533ffb814457071582f9fbf3fbcdf0d184892940 SHA512 e34388bc5d1841e3655c6209e31cf18957a9a02f23d49d9b1f184e48005cf5d5c108656439900f0d79fc1801700872a433ab761154abc424b717e12a616487ca
 AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec
 DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
-EBUILD opencc-1.0.5.ebuild 1027 BLAKE2B 27373ee91ab0aefb22ce2f7aee92f48de40d11f9f136363349af6bed5fb3a3d03aa91755664f623f885389042a9e88481fc133507df64ac2b817d70ea6adaaf3 SHA512 9f52f9b8cf3cfaae5ecad6638531d40d2e31c0cf4edf60963cf66c33c2b10c6d40516dfb67158ea11474f37cd427228a3f279faadd1f334606d2592116ef6ee8
+EBUILD opencc-1.0.5.ebuild 1026 BLAKE2B c4398786816d084d1dca59222df6ec6f0aa9cfb9a5f5110d7a82a70014a639908c5e4167fd2d98f499c1bf4844ab5c3a44dbede4262e310bf897462a75be7579 SHA512 976d0ff8b98dee4b8d42e298c69fe4527709059df619eb91a2c1151b1a4b314b05455c9e300c3cfa95bbddbfedadb39a387a9835bf7e327ab029600b4efbddfd
 EBUILD opencc-9999.ebuild 989 BLAKE2B 56348d3d7b5365fa1143bd26c86d06f45870b347a3700c72200d6e6ae0bb3f9bf50e830d5456cf004edd249e8edc45663f49d858eab3a323aa752070f4bc921f SHA512 b15870c21c474a4af87e0a8a9cb96f2f6f92c398d93050f345c84e5acb0fed31c68cc9616dedcde57dd892c1839d5d8c9d73d7c04617160aca3902c8e644954c
 MISC metadata.xml 491 BLAKE2B ec523a795afb6ae99cc5835e3df9fe07916aac4bf8552254f3bacbb9e1764a3ba5a79eddcabd8f34417544709a10a0bd34e6133a01b9b7a15156a9d282316d86 SHA512 303cf35b932c5d5a1fdd1a25b2c71a65a4aab761fe3c66d72439d691255a5edd1b943287afe8b4c53ab62531a012dafb5f416471a172f5b487557684dc6655df
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index f384112fda16..02e7cbbde3bf 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/BYVoid/OpenCC"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 hppa ppc ppc64 ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index c432a83e968e..35a0bd8cb8d4 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,8 +1,6 @@
 AUX 2.2.3-compile-fix.patch 593 BLAKE2B b6b47cd9af438766fb46a3bc7fdeabfde5af18bd119d2cff3743499fe32a14efbe8d0c206f82fbd84153b25a08df15967c7c818f67cd1caf81c3286ca46105e3 SHA512 c12be968ded30aeec90e2a176c1f5e452bc89951724b575467710f5e6a181a71f91bf4acb182b000793f0b543f3776c54160651ab0754f3ff7ee63a79758014d
-DIST poedit-2.1.1.tar.gz 2722379 BLAKE2B 3e5102ab9b2b6b6701abd3f44dab846d6989e5abdbcadf924cf7032d725fa1b405425cefa37eb0230d3de68ea0c60ec05e7bfe84f906cdec0230d8c1284f5779 SHA512 0b5e13c3e59c9bde78b95b45aa8765c16c03d12ca9fbabe4448e409ff4cd627676d1b77c011c75a54dc0e10acda23ceb49ca063e76a29154344dc5fdb9e5f8a8
 DIST poedit-2.2.3.tar.gz 2834106 BLAKE2B bf3670f612ca673893eb9f6cb23b67d329669266345fb4c29af44da28ff536825935bb209a250053e6eb65d937a7ae4b183dccc855e4747cbcc1cbb94161b6e6 SHA512 566f397add593d0b05b995cbd1cff1b063b6eb49b02058511f13c27ed5887685816f8dd9280e1a6be2dd594049c6eecd73efc5cf7835475d3cb5a94fe38f280f
 DIST poedit-2.2.4.tar.gz 2840389 BLAKE2B 1f88aeba2d4dc5ad802843cc39c298936d6619d98839257c302858f14f8d0ef3fabbda290d83192e501a7679ad2ebc63d1a87314e885d8d7e465b54de0feb297 SHA512 e7388e0657755752bc9eacd95d0a2f8f70d5a759fa15f054be3a8d07df821e8dceb9994652b576553808840bac520fcd292fd15987659f8cb4e4c8c7930ae919
-EBUILD poedit-2.1.1.ebuild 1388 BLAKE2B 040a78630d85e2c4c0005071fa159b6021a9b1759016eec281b93d83a87c931d7c52f5f52035c312e3cfb55991c07304fdfdbdc8e6d9ff94246a51e3c6314b92 SHA512 e40a70aa919ad1e51aa3f98e1f5a9aa581df065b86063d31a7c5a204fcc63a229ff1f6a9111139fbb791ab53f5b548e5b92a8f6511f60a1282b6d6d88c39224a
 EBUILD poedit-2.2.3.ebuild 1440 BLAKE2B 5dcd19d0652cc29e1d49fbcf349ff00fd15c8b6e8f520480b07c825bcb5fe98e0bf610c688949633797f6ab7ac784d04c65ff79f3aae2f4c407e3e0452f110df SHA512 1c201a50e63f564324ea0aa1f6a955aa69b3cb9e76711a936c6e40321b4eadeb7490433586b35ee6811429cb6c2a73c4fd9f57061998c4e88e404526b261afaf
-EBUILD poedit-2.2.4.ebuild 1292 BLAKE2B 2cb4cda71d07911383126b70e1435355a38d7646df9e3ead8876cc361389e863abd3b97e72298b3a823f1f55ef8cd25b13b45f06b82f5f85274c4b2a0f707a6b SHA512 7b6a84f1dceb550e8b2e99328dfbe377f65e34f7b5868f869b615e434c1fd1a13d09762b8c7c7554e396f64e972d2d4a448297d358b600e9ba379981a467bfcb
+EBUILD poedit-2.2.4.ebuild 1287 BLAKE2B e2c2cba68d5061d6f377542336229a87459aea604e6ea3248e240467b1d611cfc28cd800cbe1d95d1019d8b60585a63b97116d2763dd932ad21d1e7f9448838d SHA512 2f5cb803b5dd4fb8e0468712e7aa6feb25f0baafc2a8569b1753fc86d0ac020276a4b7c1f180825bce65a1f9d85968b9887f0f1bff714c7b985227d671481c77
 MISC metadata.xml 611 BLAKE2B 7eda7aaa83b70b383879068c765a142c5e18bb79865a88c325c0a4ab8aa7f6ca00b197030f7a73baa4bbcb87dbb14097dd218d30dd6475705552500d6d0fb4f7 SHA512 96dfc2db0caf0915cca3997cff6fc021a3c196f4b7a5b9f2007c6284d9dfecfc66c1d5e0f44928a98810f6a23a7d5c6fc9db2ee3b24ce7ff7b9cb42afafd5f2f
diff --git a/app-i18n/poedit/poedit-2.1.1.ebuild b/app-i18n/poedit/poedit-2.1.1.ebuild
deleted file mode 100644
index 5baa598d9def..000000000000
--- a/app-i18n/poedit/poedit-2.1.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
-WX_GTK_VER=3.0-gtk3
-
-inherit gnome2-utils l10n wxwidgets xdg
-
-DESCRIPTION="GUI gettext translations editor"
-HOMEPAGE="https://poedit.net"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
-
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	app-text/gtkspell:3
-	x11-libs/gtk+:3
-	>=dev-cpp/lucene++-3.0.5
-	>=dev-libs/pugixml-1.9
-	dev-libs/boost:=[nls]
-	dev-libs/icu:=
-	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
-		rm "locales/${1}.mo" || die
-	}
-
-	l10n_find_plocales_changes 'locales' '' '.mo'
-	l10n_for_each_disabled_locale_do my_rm_loc
-
-	setup-wxwidgets
-	xdg_src_prepare
-}
-
-src_configure() {
-	# CLD2 and C++ Rest are not available in Gentoo
-	local myeconfargs=(
-		--without-cld2
-		--without-cpprest
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/poedit/poedit-2.2.4.ebuild b/app-i18n/poedit/poedit-2.2.4.ebuild
index fd485f8975e8..371ec5eb7eba 100644
--- a/app-i18n/poedit/poedit-2.2.4.ebuild
+++ b/app-i18n/poedit/poedit-2.2.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GUI gettext translations editor"
 HOMEPAGE="https://poedit.net"
 SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/app-i18n/rime-data/Manifest b/app-i18n/rime-data/Manifest
index d45e1a6a3b1b..4361fc8d4f98 100644
--- a/app-i18n/rime-data/Manifest
+++ b/app-i18n/rime-data/Manifest
@@ -1,5 +1,5 @@
 DIST brise-0.35.tar.gz 6707277 BLAKE2B 610ea2e58800676b88bc79ce7075ed5fa8ec041f2ee34e3dfbcbfa642f84413d8b188af8e49de56d815eac2e5188d18287749976aa4e28ba5c7c7dfc6dece30a SHA512 1a2a3ddba9be7089a1b82ce446a3e5dc93a13fff121f861aa1acbdea950f490c9367866902a056296e17de5076a59a54741ceb3a59a9c0ec58b6b7c54f519f3d
 DIST brise-0.38.20180515.tar.gz 7116807 BLAKE2B abf73b5813b18f4cd3ef68b3f6e8ad2c54ac90a0969a57e7786b53b99c162efeea9e82d962b3e8d7b8b1742852beb5d0eb4b07de65bdc1881c43388de552ee4a SHA512 60b3d37486b6858114036664327c9be00d09d3f7d3f5aaf337c6bc5a46134e5785fc1732db5aad15e1e628241a70c9c34b03f982fb13cae6d91220731b451bb9
 EBUILD rime-data-0.35.ebuild 558 BLAKE2B ea665052bd0668d772e2c556b7ffa9784eb1d89d8aa082deab295f8cea5c1b65597e5390a9a96aaeeca1cf5c2891270454f9ba35867fdd91da220c75dd561e9f SHA512 fa661b513b6a36e180d791230f293f950f4274f7349500d871df325fe995967e993bcee9e6569e76ba604efb3a2b46bac72503117c16c0a6e2e75bc134b8779b
-EBUILD rime-data-0.38.20180515.ebuild 682 BLAKE2B 435aae8b6cefb4b220b227e24dafd5e93e32268011c19a660fb79d005659343dd3d4ca06727028928f02f3c45251c51feb2506e36e2474e9efd05debdd634db7 SHA512 8a1c2c2a1c863aa1b3d5199f3360a55ca8cb3b027776ac4fa0eeca994fafb25ecc04f48a1efc9203cc0105a4cdaa4fa6a7f3e0fb3a81df1d9ebef7f591e553fb
+EBUILD rime-data-0.38.20180515.ebuild 681 BLAKE2B 8038e65318c4db154b417239f42f0df632ea21d24a72864ca3771b0ce18a62b3138c9f7f20cb4d8967e723290b0245009daf0958530d1615a5d6e07a6fa17358 SHA512 1a161964b82beadfeee216f2aa48c9c7541286e80f717bdaa486c9ce40606d27ad25d23d6aa94bf5c6d627fbbe8ba9cc44b0f8526f628860c4b332e8024a7370
 MISC metadata.xml 600 BLAKE2B 3c4ba0371ca7088b9142f7fdad617c1b149cf7d5e6b9f93a5a4f12af1de4d276e3973a8092450bcc86e1acab4389d04f6a1ec9ee5cf599b7b7c1ee43cb0064bb SHA512 759252765da22d73f9e907c0095d7e60fa73aac194929da36757eab25ecb57311381459c444345eb4da5305ea15ba5ee5b89d458f39101ad887d5d9766282723
diff --git a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
index 447f4f4da0f1..1bf90c677cb1 100644
--- a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
+++ b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rime/${MY_PN}/releases/download/${MY_P%.*}/${MY_P}.t
 
 LICENSE="GPL-3 LGPL-3 extra? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
 IUSE="extra"
 
 DEPEND="app-i18n/librime"
diff --git a/app-i18n/skktools/Manifest b/app-i18n/skktools/Manifest
index 29c989f04ff8..799572854f9b 100644
--- a/app-i18n/skktools/Manifest
+++ b/app-i18n/skktools/Manifest
@@ -1,6 +1,6 @@
 AUX 50skktools-gentoo.el 91 BLAKE2B 290cc5542c31bd9c3cd0095162928c80548db2800fc0a6293a8d6cc65caf3f567be725c17a3592f66554a90bd8f86f13641cf3c51dbf6331fc5d5ccce55e9f55 SHA512 f4376f1146586604bc9ef1ea080e5df79f721a245b89ae76dfa2aee38876e38edb804f9201d9eb751a879d017ed929fa18d1b38b307879fa607d086a404d0612
 DIST skktools-1.3.3_p20170305.tar.gz 483715 BLAKE2B 0de2cb906e8433f66e706f0aa4dd8c4900343b48bfb9bb24aee4927f583650f54132c2a3bb607c17cefb0f0e686bcf8a0f4bd6ac07b6a9a71c0bd870eda587a7 SHA512 f6e9041fecf8c28a84c3996ca120371528c034eeca3695cb224b4cf225e8dab9e69969d7fb955112cd1e9c1e80c2ba8e2aef4f0eb81f55374dd626402482c235
 DIST skktools-1.3.4.tar.gz 482860 BLAKE2B f9e822531f8f715291e55ec6dec0eeb31683dc72efc7ba73621cfd0c29f0c5147cbef8256d44848792b8a1601c1878321b2dc0260df9d32d0e5e18eb65220987 SHA512 8749dfc4f18474db860d8b7cd85fadfc00327b199addb31a339aa78dd66cb98032429664bdad4b47176b5b64b156b7264bc35a284861f6b9ec8cc9979d4d5ce1
-EBUILD skktools-1.3.3_p20170305.ebuild 1197 BLAKE2B 417e30a68889f6ea49b8511edece026d1e04bcda6fc18410b0650242f2a6e7a66deeae5601b41427d21d134e6a900b72f6c8610fe36d7ceb02c8de03c13e6230 SHA512 b5cdbe1fd05946477044276c30b69c69e1e467efd6a73e9407caa7b12694e6011f449801537a9219efab3e7b3fb5fcf48615830dfb839e8c184a1ce303a31dfb
-EBUILD skktools-1.3.4.ebuild 1109 BLAKE2B aec68fe21ab4fd1c0176283c95cd9f33422e9841a24207dfd4bfe3f6d00a1b3af6f0502da436f61b29c71e42612d857cddcc58868b58f222e2b4ff06ed140025 SHA512 b4ac462a44c4cc2d155ebd11618b4c23fe87396becaac822592573a82f51ac7247dc2594c1a38f0eded12a7e5fe0ae7bc7aa86790a18198d6acfd07449925c94
+EBUILD skktools-1.3.3_p20170305.ebuild 1207 BLAKE2B aaca802b0bd5e3dc85b72b81269360829dd3e01b1284b186618c4c7e06e8b922a83355292800a9c5463888c80511c23e6dd343156e5f7de2fa285df94f154c1f SHA512 0ef2f85e7ffa45a2636de95b11deb947dc432cfa7da572b3250c9ef79c24891c0ca81c684e087dc13e2e8909df4b66d6ea68e88cbc1ffcc303728bb13de85f0f
+EBUILD skktools-1.3.4.ebuild 1119 BLAKE2B de109c55a614778449bda3550f9605c4a20b797c21fd2654178ca1584be8b08544f120ec468866f74af745b961585a6c78d04e04a442d629133a6cd5c261f55e SHA512 b411ead8853a5f1a3df5184d60aa5b9e2c8f46da7c6e5bff7834e6b0e89d642e36de3589f96ecb8c80c810b877767fff7dac064e244cec4bd72a8f28d3241103
 MISC metadata.xml 325 BLAKE2B 2d57ed82902d3daf56c670eb02e451104a56374c00f64ffcabc34b85b1bd3666c982624424f7a3e1da5f79a40c336ac16f7b1d62ddf81f2465b790fa3cdfba8f SHA512 aff23e906c8b6f0dbdc293aa4138b51497d32760f0c77307e11d9f7797bffd0d1363e0d8dd5639f8b9838838737afd05dab5d6e0a4f9c8596effdfef733af75b
diff --git a/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild b/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
index bf622beb43df..b7fa7d4f12d0 100644
--- a/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
+++ b/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,7 @@ IUSE="emacs"
 
 RDEPEND="dev-libs/glib:2
 	sys-libs/gdbm
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/app-i18n/skktools/skktools-1.3.4.ebuild b/app-i18n/skktools/skktools-1.3.4.ebuild
index 31dc8f2d8b1a..bebc1e789326 100644
--- a/app-i18n/skktools/skktools-1.3.4.ebuild
+++ b/app-i18n/skktools/skktools-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ IUSE="emacs"
 
 RDEPEND="dev-libs/glib:2
 	sys-libs/gdbm
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index 5179447127a7..b91fbe4731db 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,11 +1,15 @@
 DIST JMdict-2018-06-12.gz 18306650 BLAKE2B 3ddb29bf631567717085912b1fa21c701e6183c94907f64121daedf358303df09a754bcdf51f24f0d7c95bf1bfe4ea13779f5e3532bd19a3f99a33751259a893 SHA512 cd8e0a737ccd1ccbe7c53ab0affb5d4ca068656966c75f0abbc184ffcdc69d8a1dbe0f096a16f0b59ecaed40371a29e566ee5076a7e80e3f51796e32798bed3e
 DIST JMdict-2019-10-01.gz 19418133 BLAKE2B a7f3fb45fafaa0d5fdaa7366d2d299cd872edfc6834743529604cb2803f60112daccf82b6c48db0e100b52fb31b1fe2705369fb8a1c2b83c0eba65176ef59d90 SHA512 033968dfc3504611db23269361d72564fbf81a59d7f1ed94f4303c51748f4f31a2b38b3c2a6d846941a886f357d5dd320bc0f043a151ac1c70e43df9c594a599
+DIST JMdict-2020-01-01.gz 19493878 BLAKE2B a797cbabffaafdcc967078ebf91ba27280d9a2ba040021fa605e674246ad3837774b2f17a7f4386cec3a2f53afb742fcd9f0bb6784b2014659d8785d59e321cd SHA512 691077030421e909dc171c217e6951edd48b567bf0821c7b68da7a2fc410e3f55d73db1943a9b99128763655d03e175e431590d869032645ae32d69dae5acdc1
 DIST kanjidic2-2018-06-12.xml.gz 1482391 BLAKE2B c6f1d18f17b2107937fe07b77d6aa297d156d9c250cdc480000aeb7f8c9cd27a94e2cce1df80e4612d1bcadc94d92d5d013cfc8d923c5ceaba9ed5b0a692ae78 SHA512 700aba18e18ab271dbc583f1a1cc16dd7209e4aa48417201f0b51723d35f5aedcff299ed1503cb743151abce37c94c0facbab09dd0a46126131bb54f2004aa23
 DIST kanjidic2-2019-10-01.xml.gz 1482675 BLAKE2B faf2ce4367796b18c3e858ef05203610810e38e44cf3b6e06fceda4204809fd366f6c16604618bf8b668761c9ac2045ed18484a374f2648cc88ba43fa5e5eb7b SHA512 aff301e824a1c31ff4850f709ee6c4ee6a0a54aa4823a5fcb0c5419d7b96239c16bd091f5557f02e2b7c3d0ced8cb2ae19805723c46f9a3a906adecc20ec631c
+DIST kanjidic2-2020-01-01.xml.gz 1482692 BLAKE2B f50f45e982842b1fc161551640aa7bb8bc13e858c64576af25101c0bbdcb5d5734ebba86be180434781ba62d37370eae9b53bad7a30eb06bcffb86233f85f3fe SHA512 df0d0827525ff0406b33811f9b0eb24f7ab99288879dc316af8125c24448b9919224d6cc7c20648791dbbe8f29d05d977e77c9316a9aeb69513e29cf2bc40e92
 DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
 DIST tagainijisho-1.2.0_pre20180610092832.tar.gz 3634107 BLAKE2B f5cb75f45fced30c64f615147c3eb7e4d473e81dd734517710bcfdf390d1a34a1780196b6dbbb7a6d297df0bb8d73933d09a76eb6b8dd13d1c0759c562e81695 SHA512 3b17ff6972e3cfd35f4f9e8c575153a4c2021a66a238f631616452a16a151d604106586d438cdc574211bff54118d89e492f9460da4b25fef88a2354b0bd8555
 DIST tagainijisho-1.2.0_pre20190507124027.tar.gz 3634210 BLAKE2B ec11eba3e20f2a1d55b24c67b95bd98d9ec96a7476533bc42d56866c87f03fd8d58133b5f6aa4e6f37a7ca4dd8b447a0414f0b9651adaa6fb0141c6df4b61073 SHA512 ace6fd4ff46d1bea329f3c85ea6df63583f256d5a26b78e3d64d47be2a37f74b262c0b6254fad4b258b6bb1cb3eff3bb4a4ed712f9ee72f21810717ce1a8f3d8
+DIST tagainijisho-1.2.0_pre20191230120610.tar.gz 3635034 BLAKE2B 4f86febae1dfe1de236668bd405294c1e11510b8a942abfcb378d0e46c38cc179d16f5365dbb8322c7ad47cc333a816ce883af5993e0be90f11a43f2710cd45d SHA512 4fa93b7a51415c57f1d81748f15f23e90e4d9a1f91c3f0d96447d08a5bf1bbfc6bc2dbd4083e0b9328e32795f01de94bae834b4e7ff1830cfbe0ec215f20d7f8
 EBUILD tagainijisho-1.2.0_pre20180610092832.ebuild 6180 BLAKE2B ac53048f5508366e943275fdf19ce7dfc7e5ccc4d228608d57828098911a5219ac89b0f4f5450cfba87dadd06fcde209438834e4264286b257cf98dba6e26bad SHA512 8ed6439eae16cea8e714fe8a5de659286414bbaffccc6b3c9a0c79d33a36534039b6a56a5e8fa936556a9264c2e4b164841ced3c3805f21da82928621198baab
 EBUILD tagainijisho-1.2.0_pre20190507124027_p20191001_p20191001.ebuild 6662 BLAKE2B 08869518725b5f883b75e2fbb1520c1db6c77ecafcd18dfb702b4c887103583f0def09895a0c62b2b64afb9597ec10bab9220d5ed1276c245434d4bd217564f4 SHA512 cf8efd353a6e9df25b4f198026c83b788a66f8b4a1b61dfddd3b77eb474a821fc4361a49c7b69905e268dedf59427cfe609fd97b690eaea67dfab230232aeb85
+EBUILD tagainijisho-1.2.0_pre20191230120610_p20200101_p20200101.ebuild 6662 BLAKE2B b55c84d61fef76786a82f67904b1b4b058a430023f05a9521d0c1783e4834d0333362de53fb791e907451fb73e593ade756fad600363d2619774c9d18a69a70b SHA512 b3055cbbbd23ae22e827181a6c11e17943d3c604a2453afb6fb389c0d4a877f77585242d39c747e3a9cee81df52ce1754aac3e7616051dbfeab84e07845cf09c
 EBUILD tagainijisho-9999.ebuild 6611 BLAKE2B 49eb2ad3a99a2cae8097c3fbe54f99b7d63fe1ba2b88793bfe9a57f38afc04ae4ccd5297642603cc55203ec461d2b56885cf0a504c75b9319194df878d27b752 SHA512 ff98dc941da2ae88e664564a5fbf674e75f5da2e8d1501dac23c294bc1ed718f6b8e7252c9e889cc9b3519217b9a2b37a5e6f38dd828dce7f269296af316311d
 MISC metadata.xml 1133 BLAKE2B 863fcd0cbb85b715cf7666210c74a9e88423b0e982b3e05b4333036b607e4d2cf73b35dc6b8f5e549a35a6d8e2cc107f110f3500762d49065bd1ed2097dd6338 SHA512 cde2818f44f02091ac994ca049a25b90519b62b669b7923a52043df23a0de7f3e1f657d3080e574048556dbacd5521995addd35267ec9d1357360f473222cef7
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20191230120610_p20200101_p20200101.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20191230120610_p20200101_p20200101.ebuild
new file mode 100644
index 000000000000..d79b325e4253
--- /dev/null
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20191230120610_p20200101_p20200101.ebuild
@@ -0,0 +1,200 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils xdg-utils
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho"
+elif [[ "${PV}" == *_pre* ]]; then
+	inherit vcs-snapshot
+
+	TAGAINIJISHO_GIT_REVISION="1257df3934415ed6f30990c34b725d89b2ffbb8b"
+fi
+if [[ "${PV}" != 9999 ]]; then
+	TAGAINIJISHO_VERSION="${PV%_p*_p*}"
+	JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}"
+	JMDICT_DATE="${JMDICT_DATE%_p*}"
+	JMDICT_DATE="${JMDICT_DATE:0:4}-${JMDICT_DATE:4:2}-${JMDICT_DATE:6}"
+	KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}"
+	KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	KANJIVG_VERSION="20160426"
+fi
+
+DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
+HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho"
+if [[ "${PV}" == 9999 ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
+else
+	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
+fi
+if [[ "${PV}" != 9999 ]]; then
+	# Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz"
+	# Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz"
+fi
+
+LICENSE="GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+if [[ "${PV}" == 9999 ]]; then
+	PROPERTIES="live"
+fi
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND=">=dev-db/sqlite-3.12:3
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh)
+IUSE+=" ${pkg_langs[@]/#/l10n_}"
+unset pkg_langs
+
+if [[ "${PV}" != 9999 ]]; then
+	S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}"
+fi
+
+src_unpack() {
+	if [[ "${PV}" == 9999 ]]; then
+		git-r3_src_unpack
+	elif [[ "${PV}" == *_pre* ]]; then
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
+		mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die
+	else
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
+	fi
+
+	if [[ "${PV}" == 9999 ]]; then
+		# JMdict.gz and kanjidic2.xml.gz are updated once per day.
+
+		local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+		local today="$(TZ="UTC" date --date=today "+%Y-%m-%d")"
+		local yesterday="$(TZ="UTC" date --date=yesterday "+%Y-%m-%d")"
+
+		if [[ -f ${distdir}/JMdict-${today}.gz && -s ${distdir}/JMdict-${today}.gz ]]; then
+			# Use previously downloaded file from today.
+			JMDICT_DATE="${today}"
+		elif [[ -f ${distdir}/JMdict-${yesterday}.gz && -s ${distdir}/JMdict-${yesterday}.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			JMDICT_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://ftp.monash.edu.au/pub/nihongo/JMdict.gz -O JMdict.gz || die
+			JMDICT_DATE="$(gzip -cd JMdict.gz | grep -E "^<!-- JMdict created: [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} -->$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${JMDICT_DATE} != ${today} && ${JMDICT_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in JMdict.gz: '${JMDICT_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv JMdict.gz "${distdir}/JMdict-${JMDICT_DATE}.gz" || die
+			)
+		fi
+		einfo "Date in JMdict.gz: '${JMDICT_DATE}'"
+
+		if [[ -f ${distdir}/kanjidic2-${today}.xml.gz && -s ${distdir}/kanjidic2-${today}.xml.gz ]]; then
+			# Use previously downloaded file from today.
+			KANJIDIC2_DATE="${today}"
+		elif [[ -f ${distdir}/kanjidic2-${yesterday}.xml.gz && -s ${distdir}/kanjidic2-${yesterday}.xml.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			KANJIDIC2_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://www.edrdg.org/kanjidic/kanjidic2.xml.gz -O kanjidic2.xml.gz || die
+			KANJIDIC2_DATE="$(gzip -cd kanjidic2.xml.gz | grep -E "^<date_of_creation>[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}</date_of_creation>$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${KANJIDIC2_DATE} != ${today} && ${KANJIDIC2_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv kanjidic2.xml.gz "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" || die
+			)
+		fi
+		einfo "Date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+
+		mkdir "${S}/3rdparty" || die
+		gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die
+		gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die
+	else
+		mkdir "${S}/3rdparty" || die
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack JMdict-${JMDICT_DATE}.gz
+		mv JMdict-${JMDICT_DATE} JMdict || die
+
+		unpack kanjidic2-${KANJIDIC2_DATE}.xml.gz
+		mv kanjidic2-${KANJIDIC2_DATE}.xml kanjidic2.xml || die
+
+		popd > /dev/null || die
+	fi
+
+	if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack kanjivg-${KANJIVG_VERSION}.xml.gz
+		mv kanjivg-${KANJIVG_VERSION}.xml kanjivg.xml || die
+
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	# GUI linguae
+	# en is not optional, and build fails if none other than en is set, so adding ja as non-optional too.
+	local lang use_lang
+	for lang in i18n/*.ts; do
+		lang=${lang#i18n/tagainijisho_}
+		lang=${lang%.ts}
+		case ${lang} in
+			fa_IR|fi_FI|pt_BR)
+				# Use generic tags.
+				use_lang=${lang%%_*}
+				;;
+			*)
+				use_lang=${lang}
+				;;
+		esac
+
+		if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then
+			rm i18n/tagainijisho_${lang}.ts || die
+		fi
+	done
+
+	# Dictionary linguae
+	# en is not optional here either, but nothing special needs to be done.
+	local dict_langs
+	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
+		if use l10n_${lang}; then
+			dict_langs+="${dict_langs:+;}${lang}"
+		fi
+	done
+
+	local mycmakeargs=(
+		-DDICT_LANG="${dict_langs:-;}"
+		-DEMBED_SQLITE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index a810ba9871b6..79aa13fb95bc 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,3 +1,3 @@
 DIST transifex-client-0.12.4.tar.gz 179349 BLAKE2B 4287bf32a31a5319f54ae5f141f53fa00554c542d7f0f1000e985547f01029b05dc18f38ef992d37c08c6c0ab54d934a4ab37c37f0bfee299d824224316acbad SHA512 516531a0c5a7242da27e8b34a0513b24b806d3b3a271cfe29b31ef7969472f82a37e6fbb1d6198feb1c5bd99d7503bacf3f162808504415ea46670af3fe2369e
-EBUILD transifex-client-0.12.4.ebuild 652 BLAKE2B eb738900c68b306ce799cf653d36413d538a100831f3ab14fd038158d6002d5d7e75a081fa3a3a68e093dcde35d3da8ac066cea6a81dbc09a7066ce4907fad03 SHA512 2a4db4d20c0ad0c44bb15bd7f19dd87eae726819375c9b8bf5d5248a40669c1c2ba3cda83d9b06d358ed7f71b3435f489122790719ad188918b6786ee7f3dfe5
+EBUILD transifex-client-0.12.4.ebuild 648 BLAKE2B 1faf11371c0ae92ce711a36e95d8788642cd18b1f0fd43398e394ebb7967d76abc3efcaca8a934323616de2d0d3917b8d7358b1ddaba29d7ef4b42b8ee3f1836 SHA512 f5e01c197357b74721b47c881a248cb983e52c38b16802f2b9207d35107b2f2e7e57cbb50fe4cb48350ceb0483a4bcecc0f2c53dda7fe27270ca3a96ae735aff
 MISC metadata.xml 312 BLAKE2B 4f8f44c33d8e28af1666aed00cd0536cf010425d878769c0354ccee3e09a05314a61336ca16a012c6f9a453370df95410e02835123fa09b04bb9b6e6be9b39c7 SHA512 2f46ebd28eab7970044d6ce2570abce4507e3a6087ffd6b3825e005a25645d24f0b9c1fa08c31cbfe7d4a4795d6318e0cb72a959b36934055dbb95aa4d688272
diff --git a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
index 1087d173751c..5c9871d24b63 100644
--- a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
index 3b05e7e6123b..f0204c148e23 100644
--- a/app-i18n/translate-shell/Manifest
+++ b/app-i18n/translate-shell/Manifest
@@ -1,3 +1,5 @@
 DIST translate-shell-0.9.6.10.tar.gz 76079 BLAKE2B 079e7d1fe039586b580fe4197e00cda2bceb2bcf3bc11eb003bec56f3b4cc19a955182bf7bf50ba6b3f9e2d28bb091b49b98ebb0dfcd06ef25ef5c9929a307cc SHA512 b78f4f982bc65f530186a6728a1976eb96c9f6a70c7bd93e99357ed7016ee4ade0e0415aeca063e513de497cc4b082f7cc247fe7278292f7c3b7dda6af744743
-EBUILD translate-shell-0.9.6.10.ebuild 752 BLAKE2B 7d992120ffd799887e771a362535e7eb92246fe411bc40f9125c11db7c77948a2b150d583c09af61da7a3689bc6b098b1b08e089ede7871f9aeccde1316b7b30 SHA512 dc8c4e22f8983ce2a3ca26a86c11aa4d11b5b8bff22863656cdcf407c520e803d358ce36ae245f0c88bdcac0b709337b6289b3092028e554458df890be8c051e
-MISC metadata.xml 856 BLAKE2B 0bfbb3ab59d613c16732c000d7b66f618b05be517ea8976fc187deea834b214f9dc405b1140fa51d98940935beadd3a3c94d35274fc75444360491f5be99662a SHA512 3c5b5a99f2ca8d41ea076b0190ea06a23e7334282a55c5664dd417e34c92cc5df7d03f33bd1d9b1708a1632de66c4d02587c6fe3e6761a70be75783e447c3d00
+DIST translate-shell-0.9.6.11.tar.gz 76779 BLAKE2B 39748d0a2d7db504fd4c0bee516f703291dce93f19aa760fdae70b0551cb5f14ae5483314114f7e1141ae2231e0b128a79a9c05ec1fd08c970be886c4430e32d SHA512 d4d376b3750e43e3de5b95790fea7fc91e94140526ac15ee9f7818554f95d410772c8f8887433b6fd4547f569b3d6f510c1bc1497d8237223c344dbb8f0ae87f
+EBUILD translate-shell-0.9.6.10.ebuild 765 BLAKE2B ab98fa6b4da4a0a714b977e9e0738e5143fb9a0d63f37cee472076f47f23d7f581927618a3cb3995b9dc345d961c4af16425ed3facf5bab9202171ffd3a92357 SHA512 fabda6783ccd8c0a0704020c85adee9326d117281087b4a449213aa3c7b5febb5ee6a7afc90a8c2f4c0e24681c94a5f1929a066580c1d4882e7964e2fffbf940
+EBUILD translate-shell-0.9.6.11.ebuild 1118 BLAKE2B f26b0bbfb6e70a306ef15e0185a551ff58151cb6cd1a661205bdb2dd62450446f5842d8e94d455cd6f6820831786125e56ea8192631e13299e5fc97279ebeb64 SHA512 48734c94f8f49d12a59e93587cd6a50ed4008bdabbe906dc18326b877096efe94254980e9fce11f75e4a3d01bf42ecf4ce5eaddd309188571955a1f15897c83b
+MISC metadata.xml 865 BLAKE2B 2834143eadbf94f85e3a549f46f21db043ca046c35f67fe7f38944a457939103bc3ecd7f0623894e63950de8593d5e03dc35296f52a4c931f4436ddd64f65e16 SHA512 551d9b43281bd185b5770059d6b3ac30ce28722576ace01d337edb967e8e4d2f6eb401fbbe405a60c78042f486327f614613948bdab1eefe1574b3eab8215e61
diff --git a/app-i18n/translate-shell/metadata.xml b/app-i18n/translate-shell/metadata.xml
index bea3adaede38..8677de75cecd 100644
--- a/app-i18n/translate-shell/metadata.xml
+++ b/app-i18n/translate-shell/metadata.xml
@@ -15,8 +15,8 @@
 	</maintainer>
 	<longdescription lang="en">
 		Translate Shell (formerly Google Translate CLI) is a command-line
-		translator powered by Google Translate (default), Bing Translator, and
-		Yandex.Translate.
+		translator powered by Google Translate (default), Bing Translator,
+		Yandex.Translate and Apertium.
 	</longdescription>
 	<use>
 		<flag name="tts">Enable text-to-speech support</flag>
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.10.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.10.ebuild
index 789c2e74a945..69f5d902ea8e 100644
--- a/app-i18n/translate-shell/translate-shell-0.9.6.10.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.10.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 		)
 	)"
 DEPEND="${RDEPEND}
-	test? ( virtual/emacs )
+	test? ( >=app-editors/emacs-23.1:* )
 	"
 
 src_test() {
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
new file mode 100644
index 000000000000..833f76cb661d
--- /dev/null
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Online command-line translator"
+HOMEPAGE="https://www.soimort.org/translate-shell/"
+SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/gawk"
+DEPEND="${RDEPEND}
+	test? (
+		app-editors/emacs
+		app-misc/rlwrap
+	)"
+
+src_test() {
+	emake NETWORK_ACCESS=no test
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+}
+
+pkg_postinst() {
+	elog "You may need to install the following optional packages for full functionality:"
+	optfeature "Support all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl]
+	optfeature "Display text in right-to-left scripts" dev-libs/fribidi
+	optfeature "Text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer
+	optfeature "Interactive translation (REPL)" app-editors/emacs app-misc/rlwrap
+	optfeature "Spell checking" app-text/aspell app-text/hunspell
+}
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 786c94d065d7..03ac36dad9a3 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -10,7 +10,7 @@ AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411
 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 4894 BLAKE2B 012a1c0a5202c5417825a3a69753c82ac51a9f9e60669d127190eb88644e7b31761c72a0bb424a106710fd321596bb4def686efd36396bb9ba83870400ff11bc SHA512 0ada75918cd193421bf62e853a7d3a8e86609e88612297c4a8533cda4bec97955f82f3b5f42554a064107debb2392812e3ecbee6a40a87513990e4a0c70d4d87
-EBUILD uim-1.8.6-r2.ebuild 4999 BLAKE2B d1695e9093d174eb6423e9b3e76dc8f51030b09738a1a8919f0ce2e6292eab1276cc8a9016b7bb6563815620d43cdde473e008b50ee0a5cb29454863a836e471 SHA512 ddb8ed7138a56171a3a878cf652d360ab4d3776201e933279a9f7c0c0ec61d576eddc0baf42b046ab8fe98bd7c6440c25d62ad03fe0596752604f66bad971a63
-EBUILD uim-1.8.8.ebuild 5460 BLAKE2B 29d06088ca36b40ce716814716320040cc4c4fc9e40993c739ebcec444a373014c5477f0ad8424549a86e599a00abf2df46bd67926e5e5c21ee991b6a152ef37 SHA512 6c8c03553de27969bd5c241f0b502e3097ae111ca93f3c4bc2b6730518f949b5020204a7afc9e8ccb04a659effadd34143b8b0cc525680f0047be875ee81afb5
+EBUILD uim-1.8.6-r1.ebuild 4904 BLAKE2B 90385c626c8b2712ac338e328403b867146afd8db26aef74c00b979d9679d72ed311933e26616f9e0c39ef04aab67cd91022b4f52a4ebb15acad4d97c57b61ac SHA512 e15d8e7c539092e7ccd765b9ee618c5f587cd57134477e12cb86ce5d018d13287a31da15df07219d9d22199912736c331ee307f7378199a3b12667162ce35108
+EBUILD uim-1.8.6-r2.ebuild 5009 BLAKE2B dae5ee163f218c32bbb8b20feff326380d8bd4af4051268f1b453302df1ef533358f883c5a391a86b0b917a240ed604b5246a20641deb1e22d94c05bd7422203 SHA512 7bdc3aad39e88f6bd4241de8718aed676611db8d6fddf377b763ee36d92eafb9ac1eb1b795c07314d7d4d972757f831e30e0def92c96a226f04ebe36144b5672
+EBUILD uim-1.8.8.ebuild 5473 BLAKE2B c2b79dce71dc6e7d0f910d76589f1698ba5dd9fdd396176769606502081615d0e0543a28026e1fb42dc3392bbb1483c2b69f5b15a041bcef092c66e151099384 SHA512 6b750bdbebb32b87a8079eaa607db467c3463f5f302f0917ba12149aa284e84ab8cad96308f546b3cad0ba66f949207ff17b48d8e7a351518a3d2e482a224e93
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 8a86ae8ad0f3..a26a90d22a50 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -32,7 +32,7 @@ CDEPEND="!dev-scheme/sigscheme
 	canna? ( app-i18n/canna )
 	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	expat? ( dev-libs/expat )
 	libffi? ( virtual/libffi )
 	gtk? ( x11-libs/gtk+:3 )
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index 3183a39a2a36..153a4f272422 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -32,7 +32,7 @@ CDEPEND="!dev-scheme/sigscheme
 	canna? ( app-i18n/canna )
 	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	expat? ( dev-libs/expat )
 	libffi? ( virtual/libffi )
 	gtk? ( x11-libs/gtk+:3 )
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index 7fbd2e0a6226..a47cea7facc9 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -33,7 +33,7 @@ CDEPEND="!dev-scheme/sigscheme
 	canna? ( app-i18n/canna )
 	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	expat? ( dev-libs/expat )
 	libffi? ( virtual/libffi )
 	gtk? ( x11-libs/gtk+:3 )
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-i18n
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)