commit: b03759ae067d3714f2d3d52d36f8fbdf5a1c7dab Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Mon Dec 7 04:00:00 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Dec 7 18:14:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03759ae
app-i18n/ibus-libpinyin: Use slotted Lua. Closes: https://bugs.gentoo.org/752552 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild | 20 ++++++++++++++------ profiles/base/package.use.mask | 1 + 2 files changed, 15 insertions(+), 6 deletions(-) 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 b267bd8fe31..019c1a68d96 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}) -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/profiles/base/package.use.mask b/profiles/base/package.use.mask index a947f424625..5e8552db16c 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -9,6 +9,7 @@ # Arfrever Frehtes Taifersar Arahesis <arfrever....@gmail.com> (2020-12-07) # Waiting for unmasking of slotted Lua. >=app-i18n/fcitx-4.2.9.8:4 lua +>=app-i18n/ibus-libpinyin-1.11.92 lua # Matt Turner <matts...@gentoo.org> (2020-12-05) # Relies on gtkdoc-mktmpl which was removed from gtk-doc-1.26