diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-03-05 00:21:59 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-03-05 00:21:59 +1100 |
| commit | b6a004f73824f6876cb02ff31b5cc86b8334a3ad (patch) | |
| tree | ed1fa1c740b4886f4852634db82897ce645f747d /net-libs | |
| parent | [app-crypt/qca] Pull in OpenSSL plugin by default. (diff) | |
| download | qt-b6a004f73824f6876cb02ff31b5cc86b8334a3ad.tar.gz qt-b6a004f73824f6876cb02ff31b5cc86b8334a3ad.tar.bz2 qt-b6a004f73824f6876cb02ff31b5cc86b8334a3ad.zip | |
[net-libs/telepathy-qt] Sync with main tree.
Package-Manager: portage-2.2.17
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild index 0fb8e9cc..202d2b6c 100644 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild @@ -6,7 +6,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" ) -inherit base python-any-r1 cmake-utils virtualx git-r3 multibuild +inherit python-any-r1 cmake-utils virtualx git-r3 multibuild DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol" HOMEPAGE="http://telepathy.freedesktop.org/" @@ -50,13 +50,7 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README ) pkg_setup() { python-any-r1_pkg_setup - MULTIBUILD_VARIANTS=() - if use qt4; then - MULTIBUILD_VARIANTS+=(qt4) - fi - if use qt5; then - MULTIBUILD_VARIANTS+=(qt5) - fi + MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } src_configure() { @@ -84,16 +78,16 @@ src_compile() { multibuild_foreach_variant cmake-utils_src_compile } -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} - src_test() { mytest() { pushd "${BUILD_DIR}" > /dev/null - Xemake test || die "tests failed" + VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed" popd > /dev/null } multibuild_foreach_variant mytest } + +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} |