1 |
commit: 7ae311fcf3b1f647cda7f403df924eaa99d3ee1b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 30 19:36:54 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 30 19:36:54 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ae311fc |
7 |
|
8 |
net-libs/telepathy-qt: Drop USE=qt4,qt5, sync w/ tree |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 81 +++++++++----------------- |
13 |
1 file changed, 29 insertions(+), 52 deletions(-) |
14 |
|
15 |
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild |
16 |
index 39dc6bf989..894c7bbcaf 100644 |
17 |
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild |
18 |
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild |
19 |
@@ -5,35 +5,26 @@ EAPI=6 |
20 |
|
21 |
PYTHON_COMPAT=( python2_7 ) |
22 |
EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" ) |
23 |
-inherit python-any-r1 cmake-utils virtualx git-r3 multibuild |
24 |
+inherit python-any-r1 cmake-utils virtualx git-r3 |
25 |
|
26 |
DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" |
27 |
-HOMEPAGE="http://telepathy.freedesktop.org/" |
28 |
+HOMEPAGE="https://telepathy.freedesktop.org/" |
29 |
|
30 |
LICENSE="LGPL-2.1" |
31 |
SLOT="0" |
32 |
KEYWORDS="" |
33 |
-IUSE="debug farstream +qt4 qt5 test" |
34 |
- |
35 |
-REQUIRED_USE="|| ( qt4 qt5 )" |
36 |
+IUSE="debug farstream test" |
37 |
|
38 |
RDEPEND=" |
39 |
+ dev-qt/qtcore:5 |
40 |
+ dev-qt/qtdbus:5 |
41 |
+ dev-qt/qtgui:5 |
42 |
+ dev-qt/qtnetwork:5 |
43 |
+ dev-qt/qtxml:5 |
44 |
farstream? ( |
45 |
>=net-libs/telepathy-farstream-0.2.2 |
46 |
>=net-libs/telepathy-glib-0.18.0 |
47 |
) |
48 |
- qt4? ( |
49 |
- dev-qt/qtcore:4 |
50 |
- dev-qt/qtdbus:4 |
51 |
- ) |
52 |
- qt5? ( |
53 |
- dev-qt/qtcore:5 |
54 |
- dev-qt/qtdbus:5 |
55 |
- dev-qt/qtgui:5 |
56 |
- dev-qt/qtnetwork:5 |
57 |
- dev-qt/qtxml:5 |
58 |
- ) |
59 |
- !net-libs/telepathy-qt4 |
60 |
" |
61 |
DEPEND="${RDEPEND} |
62 |
${PYTHON_DEPS} |
63 |
@@ -42,53 +33,39 @@ DEPEND="${RDEPEND} |
64 |
dev-libs/dbus-glib |
65 |
dev-libs/glib:2 |
66 |
dev-python/dbus-python |
67 |
- qt4? ( dev-qt/qttest:4 ) |
68 |
- qt5? ( dev-qt/qttest:5 ) |
69 |
+ dev-qt/qttest:5 |
70 |
) |
71 |
" |
72 |
|
73 |
-DOCS=( AUTHORS ChangeLog HACKING NEWS README ) |
74 |
+PATCHES=( |
75 |
+ "${FILESDIR}/${PN}-0.9.6.1-yes-release.patch" |
76 |
+ "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch" |
77 |
+) |
78 |
+ |
79 |
+# bug 549448 - last checked with 0.9.7 |
80 |
+RESTRICT="test" |
81 |
|
82 |
pkg_setup() { |
83 |
python-any-r1_pkg_setup |
84 |
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
85 |
} |
86 |
|
87 |
src_configure() { |
88 |
- myconfigure() { |
89 |
- local mycmakeargs=( |
90 |
- -DENABLE_DEBUG_OUTPUT=$(usex debug) |
91 |
- -DENABLE_FARSTREAM=$(usex farstream) |
92 |
- -DENABLE_TESTS=$(usex test) |
93 |
- -DENABLE_EXAMPLES=OFF |
94 |
- -ENABLE_SERVICE_SUPPORT=ON |
95 |
- ) |
96 |
- if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
97 |
- mycmakeargs+=( -DDESIRED_QT_VERSION=4 ) |
98 |
- fi |
99 |
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
100 |
- mycmakeargs+=( -DDESIRED_QT_VERSION=5 ) |
101 |
- fi |
102 |
- cmake-utils_src_configure |
103 |
- } |
104 |
- |
105 |
- multibuild_foreach_variant myconfigure |
106 |
-} |
107 |
- |
108 |
-src_compile() { |
109 |
- multibuild_foreach_variant cmake-utils_src_compile |
110 |
+ local mycmakeargs=( |
111 |
+ -DDESIRED_QT_VERSION=5 |
112 |
+ -DENABLE_DEBUG_OUTPUT=$(usex debug) |
113 |
+ -DENABLE_FARSTREAM=$(usex farstream) |
114 |
+ -DENABLE_TESTS=$(usex test) |
115 |
+ -DENABLE_EXAMPLES=OFF |
116 |
+ ) |
117 |
+ cmake-utils_src_configure |
118 |
} |
119 |
|
120 |
src_test() { |
121 |
- mytest() { |
122 |
- pushd "${BUILD_DIR}" > /dev/null || die |
123 |
- VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed" |
124 |
- popd > /dev/null || die |
125 |
+ _test_runner() { |
126 |
+ ctest -E '(CallChannel)' |
127 |
} |
128 |
|
129 |
- multibuild_foreach_variant mytest |
130 |
-} |
131 |
- |
132 |
-src_install() { |
133 |
- multibuild_foreach_variant cmake-utils_src_install |
134 |
+ pushd "${BUILD_DIR}" > /dev/null || die |
135 |
+ virtx _test_runner |
136 |
+ popd > /dev/null || die |
137 |
} |