gentoo resync : 10.02.2020

37 files changed, 105 insertions, 143 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 2ff02b696439..c4bea6edd603 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index a5b6555f68e7..663caf919f41 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 1235 BLAKE2B 3c17b64497a76a0edb1303988ec782983a8332e38b4597ee1a4b739524d4564b90f590942b2719a86e0be522df9eb14d159f1ba82343c1ac386fe732c2705874 SHA512 a5fff16b8ec2f683e03dcfdb1973d925159aad766803029ab68aad1cbe68f0a48fd5386b4520190e6d4b8377326495459b2759b0d9a89d34c0f237a76b8249fb
-EBUILD ibus-anthy-1.5.9.ebuild 1214 BLAKE2B a600ee7dab05eda80dbc3c134eab8571e0989e6d500c5ed7c7e4d1adc4ca1ce8a02fbd009c0f449664b74e4150bd464eca998d2ffd2635861e95b2a0d084a053 SHA512 19dcc539f8ff8ed8a300bf09e04bba433056a84c397352c9173171cc7de4604edfb8d537836796cbd4b986317d8237519437c36cbffbdfd818797365e975e215
+EBUILD ibus-anthy-1.5.10-r1.ebuild 1272 BLAKE2B 9f709491dda1b80f4a74292f82e9b246099f8de7a324daccb368e7deae5673272af27ff8a3aed28303a70cc508056214b050ac5353b2bcc1d0f2c5b38b23ac8a SHA512 2c66358abc262635bc70375fd64b0a1131be1850830c89a9ee68a58169400b7f8d5bcd74f16cca2f1b6d2cd053c4b982d34fcfce0922fb237380f4a7a0a87db4
+EBUILD ibus-anthy-1.5.9-r1.ebuild 1251 BLAKE2B 6588a7d19dd0a55ec5505ab325c12976f8d883eed498fa2301fe5aa053ec8e7f6bfce2540f3b662ebca9e51291c06b38880eac8d447638ee516eb19fd64e613d SHA512 dec5af46c4fab1c0b740814893141a3921a78609c04b2def1385758f27969d6a2d085e8747d7cfc8fa06b7c0ce7698597a65ef228648185a21a3e0f92f06998a
 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-r1.ebuild
index 10be5957f6b7..49d72440083c 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2-utils python-single-r1
 
@@ -18,8 +18,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	app-i18n/anthy
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild
index ba81764f9f0d..557c5b30b615 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2-utils python-single-r1
 
@@ -18,8 +18,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	app-i18n/anthy
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 31a12333a992..222e04e0fed9 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 884 BLAKE2B a6a2ab992c8366ba579a9c3bbe9771e415d0d6f25b527a1faed8a0da66f14c9b1355da3aad484b6ff28b41c134557d3cad1d601329150f5f416acd0b9c7a1912 SHA512 a32e4a5905d270eec0faabe72603070e5edc2748b227384fe961c9d8ee5d299c52947ee403fab5d4b6a71dba7cf7fb8666631fe49ada8f3c7c33e78f15a89574
+EBUILD ibus-hangul-1.5.1-r1.ebuild 921 BLAKE2B 0b9f3d9c07594dd3598c3a04eda66ecfbabbbb000ea801fc1d46ec964a18bd1d1160a71cc24f8a5cadd483ff26499dce9ca3528c99244262b2501d17828af02d SHA512 c88bbf13ee0a04602d805cf0115db5bc9e1c0ed7dc96f024b6608d9ba71b008d73ee99deb89d9dd70119b141b577c1409461025cf2589eec9e0af60232abe393
 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-r1.ebuild
index 5fae9262586e..87d78aa62e74 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2-utils python-single-r1
 
@@ -17,8 +17,10 @@ IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	>=app-i18n/libhangul-0.1
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index fa395fe98d28..b21f679f8e7b 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 1498 BLAKE2B d448d1f16bf63347a0aaccad094d0f6ad0b89a0e05318f86e2593711f3800f36d2c064ebf0e6c113fb1e3e3800f49b6f070e0140abbb32b5c9f3b591ca6d201a SHA512 fe81e55e6f6b2e7cdc7dc1615b0d0c2435458a9e4e3f44f44633853add01710b904138a2e967a16d94f8633d9623bc21f57477d3f871c2acadb85510b3bda686
-EBUILD ibus-libpinyin-1.11.1.ebuild 1196 BLAKE2B d9ee71c07c31dfcfc62ea876e9ecd885c96c73ae0321cbb3de2db15d7f2a6fa51f3a04dd2ec73936ad8a3656293b278fcecf229c21539ddfae9b10248f8ec9d2 SHA512 78cdc402fccc1a9f024a6cd015f9e5b768ebb2e440dc6e346b8c56170e3fd97e60d9b7a1b0feb62722936ebeb7450a19cfc3da83b08a137884279594c84c06fd
+EBUILD ibus-libpinyin-1.10.0-r1.ebuild 1535 BLAKE2B ba5b503f5c0724adc46ed8c63bed0486d880a881a968da41d613185b2182a077cc5ab98c7d82ba61ea4ff35cf928ae3bd045757f9fb8916aabdd9aab75723af2 SHA512 d490ea04593c0eba188b3fb4c0fdf7d93a962b91fa0a15e5bda13da12e1032ea97be1292ea4145d30ecbce6e2176e3a3358da3db5f6052d3698ed1fa76fc9c4a
+EBUILD ibus-libpinyin-1.11.1-r1.ebuild 1235 BLAKE2B 9503b44dc768975032afc2efb7a744f65a184bc7240448484a0bc758e357354c7bd8f0b3f3cd27a7a6f1f53fbb6db7d9d96da8507a765582cd6a646cf0826e0b SHA512 7a42024472def6263fe9668bfb172bbb74c667e7eea98a5aff49d33137e4618614eca7f41ba26e018b8cce6b67c50355661658b22d616a574ac029998ea4cb57
 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-r1.ebuild
index a686aaa32ec4..3d7dd517debe 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit autotools gnome2-utils python-single-r1
@@ -23,9 +23,11 @@ IUSE="boost lua opencc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
 	>=app-i18n/libpinyin-2.1.0:=
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	boost? ( dev-libs/boost:= )
 	lua? ( dev-lang/lua:0 )
 	opencc? ( app-i18n/opencc:= )"
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
index 510770469de5..280d6386f779 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit autotools gnome2-utils python-single-r1
 
@@ -22,12 +22,14 @@ BDEPEND="dev-db/sqlite:3
 	virtual/pkgconfig"
 
 DEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
 	>=app-i18n/libpinyin-2.1.0:=
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	virtual/libintl
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	boost? ( dev-libs/boost:= )
 	lua? ( dev-lang/lua:0 )
 	opencc? ( app-i18n/opencc:= )"
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index d3714ae5126a..86cff88efbaa 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -1,5 +1,5 @@
 AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38a9ef2fc2df0d2274dcd3b8071fac0aef0accbf7c21f0d4e98b9587d665b13195d7efc04bbf58218de84069a2c63eaa79156363061dd86 SHA512 3399052f0d12eb55554d5cc98637125e6648a56f3dc87eb2fadc63af3fb82bba915e820c51596d9106637f6a063100f217ad001422a61f8925db5c5b2024c976
 AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
 DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
-EBUILD ibus-pinyin-1.5.0-r2.ebuild 1140 BLAKE2B de842fee994ea765f6f52922f282319b87fb6f4de9901eee34ddb3c8232431a7f389201508c22a298069ccb11f793e00be2af086a37195479164965f53483f77 SHA512 c86e6e49c9c153edf82790c0a3a79b521c9e076db136a97ac2b501e4b5d4321dcd1b787b79540836e620a1a8bb0b28c4610280ebd07d505fe9fa8bd2677cf8ef
+EBUILD ibus-pinyin-1.5.0-r3.ebuild 1180 BLAKE2B 6aa0f69342db4a3227b65ab86338e627af2a29bbb9422f8a0b4460ffda63d6ed5ab99ed6887fb2f7e65ed2cf2dd665e2585232ebc224b0104e474ae25221864c SHA512 c648d2a7968822dfda6d2d3f1ea449029e21bbb0a806a7b986846428b0da2c715d4ebda3c01e4c821b1fa88206dc19bc47a72e6ac7f2d9007371c4e73408aca4
 MISC metadata.xml 675 BLAKE2B 53ddd9a158adba18b4bbb56af1f1e75013c61ea23c245703489b677ed3a5eefd1fb0bba28b4269c5bff4ca6453ea5bb4027b0904f21ee89ecc2ca0d5c7041b52 SHA512 87c1743bc802f22de1d2441403b00eaee1a834730ee1b9f3c3ae62728fdc7073bbe01faec464042243ac7dea1ce11aca709bd5d836fca3c09ccb77c64ea27aea
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r3.ebuild
index 2f8dba36e3c9..717341659675 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,10 +17,12 @@ IUSE="boost lua nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
 	app-i18n/pyzy
 	dev-db/sqlite:3
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	boost? ( dev-libs/boost )
 	lua? ( =dev-lang/lua-5.1*:= )
 	nls? ( virtual/libintl )"
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index b715c09d01ed..c29f9b67957d 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,4 +1,4 @@
 AUX ibus-sunpinyin-python3.patch 388 BLAKE2B 35131840c58bc47980dbbe046723217afb8926f61de601d664524b961c80f718753e41a82b7cdcd8b137d71c97ad84b91a3b71677610b2f369f9be2da2582185 SHA512 90c7d08588e996e7df966f9ee4b3b044a038392a0f3f074f4803b45a6579ad774119a3c700167924f073a3109f8172f8fea12129c2eb36e914b89eb68cc5a7dc
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
-EBUILD ibus-sunpinyin-3.0.0_rc1.ebuild 1298 BLAKE2B 1fb15e1213fc17bafbf091c2eace49f2e72d0d85ee9a2ee71ce7a35e12dfdd21de4514b31f5e454107af011330168f2eb2eb583f089454ba52527b8d605cada2 SHA512 6c53b9ae41dfc8b2d916a473e0c5024e08e6591725eb410bf6ba7a423ae16c83a402b427cc1fe3817fe67dc26a2d9638a1a8b9ce3283659b16cc5ffba931562a
+EBUILD ibus-sunpinyin-3.0.0_rc1-r1.ebuild 1331 BLAKE2B afb4525f5edfee440423c10c0412fd9a7d5cb6dc283bbd4cae5413f16e3d892b0e4ee178529b881d9243e9bce0482a65fe4f2f1168b6a21b2e184a5cdba28feb SHA512 915b0c1d6704e5b18a4b931bcb84cfd480f02322c01e74a0246eb7e7dc58e2a4609513889a9a88af7072e5b9361c03975a65e7cae0449deee17bb41f178c843b
 MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild
