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 0721E138334 for ; Wed, 12 Dec 2018 14:54:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23FBDE0A89; Wed, 12 Dec 2018 14:54:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 D86B2E0A89 for ; Wed, 12 Dec 2018 14:54:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D8454335CCB for ; Wed, 12 Dec 2018 14:54:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DF62326 for ; Wed, 12 Dec 2018 14:54:06 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1544626435.b5bf27588b17fb6b87cfd300926b5ec5c8290cdd.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/ X-VCS-Repository: proj/kde X-VCS-Files: net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch net-libs/telepathy-qt/telepathy-qt-9999.ebuild X-VCS-Directories: net-libs/telepathy-qt/ net-libs/telepathy-qt/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b5bf27588b17fb6b87cfd300926b5ec5c8290cdd X-VCS-Branch: master Date: Wed, 12 Dec 2018 14:54:06 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eee71345-7837-463e-ac1b-9be18f0552cd X-Archives-Hash: 7a3edeaad6f6b9ee8917d74cdb1595ad commit: b5bf27588b17fb6b87cfd300926b5ec5c8290cdd Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 25 16:11:22 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 12 14:53:55 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b5bf2758 net-libs/telepathy-qt: Cleanup bogus deps, cleanup failing test deps Bug: https://bugs.gentoo.org/653802 Package-Manager: Portage-2.3.31, Repoman-2.3.9 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/telepathy-qt-0.9.7-deps.patch | 37 ++++++++++++++++++++++ net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 24 +++----------- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch new file mode 100644 index 0000000000..033ece79bb --- /dev/null +++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch @@ -0,0 +1,37 @@ +--- a/cmake/modules/FindQt5.cmake 2016-06-12 13:04:05.000000000 +0200 ++++ b/cmake/modules/FindQt5.cmake 2018-04-25 18:04:28.351188748 +0200 +@@ -22,8 +22,6 @@ + # QT_QTDBUS_LIBRARY The QtDBus library + # QT_QTGUI_LIBRARY The QtGui library + # QT_QTNETWORK_LIBRARY The QtNetwork library +-# QT_QTTEST_LIBRARY The QtTest library +-# QT_QTWIDGETS_LIBRARY The QtWidgets library + # QT_QTXML_LIBRARY The QtXml library + # + # also defined, but NOT for general use are +@@ -65,23 +63,19 @@ + find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED) + find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED) + find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED) +-find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED) +-find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED) + find_package(Qt5Network ${REQUIRED_QT_VERSION} REQUIRED) + find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED) + + # Copy includes and library names into the same style as pkgconfig used for Qt4 +-set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) ++set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) + + set(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES}) + set(QT_QTDBUS_LIBRARY ${Qt5DBus_LIBRARIES}) + set(QT_QTGUI_LIBRARY ${Qt5Gui_LIBRARIES}) + set(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES}) +-set(QT_QTTEST_LIBRARY ${Qt5Test_LIBRARIES}) +-set(QT_QTWIDGETS_LIBRARY ${Qt5Widgets_LIBRARIES}) + set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES}) + +-set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY}) ++set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY}) + + SET(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR}) + SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR}) diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild index 926958c8fd..11042bbdaf 100644 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" ) -inherit python-any-r1 cmake-utils virtualx git-r3 +inherit python-any-r1 cmake-utils git-r3 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" HOMEPAGE="https://telepathy.freedesktop.org/" @@ -13,7 +13,7 @@ HOMEPAGE="https://telepathy.freedesktop.org/" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="debug farstream test" +IUSE="debug farstream" RDEPEND=" dev-qt/qtcore:5 @@ -30,14 +30,10 @@ DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig - test? ( - dev-libs/dbus-glib - dev-libs/glib:2 - dev-python/dbus-python - dev-qt/qttest:5 - ) " +PATCHES=( "${FILESDIR}/${PN}-0.9.7-deps.patch" ) + # bug 549448 - last checked with 0.9.7 RESTRICT="test" @@ -50,18 +46,8 @@ src_configure() { -DDESIRED_QT_VERSION=5 -DENABLE_DEBUG_OUTPUT=$(usex debug) -DENABLE_FARSTREAM=$(usex farstream) - -DENABLE_TESTS=$(usex test) + -DENABLE_TESTS=OFF -DENABLE_EXAMPLES=OFF ) cmake-utils_src_configure } - -src_test() { - _test_runner() { - ctest -E '(CallChannel)' - } - - pushd "${BUILD_DIR}" > /dev/null || die - virtx _test_runner - popd > /dev/null || die -}