From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 79EA5138CA3 for ; Wed, 4 Mar 2015 13:22:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3CB1E0907; Wed, 4 Mar 2015 13:22:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F51DE0907 for ; Wed, 4 Mar 2015 13:22:16 +0000 (UTC) Received: from manakin.gentoo.org (static-108-28-123-98.washdc.fios.verizon.net [108.28.123.98]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F61B34076A for ; Wed, 4 Mar 2015 13:22:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by manakin.gentoo.org (Postfix) with ESMTP id ABC86604CF for ; Wed, 4 Mar 2015 13:22:14 +0000 (UTC) From: "git@oystercatcher mirror+tproxy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "git@oystercatcher mirror+tproxy" Message-ID: <1425475319.b6a004f73824f6876cb02ff31b5cc86b8334a3ad.git@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/ X-VCS-Repository: proj/qt X-VCS-Files: net-libs/telepathy-qt/telepathy-qt-9999.ebuild X-VCS-Directories: net-libs/telepathy-qt/ X-VCS-Committer: git X-VCS-Committer-Name: git@oystercatcher mirror+tproxy X-VCS-Revision: b6a004f73824f6876cb02ff31b5cc86b8334a3ad X-VCS-Branch: master Date: Wed, 4 Mar 2015 13:22:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c8ab96f7-5d4e-4641-b8e5-e9f0b06e49df X-Archives-Hash: 2b84d354725d3a8baec3c6b3e1a84047 commit: b6a004f73824f6876cb02ff31b5cc86b8334a3ad Author: Michael Palimaka gentoo org> AuthorDate: Wed Mar 4 13:21:59 2015 +0000 Commit: git@oystercatcher mirror+tproxy oystercatcher gentoo org> CommitDate: Wed Mar 4 13:21:59 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b6a004f7 [net-libs/telepathy-qt] Sync with main tree. Package-Manager: portage-2.2.17 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 20 +++++++------------- 1 file 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 0fb8e9c..202d2b6 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 +}