[gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/

[Michael Palimaka]

commit:     b6a004f73824f6876cb02ff31b5cc86b8334a3ad
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 13:21:59 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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
+}