commit: e23410c88fe07d5203586559dd2cf716fc1c7970
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 20:31:20 2018 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> 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
}
