Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: app-admin/keepassx/
Date: Wed, 23 Sep 2015 12:35:35
Message-Id: 1443011696.7a86333acf022aeed83653ecdcff914fee0ba0e5.kensington@gentoo
1 commit: 7a86333acf022aeed83653ecdcff914fee0ba0e5
2 Author: Anders Larsson <andla <AT> thethundertemplars <DOT> com>
3 AuthorDate: Thu Sep 17 14:29:01 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 23 12:34:56 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7a86333a
7
8 app-admin/keepassx: Update ebuild for qt5
9
10 keepassx can only be built with qt5 now.
11
12 app-admin/keepassx/keepassx-9999.ebuild | 16 +++++++++++++---
13 1 file changed, 13 insertions(+), 3 deletions(-)
14
15 diff --git a/app-admin/keepassx/keepassx-9999.ebuild b/app-admin/keepassx/keepassx-9999.ebuild
16 index 3b00135..2d03246 100644
17 --- a/app-admin/keepassx/keepassx-9999.ebuild
18 +++ b/app-admin/keepassx/keepassx-9999.ebuild
19 @@ -19,14 +19,24 @@ KEYWORDS=""
20 IUSE="debug test"
21
22 RDEPEND="dev-libs/libgcrypt:=
23 - dev-qt/qtcore:4[qt3support]
24 - dev-qt/qtgui:4[qt3support]
25 + dev-qt/qtcore:5
26 + dev-qt/qtgui:5
27 + dev-qt/qtwidgets:5
28 sys-libs/zlib
29 "
30 DEPEND="${RDEPEND}
31 - test? ( dev-qt/qttest:4 )
32 + dev-qt/linguist-tools:5
33 + dev-qt/qtconcurrent:5
34 + test? ( dev-qt/qttest:5 )
35 "
36
37 +src_prepare() {
38 + use test || \
39 + sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
40 +
41 + cmake-utils_src_prepare
42 +}
43 +
44 src_configure() {
45 local mycmakeargs=(
46 $(cmake-utils_use_with test TESTS)