diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-25 18:11:22 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-12 15:53:55 +0100 |
| commit | b5bf27588b17fb6b87cfd300926b5ec5c8290cdd (patch) | |
| tree | a03de51183b202095dcdca18a5d7ec99c0ecfbd4 | |
| parent | 83be0a3615c7d2b5d877d533e1d79acff651be5d (diff) | |
| download | kde-b5bf27588b17fb6b87cfd300926b5ec5c8290cdd.tar.gz kde-b5bf27588b17fb6b87cfd300926b5ec5c8290cdd.tar.bz2 kde-b5bf27588b17fb6b87cfd300926b5ec5c8290cdd.zip | |
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 <asturm@gentoo.org>
| -rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch | 37 | ||||
| -rw-r--r-- | 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 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-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild index 926958c8fd8..11042bbdaf5 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 -} |