index 70ddc8a973c7..6037fa22fe86 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,9 @@ IUSE="+nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+	')
 	~app-i18n/sunpinyin-${PV}:=
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 4b8ce1eccc08..c3c35ffcd5fe 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 779 BLAKE2B d18ec4ac954123ad2ef8fc55c9ffee37b63b3d9e9c91d1f220fa159ff43da746fe373225870e477373e335362266ceff02ff68d6d8f25a29db36b1cb19a401f7 SHA512 cdc2ef0a22b6b1fe35fbf4335ffa96f7a955b0448b876eb5eef143fccec2e48848be5068b80840673437bcda94fae4fde75938b0a799e5d81fbd84605e02f8a8
-EBUILD ibus-table-1.9.21.ebuild 797 BLAKE2B 635fc01b04621e32e73f5ef510f7c09369a1a398748836b8ecfd89b5550c65e43ecb869f7791e39756bcebd507eaa0bc48041fdbc6b07bce60bd9b974976e9da SHA512 b5e390a6997dfe71dd983a9d2a1cbc923966e3f1d58a88c7a3ddd8d318e151146429061185547b65aaa902552e1503e6c073fa3f995c8290e30fba0e893fc076
+EBUILD ibus-table-1.9.18-r1.ebuild 822 BLAKE2B 4999f07d0d0c293064e6dfa98dedcbdebbfa10187e96932581174b6d3ef08d6a877d31906b512695adff6ba6902e09217a35338184e72352537d310a28cb8471 SHA512 69f435dcafba74b0fb0df9ac34cc42cce7c41beb57491c9a9acc6bf65c330afe43acaa2967701cb9ecbf1a237279719c184637258ad3d31c9cbf7c609dedc062
+EBUILD ibus-table-1.9.21-r1.ebuild 840 BLAKE2B 5e8700aeb2d9c0c8a4ce76bdd32e956efa7c0cb250f892839c9077bd514459e8d1be2bc6c03eb655bf3b531336fecafcd7dbdcfef31e84451619363939ac5918 SHA512 0b0b18c252813421eefdd6588287a0de963318218f452c07c609e6eb308f2bc32b3d0cac5ca792f66343efe93ae29d08b9101bd47134f23df33d50c11fd42c14
 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-r1.ebuild
