Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/
Date: Mon, 04 Nov 2019 12:53:21
Message-Id: 1572871985.1171ae423fcb26b34f95d8ef010ee68da75779bb.polynomial-c@gentoo
1 commit: 1171ae423fcb26b34f95d8ef010ee68da75779bb
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 4 12:53:05 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 4 12:53:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1171ae42
7
8 app-admin/keepassxc: Dependency and QA fixes
9
10 Package-Manager: Portage-2.3.78, Repoman-2.3.17
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-admin/keepassxc/keepassxc-2.5.0.ebuild | 4 +++-
14 app-admin/keepassxc/keepassxc-9999.ebuild | 4 +++-
15 2 files changed, 6 insertions(+), 2 deletions(-)
16
17 diff --git a/app-admin/keepassxc/keepassxc-2.5.0.ebuild b/app-admin/keepassxc/keepassxc-2.5.0.ebuild
18 index 20be986b6fd..75059bb064a 100644
19 --- a/app-admin/keepassxc/keepassxc-2.5.0.ebuild
20 +++ b/app-admin/keepassxc/keepassxc-2.5.0.ebuild
21 @@ -38,6 +38,7 @@ RDEPEND="
22 dev-qt/qtsvg:5
23 dev-qt/qtwidgets:5
24 media-gfx/qrencode:=
25 + sys-libs/readline:0=
26 sys-libs/zlib:=
27 autotype? (
28 dev-qt/qtx11extras:5
29 @@ -45,7 +46,6 @@ RDEPEND="
30 x11-libs/libXi
31 x11-libs/libXtst
32 )
33 - browser? ( >=dev-libs/libsodium-1.0.12 )
34 keeshare? ( dev-libs/quazip )
35 yubikey? ( sys-auth/ykpers )
36 "
37 @@ -61,6 +61,8 @@ PDEPEND="
38 x11-misc/xsel
39 "
40
41 +RESTRICT="!test? ( test )"
42 +
43 src_prepare() {
44 use test || \
45 sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
46
47 diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
48 index 20be986b6fd..75059bb064a 100644
49 --- a/app-admin/keepassxc/keepassxc-9999.ebuild
50 +++ b/app-admin/keepassxc/keepassxc-9999.ebuild
51 @@ -38,6 +38,7 @@ RDEPEND="
52 dev-qt/qtsvg:5
53 dev-qt/qtwidgets:5
54 media-gfx/qrencode:=
55 + sys-libs/readline:0=
56 sys-libs/zlib:=
57 autotype? (
58 dev-qt/qtx11extras:5
59 @@ -45,7 +46,6 @@ RDEPEND="
60 x11-libs/libXi
61 x11-libs/libXtst
62 )
63 - browser? ( >=dev-libs/libsodium-1.0.12 )
64 keeshare? ( dev-libs/quazip )
65 yubikey? ( sys-auth/ykpers )
66 "
67 @@ -61,6 +61,8 @@ PDEPEND="
68 x11-misc/xsel
69 "
70
71 +RESTRICT="!test? ( test )"
72 +
73 src_prepare() {
74 use test || \
75 sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die