[gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/files/, net-libs/telepathy-qt/

[Andreas Sturmlechner]

commit:     cde66f63160f1d4669cbacc51bbf6e2a6e922445
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 16:11:22 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 16:14:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde66f63

net-libs/telepathy-qt: Cleanup bogus deps, cleanup failing test deps

Closes: https://bugs.gentoo.org/653802
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../files/telepathy-qt-0.9.7-deps.patch            | 37 ++++++++++++++++++++++
 net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild | 25 +++------------
 2 files changed, 42 insertions(+), 20 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 00000000000..033ece79bb5
--- /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-0.9.7-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
index 9aaa8c5aa7c..97dc81e956d 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 cmake-utils virtualx
+inherit python-any-r1 cmake-utils
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="https://telepathy.freedesktop.org/"
@@ -13,7 +13,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="debug farstream test"
+IUSE="debug farstream"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -29,17 +29,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	${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.6.1-yes-release.patch"
 	"${FILESDIR}/${PN}-0.9.6.1-qtpath.patch"
+	"${FILESDIR}/${P}-deps.patch"
 )
 
 # bug 549448 - last checked with 0.9.7
@@ -54,18 +49,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
-}