gentoo resync : 14.12.2020

20 files changed, 91 insertions, 80 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 1a4bea6a6b0b..a70f062a6559 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 862a8b109da5..ed84e509093d 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -8,8 +8,8 @@ DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df1
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
 DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
-EBUILD fcitx-4.2.9.6.ebuild 4538 BLAKE2B 6b2a1fb24810d3c15f19cb01b9019d0cc6147171e3160b9204d2489fe032df3151827ab141dec6075484906749abb09719a3e9e5be17d89f0bfeb49525ff7c31 SHA512 bb54ec7c4fdff72eef9233a3326afc4b8cd21d1c101c17ca903574cc487561b4b5a88ed91680aecafbaa752ee724743cdf0817fad3c2069366ce421593c38b7a
-EBUILD fcitx-4.2.9.7.ebuild 4199 BLAKE2B c40ef62b59f2867329590a46eac97985b4860e5767beddf34fddbd7937b7d8370855d7cb600143e27107d6a815e4a09586d83287c329ecbf8c653dd679e26a79 SHA512 bc5bce4a291abaccaba62636861fa17c3b557314f019d7bf45e2d5d617c7be7b82854ae49d052d1eedd5993fc75f9020a346c46abd5398d1fd144b8f73c0ce6e
-EBUILD fcitx-4.2.9.8.ebuild 4291 BLAKE2B 0b3540400289eb21293cdeb50556db2f1dd25f5d4a56b99125155f3b03e24dea018a18a215b1fdd7eb5a0b8263129794c02a258d0fb85fb09a6d4630ca77dabd SHA512 4144d08f64ad6f5b59538c27a104d5be2cac538d5bcc597e46efda545cd03b96e6b157b45f9a5ee3cdd0eb542a065345b64d6f05a3069192815f756630c23184
-EBUILD fcitx-4.9999.ebuild 4255 BLAKE2B 26388e143acae73274c280db530b2ca584b1157c5b9b736f57436e4203851943ff8d45d6db5562d240c90fdcc91d97aa3e457609531a9cdfd8dbe70be9a6a1af SHA512 4d8b32e04dcabe1a18ed1de7368ffafc2aa7293af16b188995585d837eb3715fcd972f5793a83f6fa8daf21ec60d366c95725c76c7694ae669429c8f1ab264ae
+EBUILD fcitx-4.2.9.6.ebuild 4539 BLAKE2B d23d8f1d64f9884dc7d959662908bc90813274b68dc98c08fc1b9aa3918c8d897ab41079e3d1b821f38922efcd02ab3f547900fc624056b0587ab3975851bb34 SHA512 bcd2711f9b71debbfadb714914a4284ab7fe733988aaca8c903a71747fed8d981ad668d0e6c636342ee28e042609a1ad4a65074ca87e4849e5b29a2daa50670e
+EBUILD fcitx-4.2.9.7.ebuild 4200 BLAKE2B 3871f93e691518ca5c69238879ac615dd05aff6e9f946d18438b22106cb0e23a056064f7629e6f53e4fb14c8c4edbd4e3157563df50a0ebdb63b6a34d86fa0f6 SHA512 5a6394042c62047a801b21041b6b548a0f831c447a37900bb49b806b2c39f5370e6f69ff4763470e9be313b05c77c9534bbd75e4e588e848be22ae3a16841ce2
+EBUILD fcitx-4.2.9.8.ebuild 4494 BLAKE2B 0a1bfe6daa3c2b39e4bcf5ccb4acb97b7371d6a8999113345a626e17a1f992c3eced74be2359497304ee509c257f66aa800adb0a85b7f57ce2a97ed4f7c89746 SHA512 c54e707aab91017d23a2f55572b0e0399bacf5afa49fba241d09c075e217a84533065115fd22681258db958eff6a6848f4c4e14d20a8b1aebf777ec64239d2af
+EBUILD fcitx-4.9999.ebuild 4415 BLAKE2B fe0db784a804b2cf7e67bf3ab6dee785639a7cdb29da3e1337c761e7a891bed71df0ab43cdb709cb87c95d9abd7f1e467cb01e4542b5371f142d106b3b08e902 SHA512 98c02e7d08e0a64f7f5d056029b3bc78978d2642b2cbcc80c4102866476204ebf260a99556510b610d9d0ead3d2a82a6d7c3020f4a58c36654681beb99ca1fc8
 MISC metadata.xml 1189 BLAKE2B 027fb94416c905c2246444aadebc20230aa922a94228a870f1e99b8721ace82681fc27395e565a81f79ec088765cc2bde303d40788ba29c32727d57554aae196 SHA512 7f7f05a1716f4da573c075961a4367718defa22899e1f29f7d4bb13b0345e0b979c6a7b1e3040d0fd3f5ec03c0d4813585ae043340799d5a46cd3ede1be2bbc5
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index 43274c9346bd..acdbda6b6d92 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -60,7 +60,7 @@ DEPEND="dev-libs/glib:2
 	enchant? ( app-text/enchant:0= )
 	gtk2? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	nls? ( sys-devel/gettext )
 	opencc? ( app-i18n/opencc:0= )
 	xkb? (
diff --git a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
index 5a6d41ac6a92..f46b88fecef3 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
@@ -61,7 +61,7 @@ DEPEND="dev-libs/glib:2
 	enchant? ( app-text/enchant:0= )
 	gtk2? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	nls? ( sys-devel/gettext )
 	opencc? ( app-i18n/opencc:0= )
 	xkb? (
diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
index 0b9336e8a571..b2c346af0251 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+LUA_COMPAT=(lua{5-1,5-2,5-3,5-4})
 
-inherit cmake gnome2-utils xdg-utils
+inherit cmake gnome2-utils lua-single xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -28,7 +29,9 @@ LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
+REQUIRED_USE="cairo? ( X )
+	lua? ( ${LUA_REQUIRED_USE} )
+	pango? ( cairo )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="dev-util/glib-utils
@@ -62,7 +65,7 @@ DEPEND="dev-libs/glib:2
 	enchant? ( app-text/enchant:= )
 	gtk2? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	lua? ( dev-lang/lua:= )
+	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 	opencc? ( app-i18n/opencc:0= )
 	xkb? (
@@ -78,6 +81,12 @@ PATCHES=(
 
 DOCS=(AUTHORS ChangeLog THANKS)
 
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
 src_prepare() {
 	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
@@ -114,6 +123,11 @@ src_configure() {
 		-DENABLE_XDGAUTOSTART=$(usex autostart ON OFF)
 		-DENABLE_XKB=$(usex xkb ON OFF)
 	)
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_MODULE_NAME=lua
+		)
+	fi
 
 	cmake_src_configure
 }
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index 295d5fa08862..76f6bdd6c634 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+LUA_COMPAT=(lua{5-1,5-2,5-3,5-4})
 
-inherit cmake gnome2-utils xdg-utils
+inherit cmake gnome2-utils lua-single xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -28,7 +29,9 @@ LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS=""
 IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
+REQUIRED_USE="cairo? ( X )
+	lua? ( ${LUA_REQUIRED_USE} )
+	pango? ( cairo )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="dev-util/glib-utils
@@ -62,7 +65,7 @@ DEPEND="dev-libs/glib:2
 	enchant? ( app-text/enchant:= )
 	gtk2? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	lua? ( dev-lang/lua:= )
+	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 	opencc? ( app-i18n/opencc:0= )
 	xkb? (
@@ -72,12 +75,17 @@ DEPEND="dev-libs/glib:2
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.2.9.8-enchant.patch"
 	"${FILESDIR}/${PN}-4.2.9.8-xkb.patch"
 )
 
 DOCS=(AUTHORS ChangeLog THANKS)
 
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
 src_prepare() {
 	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
@@ -114,6 +122,11 @@ src_configure() {
 		-DENABLE_XDGAUTOSTART=$(usex autostart ON OFF)
 		-DENABLE_XKB=$(usex xkb ON OFF)
 	)
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_MODULE_NAME=lua
+		)
+	fi
 
 	cmake_src_configure
 }
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 68e0b4587bd1..add04afb141c 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-libpinyin-1.11.1.tar.gz 1728202 BLAKE2B 6e2273c4ff1be76bb8b0e65b915e039c0a181981d20ed94662184e161e8639ad3d548de981d7bbae950ab8b5019bedaed9593e03282e2f9d207f831929d422bc SHA512 48691952a10f4ab545d8e233dc3cd75fc54270c03a687820048152636df26d233ee0fba89e4ec2ccd5a6e410b41e556872e3dd2468d59d44b3440e904b93528b
 DIST ibus-libpinyin-1.11.92.tar.gz 1730065 BLAKE2B 376bec6fa7616364c8ed4dc5b269edabda892ba4759ff03e93b4099c99440925126800ea3bf11eef91ea62c558fa7dbf05f3d68be5e25e701aaaeb37618b90a8 SHA512 b875b2fed6875806971b91e2abc62cdab1f70baef78840915f89466a7bcf3d1dfc70438ba85e7580bba92dec0ade50a2b05955fe6cd148bffd3888fa69f1c851
 EBUILD ibus-libpinyin-1.11.1-r1.ebuild 1233 BLAKE2B 9b1587e1c4d5b1d48e2f7d4f1ab3638146b051930ae9cddc0dacbca7e649831932991d214861bb961504d7d1cd113873a63b2fc871ca74498332a723a7d9faf3 SHA512 197112d524a17ef36f8d1ff1d3b89ffef0ae06c00238d6e385232af98dd3d4251fb79fdcc67f12e1f161f32e089ccf673e1a457e73bf5076972f3d470715dc92
-EBUILD ibus-libpinyin-1.11.92-r1.ebuild 1317 BLAKE2B 1b67f62bfcfba49f7feaa8c4b5fd517f834af65a6253ff637fb8486ccc3696fac88a386278dee097a829d96855e78b43172586d850a7cbea9d67287b620342cd SHA512 3701f099effd1cfdb0457fe6ee510009c2e741ba6e53991b5fc1b56f931d19b53b3aeb5f4b75d690f8c05be9b2b39862b10e0f556d088e0ce09b9caa6db2ba9a
+EBUILD ibus-libpinyin-1.11.92-r1.ebuild 1476 BLAKE2B 5e69215e498ade8a431b38775d695b6b24c4dc28eb4549297df773aac41700e8ab143026b5de89021d7b6c7180f23bc5d4a6d2c26b4525f60f5b6854a37dfbc0 SHA512 d4f4be170952df2fd462ff580344b2c8f3bb64e2a310863f8a6850dd5929e39ed4ff28256e10a31c5bd06864fdee44f936308b863994a6ce8da3b50e4ce1b963
 MISC metadata.xml 803 BLAKE2B b10294253280adbc8725c28f0c0ff4763b4dbf622fbab14b4ac53dca90ab00727a889f502269dcdbb394259a7d55fb6267e4d39ff2921f27edc8c77d17d71060 SHA512 0f06e79c123901006aeeba3a076c01ee5175f0d5134afbdd058b54992a43c8bbe561589fb910e07734efbc0a81057934ea04dcbb42136ed2d82a9ff96ed270ed
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
index 8eb5b596beb5..019c1a68d966 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
@@ -2,21 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+LUA_COMPAT=(lua{5-1,5-2,5-3})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit autotools gnome2-utils python-single-r1
+inherit autotools gnome2-utils lua-single python-single-r1
 
 DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
 HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )"
 
 BDEPEND="dev-db/sqlite:3
 	virtual/pkgconfig"
@@ -31,11 +31,19 @@ DEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
 	boost? ( dev-libs/boost:= )
-	lua? ( dev-lang/lua:0 )
+	lua? ( ${LUA_DEPS} )
 	opencc? ( app-i18n/opencc:= )"
 
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
 src_prepare() {
 	sed -i \
 		-e "/^appdatadir/s:/appdata:/metainfo:" \
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index 9ddc0956c2cc..16e2e0c3db16 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -2,5 +2,5 @@ AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38
 AUX ibus-pinyin-1.5.0-python3.patch 2983 BLAKE2B 35f8b1d0649a3614fcecec78b3246dcecd8b40f68d71165b2c40d802bb42bff1d8f3f4c2c1baf25fc6ca97e190f7eb2004054f4d9857b605129b45c41b273f52 SHA512 c9eda6fb227358c8214ba717f6d800f3c47f9110e99e16601966651bd698cd703daedcec82a2933b76701bc05870ff88715a6d639333b5e5959c1f5e86e2dcff
 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-r4.ebuild 1159 BLAKE2B 051c8d4de213c3efe0bc5cd054b710882736b2f6cb4cac2d26894e4c69c2c6c785d6eebbffaea3f129e1982843d3d71aa0970a30e187679b0815fb760df7903b SHA512 717fdef2d6a81447e131768681ef66409d1462d6ea8f64f159ab7376b8a9af06570dd8d1e49e2a69b8336045df1e1249747a65a4c91f1a2e4dd95a48ffc4ec0c
+EBUILD ibus-pinyin-1.5.0-r4.ebuild 1306 BLAKE2B 173b88ecb37ece418f31ccc46c248af38d4b3c86a1b3328af59a1fac5646956e5794273ebe98f61683c008b2f6af48ba8b060db905a1fdcb90d80bb08bfc906c SHA512 fa14a30f1705aa1812450616174c3e391da98ed10a4a50c9ffb8c011c89a450f56f7283a2552df92501688f7342c316572a7f095a2cdfcfaa874044494aa56e3
 MISC metadata.xml 524 BLAKE2B e4e6b11896bb13e6a6578cf560db7d0ea592af3d129cb15b9fa2302f259ef3fa9e78faced298bb2d1e0b8c8eb763607c84f0fa87feaf2f319607a4565a3d14f1 SHA512 cb400bcfd3a92b0adde9301e1c8c9b4f3251307d351caca6ece541793d24763431d1b67c35a191a28affd4543e3b4534d15c5a573299659f29edc8de26fb441e
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
index b677397a4f98..2c2bec4054b7 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_{6,7,8})
+LUA_COMPAT=(lua5-1)
+PYTHON_COMPAT=(python3_{6,7,8,9})
 
-inherit autotools python-single-r1
+inherit autotools lua-single python-single-r1
 
 DESCRIPTION="Chinese Pinyin and Bopomofo engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
+HOMEPAGE="https://github.com/ibus/ibus-pinyin"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="boost lua nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
 	app-i18n/pyzy
@@ -24,7 +26,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
 	boost? ( dev-libs/boost )
-	lua? ( =dev-lang/lua-5.1*:= )
+	lua? ( ${LUA_DEPS} )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -38,6 +40,14 @@ PATCHES=(
 	"${FILESDIR}"/${P}-python3.patch
 )
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index e30dd9055ceb..b0b7d8249cec 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,6 +1,6 @@
 DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
 DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05
 DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205
-EBUILD ibus-1.5.22.ebuild 4143 BLAKE2B a3c44e85e5c76e7f4ab564de3d48ef834e91081bf2b5f2b82212a2f155653b786f5f32f55e692ebd05a8f8b860ea7d62341bb109ef262b359f66358c4ef24d67 SHA512 39189e93d230bbf5d695e2c0ae944b681c33132ac33dc81d0cf2c286bed31997deeb77ee27276398f5817d75045854e372d8c28ccd157f2cf9fba0561cd466b5
+EBUILD ibus-1.5.22.ebuild 4147 BLAKE2B 7b464c643a80ead50457aee8bd08a2eb241de0abf22bed73f110b4e6c5db047353b969338bf9045295a22dc2a2f410d04c530b318977dc4a5f6381a128ab125d SHA512 136f582f8894d27bde797db07efa83d79c6ce856b87be06d96fb3a8ae5d1d68856d82e1513df751282a55e03b917242b63b8b4902336a6c76431f45a402eab0e
 EBUILD ibus-1.5.23.ebuild 4454 BLAKE2B c3c94770bb2108ab973d6388845c84ebe6ca1f4d31401308197f5e6a17f21673fcdc20228a8cbea77a67e86aae01f97f124743d116ecdd2b6b7b9d182258acaf SHA512 9f5329063e5936311b0d3b7ac1d9f6f20625e03e8ccd29179e5c1b407dbae7c119b8d8dddc83e6d76e31555a0fdb95f5caa467a104934af9525ab5753ee6e1db
 MISC metadata.xml 865 BLAKE2B bbf090f2a0102b1a5672dfd051cb4240b923b60146900e4c966a5d3da33ee795140820f5d2865dec984c90db6fc98e4cfe010f20e26f376cf98e929dca2516b6 SHA512 4c7ad9414350dba19fc3c0846c3197d0bb2f8cfe653242c547db9fedaa014329cfd39a2d086c7954b1377aaaee762dd3f4063ec071ef36dc748bf3dbadf85e77
diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index f7c9f747cdd6..59400fd498e3 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.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,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.48"
 VALA_USE_DEPEND="vapigen"
diff --git a/app-i18n/kde-l10n-scripts/Manifest b/app-i18n/kde-l10n-scripts/Manifest
deleted file mode 100644
index 3d9983f0f1f7..000000000000
--- a/app-i18n/kde-l10n-scripts/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD kde-l10n-scripts-9999.ebuild 619 BLAKE2B 1ce275421516e2b8e3662a2d9d61634a6bb2874863970ab8ffbcddc5b95b5c54d93f24e7403625997c2bc996ac1177bcd45b0203a2e4323e38f244ba96af5aba SHA512 f4a241d412869b834694c2cc9599cb9c52f80a56da59f1e775655542d94699afceb05657e8fe0d8208fd56f54a586ec1021fd41f6a053f640f011ac9cb422a26
-MISC metadata.xml 343 BLAKE2B ce85098ac5406810060066b49389decf383630311cadc863522e3b4025ab78d4d72af01c234ef48ddfd001813801f6f955385a61d37371f1e3e4584f5a1a7e33 SHA512 1b6e2b61708576ec63383b7479170fdddafdb5aa30f5f947c55df99c9cb365b51e0c271f78243a38699e87d770d911591a908c4337f8760d8f340219cb1f9268
diff --git a/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild b/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
deleted file mode 100644
index 4eca71e19ee6..000000000000
--- a/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Set of scripts to manage KDE translation files"
-HOMEPAGE="https://github.com/vpelcak/kde-scripts"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vpelcak/kde-scripts.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	app-crypt/md5deep
-	app-i18n/pology
-	app-shells/bash:*
-	dev-vcs/subversion
-	kde-apps/poxml
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:/usr/local:${EPREFIX}/usr:" \
-		Makefile || die
-}
diff --git a/app-i18n/kde-l10n-scripts/metadata.xml b/app-i18n/kde-l10n-scripts/metadata.xml
deleted file mode 100644
index cf6e8a9090b6..000000000000
--- a/app-i18n/kde-l10n-scripts/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>kde@gentoo.org</email>
-    <name>Gentoo KDE Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">vpelcak/kde-scripts</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 08012284ef41..da143e3e6a73 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -2,6 +2,6 @@ AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf42538
 DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
 DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
 EBUILD uchardet-0.0.6-r2.ebuild 852 BLAKE2B a6de024ad35692b0274e47f8d3cfa29bb75767cb3df15e68274185fff05311d3cf94f1cdd8009f3fb2900d30b6c710ff1bc0fc210fad50086311400b47c1e3cc SHA512 1a438390a330197e487fc1578a572c65b1a6c1a7fb75bf06e0d5e6e2bfc39a42ef816afc509567b169c2c371438e315e4fb4f48dec4484509d99e87a7a811b60
-EBUILD uchardet-0.0.7.ebuild 899 BLAKE2B 8986cc6e306cf85d8bd33944748450783aac0280e5415308dc3c005ebf33df275e37f680942823c244864c9bcffc05cd35b73171ac5f410453fd90d911a73689 SHA512 b802c47645927791f8ea8c64ca544ec7901aa7eec7f3d4067cadc767e7149d9203009ed64c2564f4753a5d54b2d3a31cb04d2f3efe35eda0cc832c389ef4cc95
+EBUILD uchardet-0.0.7.ebuild 916 BLAKE2B 0dc7688b33e8222399ae0a867e32a9565232cfa47d73a00151e7e5d4527f62ee9c3a51058c8e467d4e93ed4a57b33588c983e7ce5d4ca00074cb20c8a88cb689 SHA512 29d7ec2b93f49d3bc33f7adf43b4b2efc8eab063994f029c7c675c394161f0c3dc510fd7d88bfb60201ae350cc705711e1ae8f0a1e3c345efec6a44973d3e0ec
 EBUILD uchardet-9999.ebuild 838 BLAKE2B 1fa9152117465b5e792942983a98d1a0f69373b34f723d1811d5bc8718cffa6f61f3a808d5e70e5837bd4969eb32a49b744a7e200d7d1760d60a0bdf1b08a6c2 SHA512 2a0a59e862a98c88f1a4186043e3eb6819ea09b5b28fa5ae8ec5edaa2f328ced05cd2ad19b2288ee119741987ed7f8ba8756d440d48c264996f2e3d6a6e39e04
 MISC metadata.xml 671 BLAKE2B e4d37fa90064a38dceb1472cc2683257d8f7f7ef5f4c15a440f2d9102f91561d408b919c29077b305013e5dc967b42400ec49ee6a50037708a76b2c2e1742e44 SHA512 38fbc4d87e388fc19dcb64a65fe8859307dd7636a4327353131a7c8ebf8974cd74c73486b9dedf1f350d1d42e23a23e33737a1e2e3f4b769f9f64d730149c8a6
