commit: c2d591c2f9d5cfb3a4a84c90aeaaa733f2579c45
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 1 14:00:06 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug 1 14:23:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d591c2
app-i18n/ibus: fix src_test
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/ibus/ibus-1.5.12.ebuild | 8 +++++++-
app-i18n/ibus/ibus-1.5.15.ebuild | 4 +++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index da93deeb071..c6fc3724541 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -15,13 +15,13 @@ LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland
+X"
-RESTRICT="test"
REQUIRED_USE="deprecated? ( python )
python? (
${PYTHON_REQUIRED_USE}
|| ( deprecated gtk3 )
gtk3? ( introspection )
)
+ test? ( || ( gtk gtk3 ) )
vala? ( introspection )"
CDEPEND="app-text/iso-codes
@@ -77,6 +77,12 @@ src_prepare() {
-e "/^py2_compile/,/^$/d" \
-e "/^install-data-hook/,/^$/d" \
bindings/pygobject/Makefile.am
+ # require user interaction
+ sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+ # fixed in 1.5.14+
+ sed -i "/def test_keymap/a\ self.skipTest('')"
bindings/pygobject/test-override-ibus.py
+ sed -i "/[[:space:]]test-stress[[:space:]]/d" bus/Makefile.am
+ sed -i "/^TESTS += ibus-engine-switch/d" src/tests/Makefile.am
sed -i "/^bash_completion/d" tools/Makefile.am
diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index bbacf8f471e..4cf925979ad 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -15,13 +15,13 @@ LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland
+X"
-RESTRICT="test"
REQUIRED_USE="deprecated? ( python )
python? (
${PYTHON_REQUIRED_USE}
|| ( deprecated gtk3 )
gtk3? ( introspection )
)
+ test? ( || ( gtk gtk3 ) )
vala? ( introspection )"
CDEPEND="app-text/iso-codes
@@ -77,6 +77,8 @@ src_prepare() {
-e "/^py2_compile/,/^$/d" \
-e "/^install-data-hook/,/^$/d" \
bindings/pygobject/Makefile.am
+ # require user interaction
+ sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
sed -i "/^bash_completion/d" tools/Makefile.am