From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2DC311382C5 for ; Mon, 19 Mar 2018 20:34:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C688E0903; Mon, 19 Mar 2018 20:34:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9E7EE0903 for ; Mon, 19 Mar 2018 20:34:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5C72335C0C for ; Mon, 19 Mar 2018 20:34:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5AA8B25D for ; Mon, 19 Mar 2018 20:33:58 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1521491480.e23410c88fe07d5203586559dd2cf716fc1c7970.johu@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: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: e23410c88fe07d5203586559dd2cf716fc1c7970 X-VCS-Branch: master Date: Mon, 19 Mar 2018 20:33:58 +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: 3b3e8fd9-f542-4c4d-a6f4-3746e80f9a4f X-Archives-Hash: a40197d3ecbcda3c5e43ffc3c9f16073 commit: e23410c88fe07d5203586559dd2cf716fc1c7970 Author: Johannes Huber gentoo org> AuthorDate: Mon Mar 19 20:31:20 2018 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Mar 19 20:31:20 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e23410c8 net-libs/telepathy-qt: Sync /w kde overlay Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 78 +++++++++----------------- 1 file changed, 25 insertions(+), 53 deletions(-) diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild index ed5f8203..699f4ab1 100644 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild @@ -1,39 +1,30 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" ) -inherit python-any-r1 cmake-utils virtualx git-r3 multibuild +inherit python-any-r1 cmake-utils virtualx git-r3 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" -HOMEPAGE="http://telepathy.freedesktop.org/" +HOMEPAGE="https://telepathy.freedesktop.org/" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="debug farstream +qt4 qt5 test" - -REQUIRED_USE="|| ( qt4 qt5 )" +IUSE="debug farstream test" RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtxml:5 farstream? ( >=net-libs/telepathy-farstream-0.2.2 >=net-libs/telepathy-glib-0.18.0 ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - ) - !net-libs/telepathy-qt4 " DEPEND="${RDEPEND} ${PYTHON_DEPS} @@ -42,53 +33,34 @@ DEPEND="${RDEPEND} dev-libs/dbus-glib dev-libs/glib:2 dev-python/dbus-python - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) + dev-qt/qttest:5 ) " -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) +# bug 549448 - last checked with 0.9.7 +RESTRICT="test" pkg_setup() { python-any-r1_pkg_setup - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } src_configure() { - myconfigure() { - local mycmakeargs=( - -DENABLE_DEBUG_OUTPUT=$(usex debug) - -DENABLE_FARSTREAM=$(usex farstream) - -DENABLE_TESTS=$(usex test) - -DENABLE_EXAMPLES=OFF - -ENABLE_SERVICE_SUPPORT=ON - ) - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=( -DDESIRED_QT_VERSION=4 ) - fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=( -DDESIRED_QT_VERSION=5 ) - fi - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile + local mycmakeargs=( + -DDESIRED_QT_VERSION=5 + -DENABLE_DEBUG_OUTPUT=$(usex debug) + -DENABLE_FARSTREAM=$(usex farstream) + -DENABLE_TESTS=$(usex test) + -DENABLE_EXAMPLES=OFF + ) + cmake-utils_src_configure } src_test() { - mytest() { - pushd "${BUILD_DIR}" > /dev/null || die - VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed" - popd > /dev/null || die + _test_runner() { + ctest -E '(CallChannel)' } - multibuild_foreach_variant mytest -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install + pushd "${BUILD_DIR}" > /dev/null || die + virtx _test_runner + popd > /dev/null || die }