diff --git a/app-i18n/uchardet/uchardet-0.0.7.ebuild b/app-i18n/uchardet/uchardet-0.0.7.ebuild
index ca135f83ebee..f9f084ac79e2 100644
--- a/app-i18n/uchardet/uchardet-0.0.7.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="cpu_flags_x86_sse2 static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index bccbc5346950..385cf3c93297 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,9 +1,10 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
+AUX uim-1.8.8-fno-common.patch 375 BLAKE2B 88cf3f86fd23e3d9735c3c12df299c678fb332a39937cad0408fcbfdb653eb6084d3b693ceec42e047c7cfe37a78ea8982d49bd9260135169e4af2d2af64be31 SHA512 898ce37332bd02ccc063facb922a965928962f7ecccbb5e74a57d64069eda235f33f7e899e94f8d48e17a58b32a1e98d9eed2dcd9c73eafd012fc0150eba13b4
 AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
 AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
 AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716e1c27200a9b4d29a649beb333fe61c30cd36718494b05cb5217d486fb929cd617fe7038bf168d7 SHA512 4e86e051dd05ec0b56d423a079b0b285fdd9b256ae66528781a68ee0bfcf1be15530346facb28eab0a1401f2f27f9dce8cc8e215fe3195879f66e7e4241d80fc
 AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.8.ebuild 5477 BLAKE2B 7f203eafd78f5b77c724a59116af1a154a4633df5712e33eade8de351869a1fcb81cd61f4a50658a885491ef5581f4625ed603f6f780d6b5aac6630c3f354bea SHA512 5c3e6dfc798f5ca600416c69360f8b09ce9d932d9e402d82be2830d8a219e03fd5df9ee468316533ad7348c85e81acdeee9c6cd4c83f7e3747441fc61560a809
