commit: 5f0dbe30b3d0a7f2d63aa0bbfac2ed11067fe3c9 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Fri Jan 1 04:41:47 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Apr 15 19:24:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0dbe30
app-i18n/ibus: use BDEPEND with EAPI 7, fix cross-compiling It needs to build tools to execute when using unicode or emoji. Closes: https://bugs.gentoo.org/762895 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> app-i18n/ibus/ibus-1.5.26.ebuild | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild index 3f54e2bdfad1..81c38c2f452f 100644 --- a/app-i18n/ibus/ibus-1.5.26.ebuild +++ b/app-i18n/ibus/ibus-1.5.26.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) -inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils +inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils GENTOO_VER= DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" @@ -31,7 +31,8 @@ REQUIRED_USE="emoji? ( gtk ) test? ( gtk ) vala? ( introspection )" -CDEPEND="app-text/iso-codes +DEPEND=" + app-text/iso-codes >=dev-libs/glib-2.65.0:2 gnome-base/dconf gnome-base/librsvg:2 @@ -58,14 +59,15 @@ CDEPEND="app-text/iso-codes dev-libs/wayland x11-libs/libxkbcommon )" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )" -DEPEND="${CDEPEND} +BDEPEND=" $(vala_depend) + dev-libs/glib:2 dev-util/glib-utils virtual/pkgconfig x11-misc/xkeyboard-config @@ -122,6 +124,18 @@ src_configure() { python_conf+=( --disable-setup ) fi + if tc-is-cross-compiler && { use emoji || use unicode; }; then + mkdir -p "${S}-build" + pushd "${S}-build" >/dev/null 2>&1 || die + ECONF_SOURCE=${S} econf_build --enable-static \ + --disable-{dconf,gtk{2,3},python-library,shared,xim} \ + ISOCODES_{CFLAG,LIB}S=-DSKIP \ + $(use_enable emoji emoji-dict) \ + $(use_enable unicode unicode-dict) \ + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") + popd >/dev/null 2>&1 || die + fi + local myconf=( $(use_enable X xim) $(use_enable emoji emoji-dict) @@ -144,6 +158,22 @@ src_configure() { econf "${myconf[@]}" } +src_compile() { + if tc-is-cross-compiler && { use emoji || use unicode; }; then + emake -C "${S}-build/src" \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + emake -C src \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + cp \ + $(usex emoji "${S}-build/src/emoji-parser" '') \ + $(usex unicode "${S}-build/src/unicode-parser" '') \ + src || die + fi + emake +} + src_test() { unset DBUS_SESSION_BUS_ADDRESS virtx emake -j1 check