index 025526aa8b12..dcd828dcbbea 100644
--- a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.9.18-r1.ebuild
@@ -18,8 +18,10 @@ IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	virtual/libiconv
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-table/ibus-table-1.9.21.ebuild b/app-i18n/ibus-table/ibus-table-1.9.21-r1.ebuild
index 7da7fff419c8..9db9ac7acf04 100644
--- a/app-i18n/ibus-table/ibus-table-1.9.21.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.9.21-r1.ebuild
@@ -19,8 +19,10 @@ RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	virtual/libiconv
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 849fee3529bc..e21e6d2fda53 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 853 BLAKE2B 168f8674e9ea224bbd5cca5687573b3ae6a44517d86eac44e776b233f4431fc314f07028a4bc9cc9cf4b772afd7b523d69fbafcb20ac1ec42ab1c98f99bebc76 SHA512 a0fb1bee927ffea4daa028d63b0401ede40fbd37146f0cfbf51714b2ea85cc607b7bafee8b0595f024ca39f4276e25f9dec33a37b9aa0c1af2de93777b36f485
-EBUILD ibus-typing-booster-2.7.0.ebuild 853 BLAKE2B 168f8674e9ea224bbd5cca5687573b3ae6a44517d86eac44e776b233f4431fc314f07028a4bc9cc9cf4b772afd7b523d69fbafcb20ac1ec42ab1c98f99bebc76 SHA512 a0fb1bee927ffea4daa028d63b0401ede40fbd37146f0cfbf51714b2ea85cc607b7bafee8b0595f024ca39f4276e25f9dec33a37b9aa0c1af2de93777b36f485
+DIST ibus-typing-booster-2.8.0.tar.gz 8018809 BLAKE2B 9306b980623094a8b72d6824292d8d52a90df69b7f1f7df11c0df63c5d2c4f2aa1ca4e2765320096915b30cc807fbe24f64a219c3beb1bec4a1d81be4511779a SHA512 64c112275ec63ac3d3c13202256be8bfded152da7b08dde7e6eb01dd38fd48535d63daaa6c2fcc09e64dcd4927931380ccd0a0be739f04330fb15dc0d4fe1823
+EBUILD ibus-typing-booster-2.7.0-r1.ebuild 917 BLAKE2B e07904b632e185636e3c5dbbbfbb3d72723866022f04aa7abe7d00411779c57639d47c07b34e2b33eef0418b67515f94d53afaff2a4e9a55c0b1d4b4289fac41 SHA512 a2b0451ed29c1dc573b3f4158c9c19fc47f7ab46cfae0b614cd10ede3c3952380deb148039ef24674aa1e627631503ffc9876916bc25af12a618d2f416d8ff7b
+EBUILD ibus-typing-booster-2.8.0.ebuild 915 BLAKE2B 8505c9546d6f07fe6c7fe641ac3cc973eb27ed681dceeca9091659d984d8bcc7285568005b46726448447d50bcf3540acacdb330cbd20c7cf49d43cb361365f4 SHA512 23e841de462df06e7f41a96271b027af87b2024cefd0e82f15535a91ecb72639ba5d54802a0b7860f354d4e3ddbc27a8eac29194188cc173e7ccd38f9685d987
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
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-r1.ebuild
index 55d27fd99d77..99d431fc2d5c 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-r1.ebuild
@@ -19,12 +19,14 @@ RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
 	dev-libs/m17n-lib
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')"
 RDEPEND="${CDEPEND}
 	>=dev-db/m17n-db-1.7"
 DEPEND="${RDEPEND}
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.8.0.ebuild
index 55d27fd99d77..0091f717eeca 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit python-single-r1
@@ -19,12 +19,14 @@ RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
 	dev-libs/m17n-lib
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')"
 RDEPEND="${CDEPEND}
 	>=dev-db/m17n-db-1.7"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest
index 511e35b84f23..59d85a396cb0 100644
--- a/app-i18n/imhangul/Manifest
+++ b/app-i18n/imhangul/Manifest
@@ -10,7 +10,7 @@ AUX xinput-imhangulro 50 BLAKE2B 01b0a4e625348fc9221b2f52d10288befbbf71774e34060
 DIST imhangul-2.1.0.tar.bz2 268205 BLAKE2B c45cc3e0919c695466f7d09c20c3ee5ae827865b6c3093746f8435bfb3f18da0cf94bc4225829dbafb2f13fcd1da0ec4a696adb966bff90285c769eb36232c4b SHA512 ea4621c4e0e5ed1786e644b577bc0c9f3dbbf296f938ddb2ab04923d8147e01123e10e09a61484e30c3ab0ff51d86da80a93bce583eceee207eab90c27df5f8e
 DIST imhangul-2.1.1.tar.bz2 288452 BLAKE2B 14aba1fb582edd735d1469b2fc1c4b576c64f073f525b30a3c5dd681b82d07f7b2960a63c388dae47d93855f25abbfbb2a48b032e5509239325db1cd05ff6b5e SHA512 5db3843aec698bd6315e4c76f3d8ea374b5d985ff7ae8a3d05861afb1d564ffe274d56fa27e8f669884016c50d5fc1850984050d93fdee944c6f7c3c963c96f1
 DIST imhangul-3.1.1.tar.bz2 288236 BLAKE2B bb762481c98d8e4d3e1f32629802320fbdd6ec2388e9d7e9f1838fbbcb05f247549dc2baa68e6f4ec626f32b1911b5dfa89810e64c9e826cb1887400bbe11e71 SHA512 a27fb34a826ceccb16e4c8a422f5571c7c6a4c253cd2a55c1025b0c22500a380a35a8703e9f0f6300fdc92544e1d7b59e33f11e059b85754b1619698e0f74d89