+EBUILD uim-1.8.8.ebuild 5514 BLAKE2B 338725d8bc455fc953de4c80aa3205bd13023cf177d398bf7f8f4e8a0cebaddb9334ef5ba6f5e7f112f3b5ceccd9abbe808d2c9d193d534a130d850b7bbcf35d SHA512 f714daa5937cdcab78e459593e16283dc4b45bbcead6e48c3ddafc8fd26966000a9d3ce82234fc4019ee9ff39973430df81f3ffa4f414bd65fff20b36e4564c5
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/files/uim-1.8.8-fno-common.patch b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
new file mode 100644
index 000000000000..ff974bb5d5b2
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/sigscheme/libgcroots/include/private/gc_priv.h
++++ b/sigscheme/libgcroots/include/private/gc_priv.h
+@@ -1979,7 +1979,7 @@
+   /* the signal mask.						*/
+ # define SETJMP(env) sigsetjmp(env, 1)
+ # define LONGJMP(env, val) siglongjmp(env, val)
+-# define JMP_BUF sigjmp_buf
++# define JMP_BUF extern sigjmp_buf
+ #else
+ # ifdef ECOS
+ #   define SETJMP(env)  hal_setjmp(env)
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index 412b439ce31c..3ed23be0370a 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-tinfo.patch
 	"${FILESDIR}"/${PN}-xkb.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )