Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: net-libs/telepathy-qt/
Date: Wed, 02 Apr 2014 18:36:49
Message-Id: 1396463753.f14bfb61a500c50fd25969e50a51210b66d2b8f8.johu@gentoo
1 commit: f14bfb61a500c50fd25969e50a51210b66d2b8f8
2 Author: Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
3 AuthorDate: Wed Apr 2 17:44:00 2014 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 2 18:35:53 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f14bfb61
7
8 [net-libs/telepathy-qt] Add support for building with Qt5
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 70 ++++++++++++++++++++------
14 1 file changed, 55 insertions(+), 15 deletions(-)
15
16 diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
17 index 68f6aeb..4bf7d1d 100644
18 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
19 +++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
20 @@ -6,7 +6,7 @@ EAPI=5
21
22 PYTHON_COMPAT=( python{2_6,2_7} )
23 EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
24 -inherit base python-any-r1 cmake-utils virtualx git-r3
25 +inherit base python-any-r1 cmake-utils virtualx git-r3 multibuild
26
27 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
28 HOMEPAGE="http://telepathy.freedesktop.org/"
29 @@ -14,15 +14,25 @@ HOMEPAGE="http://telepathy.freedesktop.org/"
30 LICENSE="LGPL-2.1"
31 SLOT="0"
32 KEYWORDS=""
33 -IUSE="debug farstream test"
34 +IUSE="debug farstream +qt4 qt5 test"
35
36 RDEPEND="
37 - dev-qt/qtcore:4
38 - dev-qt/qtdbus:4
39 farstream? (
40 >=net-libs/telepathy-farstream-0.2.2
41 >=net-libs/telepathy-glib-0.18.0
42 )
43 + qt4? (
44 + dev-qt/qtcore:4
45 + dev-qt/qtdbus:4
46 + )
47 + qt5? (
48 + dev-qt/qtcore:5
49 + dev-qt/qtdbus:5
50 + dev-qt/qtgui:5
51 + dev-qt/qtnetwork:5
52 + dev-qt/qtwidgets:5
53 + dev-qt/qtxml:5
54 + )
55 !net-libs/telepathy-qt4
56 "
57 DEPEND="${RDEPEND}
58 @@ -32,7 +42,8 @@ DEPEND="${RDEPEND}
59 dev-libs/dbus-glib
60 dev-libs/glib
61 dev-python/dbus-python
62 - dev-qt/qttest:4
63 + qt4? ( dev-qt/qttest:4 )
64 + qt5? ( dev-qt/qttest:5 )
65 )
66 "
67
68 @@ -40,20 +51,49 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README )
69
70 pkg_setup() {
71 python-any-r1_pkg_setup
72 + MULTIBUILD_VARIANTS=()
73 + if use qt4; then
74 + MULTIBUILD_VARIANTS+=(qt4)
75 + fi
76 + if use qt5; then
77 + MULTIBUILD_VARIANTS+=(qt5)
78 + fi
79 }
80
81 src_configure() {
82 - local mycmakeargs=(
83 - $(cmake-utils_use_enable farstream)
84 - $(cmake-utils_use_enable debug DEBUG_OUTPUT)
85 - $(cmake-utils_use_enable test TESTS)
86 - -DENABLE_EXAMPLES=OFF
87 - )
88 - cmake-utils_src_configure
89 + myconfigure() {
90 + local mycmakeargs=(
91 + $(cmake-utils_use_enable farstream)
92 + $(cmake-utils_use_enable debug DEBUG_OUTPUT)
93 + $(cmake-utils_use_enable test TESTS)
94 + -DENABLE_EXAMPLES=OFF
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 +}
111 +
112 +src_install() {
113 + multibuild_foreach_variant cmake-utils_src_install
114 }
115
116 src_test() {
117 - pushd "${BUILD_DIR}" > /dev/null
118 - Xemake test || die "tests failed"
119 - popd > /dev/null
120 + mytest() {
121 + pushd "${BUILD_DIR}" > /dev/null
122 + Xemake test || die "tests failed"
123 + popd > /dev/null
124 + }
125 +
126 + multibuild_foreach_variant mytest
127 }