-EBUILD imhangul-2.1.0-r1.ebuild 1296 BLAKE2B ff57c2c12fdaa9fe943461bef88d9c46987fb17a9cd18eef0c70358bb46d663cb58449f91ec99019fdc5f427aae289121e8564f11f87304eb3cc473d42ef4c64 SHA512 25baa051bbf72f71b85983c365b9de92c70095dee6d29881c659309270bcea748e2986ff0e8acbfbd74e3a61d8cda7e710440ed1800b00fdec062daa9c396fc6
-EBUILD imhangul-2.1.1.ebuild 1299 BLAKE2B ea15e9375f93a5b05e621dbf29eb814c473194810b85d923426c6565c563ed9b4427c4c371d5da547fb483d7582f10501485b31c5ec12ef67901aab63f5c3d52 SHA512 d73ba627cefe9fed778a8d2b77476d4ab758e2645a50b00620aedd71ae4101e6d379de9c338c2b884ce95708e895dda8bbdc1e7f0dab84343b1d127a8ac1efda
-EBUILD imhangul-3.1.1.ebuild 1299 BLAKE2B 16ea4b4bdcbe78772f7232f381e24b22c633bab010df0490af248e55fca041815922c05449d5fbb7be4a5b02e76855aff63a1f1d394860a0f6958d9de004ddd3 SHA512 566e71123e3eb1ecd97a330f5da28a0654c830b2dbc281403ebf6106a81fd32c74b1634c9b5446838f77cb6a5bcb38c54392bb3a7ba53f7080c76c81e88c8956
+EBUILD imhangul-2.1.0-r1.ebuild 1294 BLAKE2B 592a4374ceb96a743e429fc1578b2417d79914997a5b03bc8d3c3102db5c07d5baa57a1fc8fa08c653a70dfecfb2996deb0ce130ae5e5c24a538f8ecc970f733 SHA512 aae51f39dbd1fb9150e99f97fe998c0280b191c63b365abfd5b66289b85389836ec8f1cfde8011fbaf2418155dcb930a9de0249f7a07ac499ef7c9156e33bfc2
+EBUILD imhangul-2.1.1.ebuild 1297 BLAKE2B 6e88f3e21cb024a04419a7935bcdfd9993afd1f77b72eb78891450b19f954539aa222df1b8d788d1d27399429b529af9fe78ce681caf2e6e9eb85863964bbb6b SHA512 ede0d66b2eb2c14d277e4088ee0771ddc881ee6fe03fef4f1dfe52b5f36bde3cfa35cd506579e070fac593e6aed69e0c7ac483701400acfeb045536ed2f09522
+EBUILD imhangul-3.1.1.ebuild 1297 BLAKE2B a8c026746a1e59485c781049a26cfe3022633fecdc5bb7dcfad6bcebba7877d42c23fcd7faedb06654f30a1e895d14ab6580c29feb96e183aacc4c538fa0fa2d SHA512 ae70710c8d6264e333f495b178ce58a6c824db388d28b19684651415849bddea568de0d2ffbdae460f3d1095d27afba8fb58688853fc9519293c1a3d61fcb013
 MISC metadata.xml 370 BLAKE2B 3376831ba7380688735a4e50c6e60dc545d34867163bb9191ea4ccd4dcbdae9d2e6e8eb0429195fb7fcafc920f95ff653553f4661e4a08d8d6f823838e89b2a9 SHA512 abd3a62a28dc9405ffa19aad3a8b213a906eef144f10ecb5bc5632d5b892eda73d600c70e126975299fffeeb59ccf38c03b4abdb36fb5e5870130b4453a27b39
diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
index be31caf2f266..5fd39a7e384b 100644
--- a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
diff --git a/app-i18n/imhangul/imhangul-2.1.1.ebuild b/app-i18n/imhangul/imhangul-2.1.1.ebuild
index 296851718916..d55a5638bcfa 100644
--- a/app-i18n/imhangul/imhangul-2.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild
index 667c30d3e7f9..6be5482fcaf5 100644
--- a/app-i18n/imhangul/imhangul-3.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules
+	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 3e35ff0c3d04..96f1cf888566 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 1026 BLAKE2B c4398786816d084d1dca59222df6ec6f0aa9cfb9a5f5110d7a82a70014a639908c5e4167fd2d98f499c1bf4844ab5c3a44dbede4262e310bf897462a75be7579 SHA512 976d0ff8b98dee4b8d42e298c69fe4527709059df619eb91a2c1151b1a4b314b05455c9e300c3cfa95bbddbfedadb39a387a9835bf7e327ab029600b4efbddfd
+EBUILD opencc-1.0.5.ebuild 1025 BLAKE2B b9c774d3cfed6c15a2e73d37a7dd2482c0ba5563a842485985cf5e1e8daa4c30d8567482de35c553d6834e1bfd969a2dc83da365cbe986f35d0b7c29beb8c9d7 SHA512 c2f1712eb26ddf53b56f9250dc318293e1389aa1ee7179212f61725344e92d88dae8afb1563e13adb4f563881874cc6a659c0b1fd55e81ca0cc9b750c120057e
 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 02e7cbbde3bf..63d6cf51df70 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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/pology/Manifest b/app-i18n/pology/Manifest
index bc6de0bca5e5..ec77c2e6f216 100644
--- a/app-i18n/pology/Manifest
+++ b/app-i18n/pology/Manifest
@@ -1,4 +1,4 @@
 DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f
-EBUILD pology-0.12-r1.ebuild 1558 BLAKE2B 0a6385869bbf1c51977ff423d4c3a4e105be43ae11983b07f581937e49e166741d8067a469c2f5b443e000549a1d8928f6624df3c89cd07b696e8df208a92d97 SHA512 b077e75816d0e2267512a03cc74e606238123a100dcc279700554e64c64f7ca682b897482470d0e2e9e6bb15f49dc253e067b6b0b0043d9e3d59e77f5f87422a
-EBUILD pology-9999.ebuild 1560 BLAKE2B c05bef232859bd75de166c8b42506e04dfac28dad26d838ca07ede76f5087c0e04e83086471d1a5bd71428f59c392afe6adf1b3bfca16f2405e171953bac74a3 SHA512 1eaa0871dd39ded1e942de7db9296010a9e19e20e550280155a26d047ca1142d0eac20849b5122f9f9e9eead80fffe48be94261175c67134e61f44a8b3f7b715
+EBUILD pology-0.12-r2.ebuild 1594 BLAKE2B 398d3480c3f0a320ebf4b58f4907b637d9dc84b36e4263e5c33abdc253fbef997fab2bbc3f441c720022eea947ba2d9a21488f7b8fd211ad94364b258d0abd75 SHA512 dca123900889c3bc8544e1f0d83c31c4f46e9b5eff8127b87ca5f2e6e75eff743519f569cb04f0277e668d3da8c0b8456c8b935e5518e093560178fda9428dd9
+EBUILD pology-9999.ebuild 1596 BLAKE2B add34836b2524dfad4770657ff3491c5ce7c9c3ef10f20589265c8912a03af9ed8706f58e94c1ffb22c82050e46c7374d8928ae06d3be8373d51914bf1cc03be SHA512 a86d8261a2bd6b5589a62b4bff9ae2f1d32c8d3b1652abcf3eef34a95d51462d1b278f8643607620f82c78815d24fdeacef52ab3707195e121cc5ed696d072c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-i18n/pology/pology-0.12-r1.ebuild b/app-i18n/pology/pology-0.12-r2.ebuild
index da1015d3f26b..fcb45eb16276 100644
--- a/app-i18n/pology/pology-0.12-r1.ebuild
+++ b/app-i18n/pology/pology-0.12-r2.ebuild
@@ -27,7 +27,9 @@ BDEPEND="
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/libxml2
 	dev-libs/libxslt
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-devel/gettext
 "
 DEPEND="${RDEPEND}"
diff --git a/app-i18n/pology/pology-9999.ebuild b/app-i18n/pology/pology-9999.ebuild
index 1670d22e95ef..1347ffb8ba86 100644
--- a/app-i18n/pology/pology-9999.ebuild
+++ b/app-i18n/pology/pology-9999.ebuild
@@ -27,7 +27,9 @@ BDEPEND="
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/libxml2
 	dev-libs/libxslt
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-devel/gettext
 "
 DEPEND="${RDEPEND}"
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index eff3925e1ae5..e2c9f64ee7e6 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,6 +1,6 @@
 AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37e37522a54883d06c954f2804ad4c04dfd3b3518fc5401ad5185e85a85a68d80e38dbbd728eef SHA512 1cfe95fdbf840b9fa43c980bb3f2e16fc6008714f8807650582ca906cb91ddd28b3b7b3c9f1325035e2c614d587d172071b2b7e3c6b30ca3128902b335773893
 DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
-EBUILD scim-1.4.17.ebuild 2540 BLAKE2B a27310756920c80fb160f8ccb023626f25518f05f78fed4280b53edecc205d174d357d5453a434d9beeba809fbca99e9bf98ab8f63b4119dd69ded14203dcc47 SHA512 b4acf72cdd8657c6c90514bdf93b178767c04b4b1d8b7a25a7ee32f16b171e48c7d494267866bb4426034beb898b58c696f54c92fa74b64d1936f43675cfb0d9
-EBUILD scim-1.4.18.ebuild 2555 BLAKE2B fcc1e707f4a67cf1f233ed19daff69ce63bdec23c096e672ce5242d9bd81c673a3e9836a49cbd95075d1b2d4a8e03b00f13e345845e9b71576ed14d0bcd7f095 SHA512 11c883262287accbba37c4d6e7ee543a31a02871244d8178a88a12deff29762545941f7b6aefcd39ddb97cb18af6070751d408863ced804a6305d5bab6d5ef50
+EBUILD scim-1.4.17.ebuild 2538 BLAKE2B 3ca60959c635b3a69e751e15da5b37eaccc2c333b583e03cd74df4df6c77a3644da488e1cca0d94f6610c2100051555a285d2b04e395926e1aabe208a254c9b0 SHA512 64a44ba9cff1ba10d01c8bdaf72292f411d4aab33dff8c9125a21ff3995670d36b4bd091d7675d519deca1b4fb80e2c9e02aa11a8eee35148b1c21f6675c1486
+EBUILD scim-1.4.18.ebuild 2556 BLAKE2B e6314c763a236c56cb8dfd06d1dda577f64a4468b23e29230c76c9d47cb03fcc284daeebeb554c3455fbf6045138a0e366f13b665cbcecbbb6c2673b67ab4477 SHA512 8f2dd0f47e380e979dbe7d00db9965dbb271149635b86224a4458341910664455308b1d7b8d0b17984605430eaea32232ddbde026dc8e6ab8fc5c32a8d053147
 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
index b7d8a6de5ec8..1365db6b815e 100644
--- a/app-i18n/scim/scim-1.4.17.ebuild
+++ b/app-i18n/scim/scim-1.4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
 IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index 027cccdb7177..0cc809f40762 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index c91db125f03c..9d5f7feccc87 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,7 +1,5 @@
-DIST skk-jisyo-201605.tar.xz 6288104 BLAKE2B d68332a4fa0804b596fc42f3dc8231a6eebe8bddacc6e0babec6cc5992ddaadb46e8fa9af742daa30545a585428afe79eab28329ce1d37e0192b08b20d7c584e SHA512 1093d363fe571c3e3e05fa54046fc4b88cbed2fbd104838576c83694556585401c3affa0afb2ed078c6f1b06f62a7b14145b1305f6fef089f160b4073900c7a1
 DIST skk-jisyo-201805.tar.xz 6133180 BLAKE2B 52408eb2f1fa5e5146fd4db55c249f80b5ede7d2ce1e7a3c11fb69507f87f86d778e25b04ce4e39dd241ea2d8000d829b34c47df991cb91f886923e330b652eb SHA512 13675502332609857b66391bdb9dc252b9f7a48814f6db10c60106b9cc3ce823df7615d77e0579d13b9d3da93dae2006cedc145d8dd80af39b9d4ecfe94373d5
 DIST skk-jisyo-201905.tar.xz 6198572 BLAKE2B a26e0be0406699424b24a8d1b004317b5d274fc02ed50ef6c4c696de8e039a6cfd7b34b292b7b7ecbdc2fee1950f6cc2a122ef457ba12f96972584560d3ac355 SHA512 db32fab5d5bf232838a3d502d4f648dde556381df9f96acec13d011274dedf5443676ce36324430dbe8cacb6a037e7bf70e72ef46b94fc6b57b9448e76aab38b
