gentoo resync : 14.12.2020

5 files changed, 40 insertions, 13 deletions

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
 }