* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, profiles/base/
@ 2020-12-07 18:14 Mike Gilbert
0 siblings, 0 replies; only message in thread
From: Mike Gilbert @ 2020-12-07 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 0b3e5c8833c1632cb5bcfce3d1c20f8d133862bd
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Dec 7 00:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec 7 18:14:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3e5c88
app-i18n/fcitx: Use slotted Lua.
Closes: https://bugs.gentoo.org/752549
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/fcitx/fcitx-4.2.9.8.ebuild | 20 +++++++++++++++++---
app-i18n/fcitx/fcitx-4.9999.ebuild | 20 +++++++++++++++++---
profiles/base/package.use.mask | 4 ++++
3 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
index d08d80a1321..b2c346af025 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:0= )
+ 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 14ddb1d7220..0abf9932c60 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:0= )
+ 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/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b82573b6b57..a947f424625 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-12-07)
+# Waiting for unmasking of slotted Lua.
+>=app-i18n/fcitx-4.2.9.8:4 lua
+
# Matt Turner <mattst88@gentoo.org> (2020-12-05)
# Relies on gtkdoc-mktmpl which was removed from gtk-doc-1.26
# Bug #740690
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-07 18:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-07 18:14 [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, profiles/base/ Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox