1 |
commit: b6a004f73824f6876cb02ff31b5cc86b8334a3ad |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 4 13:21:59 2015 +0000 |
4 |
Commit: git@oystercatcher mirror+tproxy <git <AT> oystercatcher <DOT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 4 13:21:59 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b6a004f7 |
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 | 20 +++++++------------- |
13 |
1 file changed, 7 insertions(+), 13 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 0fb8e9c..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 |
@@ -50,13 +50,7 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README ) |
29 |
|
30 |
pkg_setup() { |
31 |
python-any-r1_pkg_setup |
32 |
- MULTIBUILD_VARIANTS=() |
33 |
- if use qt4; then |
34 |
- MULTIBUILD_VARIANTS+=(qt4) |
35 |
- fi |
36 |
- if use qt5; then |
37 |
- MULTIBUILD_VARIANTS+=(qt5) |
38 |
- fi |
39 |
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
40 |
} |
41 |
|
42 |
src_configure() { |
43 |
@@ -84,16 +78,16 @@ src_compile() { |
44 |
multibuild_foreach_variant cmake-utils_src_compile |
45 |
} |
46 |
|
47 |
-src_install() { |
48 |
- multibuild_foreach_variant cmake-utils_src_install |
49 |
-} |
50 |
- |
51 |
src_test() { |
52 |
mytest() { |
53 |
pushd "${BUILD_DIR}" > /dev/null |
54 |
- Xemake test || die "tests failed" |
55 |
+ VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed" |
56 |
popd > /dev/null |
57 |
} |
58 |
|
59 |
multibuild_foreach_variant mytest |
60 |
} |
61 |
+ |
62 |
+src_install() { |
63 |
+ multibuild_foreach_variant cmake-utils_src_install |
64 |
+} |