Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
Date: Sat, 23 Nov 2013 15:06:10
Message-Id: 1385218923.6982b9fc0b5c90dea908567b9ad14df3dc60f9ec.kensington@gentoo
1 commit: 6982b9fc0b5c90dea908567b9ad14df3dc60f9ec
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 23 15:02:03 2013 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 23 15:02:03 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6982b9fc
7
8 [dev-libs/libdbusmenu-qt] Support parallel installation of both Qt4 and Qt5 versions.
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild | 52 +++++++++++++++++-----
14 1 file changed, 40 insertions(+), 12 deletions(-)
15
16 diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
17 index 43152cf..66d2d62 100644
18 --- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
19 +++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
20 @@ -7,7 +7,7 @@ EAPI=5
21 EBZR_REPO_URI="lp:libdbusmenu-qt"
22
23 [[ ${PV} == 9999* ]] && BZR_ECLASS="bzr"
24 -inherit cmake-utils virtualx ${BZR_ECLASS}
25 +inherit cmake-utils multibuild virtualx ${BZR_ECLASS}
26
27 DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
28 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
29 @@ -55,21 +55,49 @@ PATCHES=( "${FILESDIR}/${PN}-0.9.2-optionaltests.patch" )
30 # tests fail due to missing conection to dbus
31 RESTRICT="test"
32
33 +pkg_setup() {
34 + MULTIBUILD_VARIANTS=()
35 + use qt4 && MULTIBUILD_VARIANTS+=( qt4 )
36 + use qt5 && MULTIBUILD_VARIANTS+=( qt5 )
37 +}
38 +
39 src_configure() {
40 - local mycmakeargs=(
41 - $(cmake-utils_use_build test TESTS)
42 - $(cmake-utils_use_with doc)
43 - $(cmake-utils_use_use qt4)
44 - $(cmake-utils_use_use qt5)
45 - )
46 - cmake-utils_src_configure
47 + myconfigure() {
48 + local mycmakeargs=(
49 + $(cmake-utils_use_build test TESTS)
50 + $(cmake-utils_use_with doc)
51 + )
52 +
53 + if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
54 + mycmakeargs+=( -DUSE_QT4=ON )
55 + fi
56 + if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
57 + mycmakeargs+=( -DUSE_QT5=ON )
58 + fi
59 +
60 + cmake-utils_src_configure
61 + }
62 +
63 + multibuild_foreach_variant myconfigure
64 +}
65 +
66 +src_compile() {
67 + multibuild_foreach_variant cmake-utils_src_compile
68 }
69
70 src_test() {
71 - local builddir=${BUILD_DIR}
72 + mytest() {
73 + local builddir=${BUILD_DIR}
74 +
75 + BUILD_DIR=${BUILD_DIR}/tests \
76 + VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
77
78 - BUILD_DIR=${BUILD_DIR}/tests \
79 - VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
80 + BUILD_DIR=${builddir}
81 + }
82 +
83 + multibuild_foreach_variant mytest
84 +}
85
86 - BUILD_DIR=${builddir}
87 +src_install() {
88 + multibuild_foreach_variant cmake-utils_src_install
89 }