Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/
Date: Tue, 01 Aug 2017 14:23:35
Message-Id: 1501597394.c2d591c2f9d5cfb3a4a84c90aeaaa733f2579c45.hattya@gentoo
1 commit: c2d591c2f9d5cfb3a4a84c90aeaaa733f2579c45
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 1 14:00:06 2017 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 1 14:23:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d591c2
7
8 app-i18n/ibus: fix src_test
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 app-i18n/ibus/ibus-1.5.12.ebuild | 8 +++++++-
13 app-i18n/ibus/ibus-1.5.15.ebuild | 4 +++-
14 2 files changed, 10 insertions(+), 2 deletions(-)
15
16 diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
17 index da93deeb071..c6fc3724541 100644
18 --- a/app-i18n/ibus/ibus-1.5.12.ebuild
19 +++ b/app-i18n/ibus/ibus-1.5.12.ebuild
20 @@ -15,13 +15,13 @@ LICENSE="LGPL-2.1"
21 SLOT="0"
22 KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
23 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
24 -RESTRICT="test"
25 REQUIRED_USE="deprecated? ( python )
26 python? (
27 ${PYTHON_REQUIRED_USE}
28 || ( deprecated gtk3 )
29 gtk3? ( introspection )
30 )
31 + test? ( || ( gtk gtk3 ) )
32 vala? ( introspection )"
33
34 CDEPEND="app-text/iso-codes
35 @@ -77,6 +77,12 @@ src_prepare() {
36 -e "/^py2_compile/,/^$/d" \
37 -e "/^install-data-hook/,/^$/d" \
38 bindings/pygobject/Makefile.am
39 + # require user interaction
40 + sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
41 + # fixed in 1.5.14+
42 + sed -i "/def test_keymap/a\ self.skipTest('')" bindings/pygobject/test-override-ibus.py
43 + sed -i "/[[:space:]]test-stress[[:space:]]/d" bus/Makefile.am
44 + sed -i "/^TESTS += ibus-engine-switch/d" src/tests/Makefile.am
45
46 sed -i "/^bash_completion/d" tools/Makefile.am
47
48
49 diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
50 index bbacf8f471e..4cf925979ad 100644
51 --- a/app-i18n/ibus/ibus-1.5.15.ebuild
52 +++ b/app-i18n/ibus/ibus-1.5.15.ebuild
53 @@ -15,13 +15,13 @@ LICENSE="LGPL-2.1"
54 SLOT="0"
55 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
56 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
57 -RESTRICT="test"
58 REQUIRED_USE="deprecated? ( python )
59 python? (
60 ${PYTHON_REQUIRED_USE}
61 || ( deprecated gtk3 )
62 gtk3? ( introspection )
63 )
64 + test? ( || ( gtk gtk3 ) )
65 vala? ( introspection )"
66
67 CDEPEND="app-text/iso-codes
68 @@ -77,6 +77,8 @@ src_prepare() {
69 -e "/^py2_compile/,/^$/d" \
70 -e "/^install-data-hook/,/^$/d" \
71 bindings/pygobject/Makefile.am
72 + # require user interaction
73 + sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
74
75 sed -i "/^bash_completion/d" tools/Makefile.am