Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: net-libs/jreen/
Date: Tue, 06 May 2014 15:51:53
Message-Id: 1399391488.4920600fb5c548f791b29870c863c198b19a58c7.kensington@gentoo
1 commit: 4920600fb5c548f791b29870c863c198b19a58c7
2 Author: Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
3 AuthorDate: Tue May 6 15:42:48 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue May 6 15:51:28 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4920600f
7
8 [net-libs/jreen] Qt4 and Qt5 version can be installed in parallel
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 net-libs/jreen/jreen-9999.ebuild | 41 +++++++++++++++++++++++++++++++++-------
14 1 file changed, 34 insertions(+), 7 deletions(-)
15
16 diff --git a/net-libs/jreen/jreen-9999.ebuild b/net-libs/jreen/jreen-9999.ebuild
17 index 6ed620b..3d70569 100644
18 --- a/net-libs/jreen/jreen-9999.ebuild
19 +++ b/net-libs/jreen/jreen-9999.ebuild
20 @@ -13,7 +13,7 @@ else
21 KEYWORDS=""
22 fi
23
24 -inherit cmake-utils ${GIT_ECLASS}
25 +inherit cmake-utils multibuild ${GIT_ECLASS}
26
27 DESCRIPTION="Qt XMPP library"
28 HOMEPAGE="https://github.com/euroelessar/jreen"
29 @@ -22,8 +22,6 @@ LICENSE="GPL-2"
30 SLOT="0"
31 IUSE="debug +qt4 qt5"
32
33 -REQUIRED_USE="^^ ( qt4 qt5 )"
34 -
35 DEPEND="
36 media-libs/speex
37 >=net-dns/libidn-1.20
38 @@ -43,10 +41,39 @@ RDEPEND="${DEPEND}"
39
40 DOCS=( AUTHORS ChangeLog README )
41
42 +pkg_setup() {
43 + MULTIBUILD_VARIANTS=()
44 + if use qt4; then
45 + MULTIBUILD_VARIANTS+=(qt4)
46 + fi
47 + if use qt5; then
48 + MULTIBUILD_VARIANTS+=(qt5)
49 + fi
50 +}
51 +
52 src_configure() {
53 - local mycmakeargs=(
54 - $(cmake-utils_use qt4 JREEN_FORCE_QT4)
55 - )
56 + myconfigure() {
57 + local mycmakeargs=()
58 + if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
59 + mycmakeargs+=(-DJREEN_FORCE_QT4=ON)
60 + fi
61 + if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
62 + mycmakeargs+=(-DJREEN_FORCE_QT4=OFF)
63 + fi
64 + cmake-utils_src_configure
65 + }
66 +
67 + multibuild_foreach_variant myconfigure
68 +}
69 +
70 +src_compile() {
71 + multibuild_foreach_variant cmake-utils_src_compile
72 +}
73 +
74 +src_install() {
75 + multibuild_foreach_variant cmake-utils_src_install
76 +}
77
78 - cmake-utils_src_configure
79 +src_test() {
80 + multibuild_foreach_variant cmake-utils_src_test
81 }