Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
Date: Thu, 31 Aug 2017 22:13:59
Message-Id: 1504217620.3b8f699e3ef9281bc5930b12f62197776704966b.asturm@gentoo
1 commit: 3b8f699e3ef9281bc5930b12f62197776704966b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 31 22:13:40 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 31 22:13:40 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b8f699e
7
8 dev-libs/libdbusmenu-qt: Drop USE=qt5, build it unconditionally
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild | 22 +++++++++-------------
13 1 file changed, 9 insertions(+), 13 deletions(-)
14
15 diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
16 index 9434c8fa7e..34335d9c8a 100644
17 --- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
18 +++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
19 @@ -6,9 +6,9 @@ EAPI=6
20 EBZR_REPO_URI="lp:libdbusmenu-qt"
21
22 [[ ${PV} == 9999* ]] && inherit bzr
23 -inherit cmake-multilib multibuild multilib virtualx cmake-multilib
24 +inherit cmake-multilib multibuild virtualx
25
26 -DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
27 +DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
28 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
29 if [[ ${PV} != 9999* ]] ; then
30 MY_PV=${PV/_pre/+16.04.}
31 @@ -18,27 +18,23 @@ fi
32
33 LICENSE="LGPL-2"
34 SLOT="0"
35 -IUSE="debug +qt4 qt5"
36 -
37 -REQUIRED_USE="|| ( qt4 qt5 )"
38 +IUSE="debug qt4"
39
40 RDEPEND="
41 + dev-qt/qtcore:5
42 + dev-qt/qtdbus:5
43 + dev-qt/qtgui:5
44 + dev-qt/qtwidgets:5
45 qt4? (
46 >=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
47 >=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
48 >=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
49 )
50 - qt5? (
51 - dev-qt/qtcore:5
52 - dev-qt/qtdbus:5
53 - dev-qt/qtgui:5
54 - dev-qt/qtwidgets:5
55 - )
56 "
57 DEPEND="${RDEPEND}
58 test? (
59 + dev-qt/qttest:5
60 qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
61 - qt5? ( dev-qt/qttest:5 )
62 )
63 "
64
65 @@ -50,7 +46,7 @@ DOCS=( NEWS README )
66 RESTRICT="test"
67
68 pkg_setup() {
69 - MULTIBUILD_VARIANTS=( $(usex qt4 4) $(usex qt5 5) )
70 + MULTIBUILD_VARIANTS=( $(usex qt4 4) 5 )
71 }
72
73 src_prepare() {