Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: net-libs/telepathy-qt/
Date: Wed, 04 Mar 2015 13:21:13
Message-Id: 1425475206.9150f272cd39462ea2f14c17e3c4b50b50d12fb3.kensington@gentoo
1 commit: 9150f272cd39462ea2f14c17e3c4b50b50d12fb3
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 4 13:20:06 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 13:20:06 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9150f272
7
8 [net-libs/telepathy-qt] Sync with main tree.
9
10 Package-Manager: portage-2.2.17
11
12 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 12 ++++++------
13 1 file changed, 6 insertions(+), 6 deletions(-)
14
15 diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
16 index bed9b87..202d2b6 100644
17 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
18 +++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
19 @@ -6,7 +6,7 @@ EAPI=5
20
21 PYTHON_COMPAT=( python2_7 )
22 EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
23 -inherit base python-any-r1 cmake-utils virtualx git-r3 multibuild
24 +inherit python-any-r1 cmake-utils virtualx git-r3 multibuild
25
26 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
27 HOMEPAGE="http://telepathy.freedesktop.org/"
28 @@ -78,16 +78,16 @@ src_compile() {
29 multibuild_foreach_variant cmake-utils_src_compile
30 }
31
32 -src_install() {
33 - multibuild_foreach_variant cmake-utils_src_install
34 -}
35 -
36 src_test() {
37 mytest() {
38 pushd "${BUILD_DIR}" > /dev/null
39 - Xemake test || die "tests failed"
40 + VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed"
41 popd > /dev/null
42 }
43
44 multibuild_foreach_variant mytest
45 }
46 +
47 +src_install() {
48 + multibuild_foreach_variant cmake-utils_src_install
49 +}