-EBUILD skk-jisyo-201605.ebuild 1309 BLAKE2B 8cad5144891e505667dcba43458e50f02c07ac57b1d329a68c23ea8089c1f7e598cbbe92ebd2fff65b371df99483c2d5ba9b2d6e281023b2ae8641d254939232 SHA512 856f31033950f5d7cfabb6d6833592bc4c0a88978a23650357a4d80ebf8c6c4caf0941d3c9d6069a1f8c43ff9f0d9a113148107405bab65e83781c7d961c79e1
 EBUILD skk-jisyo-201805.ebuild 1346 BLAKE2B 754722d85b3b23412273542324d18f9896dbf44be1c1f16b0115ba3df8ae1c47e2435e6bfc0127571e06f9eae72e1bf3c24a776b878aba547967c063db82b1a3 SHA512 20ef913647bab0cc898f64564743545c982d235fd02288f8fad50e50af21510ab08bdc9742316c979b006d78df8ba1eca59ec7a1faf6d8cf67061396e172c238
 EBUILD skk-jisyo-201905.ebuild 1343 BLAKE2B 9cf7b1fad63f193a942afd31ff2306f52be7ac40835a410ddc94c8d57fdfcc9122741550f82493c313555becb47d0034d626389ee80cdc401a458b9983309489 SHA512 61f61b7c5779da49eca348439cccd50e3ab3cd0d015311712a53d8c4b007174271f22e728af50349743a1bddd757f20b807e75899c264a758b8c86e1de45535b
 EBUILD skk-jisyo-999999.ebuild 1648 BLAKE2B 93b07b219378be74e87817da306968951b22e92791246672e31b3817911b7a6b25a5e7da68e9cdd5317da6a9fcbee5cccdc2ea7a560da7aa6a5b3791eb1c453b SHA512 28648a723fab209828dc2fde0e664aa444fa4a2327e6308e9ac63a08d9e521008a905520ff68606a123901cb3a18e5d09b7ae24e97140daab8d072ccaff7b289
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
deleted file mode 100644
index 098f596c803f..000000000000
--- a/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PN=${PN^^}
-
-DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2 freedist public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="cdb"
-
-DEPEND="virtual/awk
-	cdb? (
-		|| (
-			dev-db/tinycdb
-			dev-db/cdb
-		)
-	)"
-RDEPEND=""
-
-DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
-
-src_prepare() {
-	rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
-
-	default
-}
-
-cdb_make() {
-	cdbmake "${1}" "${1}.tmp"
-}
-
-tinycdb_make() {
-	cdb -c "${1}"
-}
-
-src_compile() {
-	if use cdb; then
-		local cdbmake=cdb_make f
-		if has_version dev-db/tinycdb; then
-			cdbmake=tinycdb_make
-		fi
-		for f in {,zipcode/}${MY_PN}.*; do
-			LC_ALL=C awk '
-				/^[^;]/ {
-					s = substr($0, index($0, " ") + 1)
-					print "+" length($1) "," length(s) ":" $1 "->" s
-				}
-				END {
-					print ""
-				}
-			' ${f} | ${cdbmake} ${f}.cdb || die
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/skk
-	doins {,zipcode/}${MY_PN}.*
-}
diff --git a/app-i18n/tomoe-gtk/Manifest b/app-i18n/tomoe-gtk/Manifest
index 68fce0e8de02..1bc4a6f8e97a 100644
--- a/app-i18n/tomoe-gtk/Manifest
+++ b/app-i18n/tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST tomoe-gtk-0.6.0.tar.gz 448058 BLAKE2B 06db81c971bf06ae1b625afb90950e7a76ad2acfb6abf038ce0c6114c4f7bc42a76a7f07dc848cfa5e6aef3039e6bab32b0d7496fea1fb67bf936b5f9631a130 SHA512 caa9b79edde7885e00d939cb3de30b32da0c1c8a7d803e26c756ee0695f7e15bee241036b1125f838e72e016f4bee9736a398108fff0eed20f1fdb86d221dc43
-EBUILD tomoe-gtk-0.6.0-r4.ebuild 942 BLAKE2B 04382726db18df35e3091673a99bce5d52d7f08371d391c07658f2da5db1464e7c40d8d9eeb60ac4a6b8f14cdc63fbdf64d31e06b34e5e60940ef8886b330f28 SHA512 802399212e06935d495e62ab369d6e7972c7e110b319669942af9396932b94a6f4b39383ef00e44537d9a0146d0dee4b5dba3795c3d4541156845739da2bf5a5
+EBUILD tomoe-gtk-0.6.0-r5.ebuild 991 BLAKE2B 62f4ae57bf4142032e454826210511592c6ac838730190668b5a12436108d10515d576dc5b29115b89696f7bf446c4c7f53626fa6d96ae386248b6c29f5dc89e SHA512 6e0b1763d13cbcf01fda05dc0feb4a75b181ba1a63043fc66e6222982fe235b9c321afa360a0036e303e434881d87aa6a77431159693a6a716b3072efec5be47
 MISC metadata.xml 374 BLAKE2B 39965153f406f0dab239af88b4da0823befba31b026a262e1dd42373514fdd91b21cf582c3a00184459f62253f5fed7828bae911d82c3ba31331bb7f6d6abc6e SHA512 8b35eb486271612ca74076681fc7c84a27ec5bf49b8523996d14f7cb26d22952569497656378d07ca03ec7f9e05a30e851b9220f905fcc2265d4a4568badf15e
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
index 52bdcab8445f..f5a0c638be4f 100644
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,12 +16,14 @@ KEYWORDS="amd64 x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_USEDEP}]
+RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_SINGLE_USEDEP}]
 	x11-libs/gtk+:2
 	python? (
 		${PYTHON_DEPS}
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
 	)"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 396966c6de95..840d808f1126 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -3,5 +3,5 @@ AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af9
 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
-EBUILD tomoe-0.6.0-r4.ebuild 2154 BLAKE2B 1b984a191a6a5cc25fc07f7a3ecd15b2135beb0b9402d953d7ee107d7ecafc3f7a346b993f2bfc9b5e4159f5ce61546d5dc916c701042e324963397df2868c4b SHA512 a1846c1c877e0d2dd1ec1c8320b156242a94ccf78a62c33b01f80e7832bfc22cc757ac75a32959f15ba3ea5e9ffbab043d5ef9148df5877edae948215784adbf
+EBUILD tomoe-0.6.0-r5.ebuild 2199 BLAKE2B 240e9312cfd232c1afe7c2ee748a50cc3cf6e9d8b8fd52b67d3cb837285af8e134b7ff2af7e991dc4a6406de05bfb1bfab95184c058b244f0893a75e3d82ac6c SHA512 65df6d8a174907477efc18153b02cb35f32f82f606bd01b826a1f32482a134ce7121126bb4d37e18049f49413daec3573c4a75c93db292ae66f7dcd2b1a53cdf
 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
index 89645ad03b59..059d1e78dd7d 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -34,8 +34,10 @@ RDEPEND="dev-libs/glib:2
 	mysql? ( dev-db/mysql-connector-c:= )
 	python? (
 		${PYTHON_DEPS}
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	ruby? (
 		${RUBY_DEPS}