Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kwalletd/
Date: Tue, 02 May 2017 11:08:22
Message-Id: 1493723277.1c0467b7dd63a6d61cd877cabcab6e0a7736bf61.asturm@gentoo
1 commit: 1c0467b7dd63a6d61cd877cabcab6e0a7736bf61
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 2 06:49:05 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue May 2 11:07:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0467b7
7
8 kde-apps/kwalletd: Add missing DEPEND, fix blocker
9
10 Thanks-to: Arfrever
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13
14 kde-apps/kwalletd/kwalletd-16.04.3-r1.ebuild | 8 +++++---
15 kde-apps/kwalletd/kwalletd-16.04.3.ebuild | 9 ++++++---
16 2 files changed, 11 insertions(+), 6 deletions(-)
17
18 diff --git a/kde-apps/kwalletd/kwalletd-16.04.3-r1.ebuild b/kde-apps/kwalletd/kwalletd-16.04.3-r1.ebuild
19 index e8570e045fe..de351287bb5 100644
20 --- a/kde-apps/kwalletd/kwalletd-16.04.3-r1.ebuild
21 +++ b/kde-apps/kwalletd/kwalletd-16.04.3-r1.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2016 Gentoo Foundation
24 +# Copyright 1999-2017 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28 @@ -10,11 +10,13 @@ DESCRIPTION="KDE Password Server"
29 KEYWORDS="~amd64 ~arm ~x86"
30 IUSE="debug gpg"
31
32 -DEPEND="
33 +RDEPEND="
34 dev-libs/libgcrypt:0=
35 gpg? ( app-crypt/gpgme[cxx] )
36 "
37 -RDEPEND="${DEPEND}"
38 +DEPEND="${RDEPEND}
39 + gpg? ( dev-libs/boost )
40 +"
41
42 RESTRICT="test"
43 # testpamopen crashes with a buffer overflow (__fortify_fail)
44
45 diff --git a/kde-apps/kwalletd/kwalletd-16.04.3.ebuild b/kde-apps/kwalletd/kwalletd-16.04.3.ebuild
46 index c13106334c3..795d3b9fcb4 100644
47 --- a/kde-apps/kwalletd/kwalletd-16.04.3.ebuild
48 +++ b/kde-apps/kwalletd/kwalletd-16.04.3.ebuild
49 @@ -10,15 +10,18 @@ DESCRIPTION="KDE Password Server"
50 KEYWORDS="amd64 ~arm x86"
51 IUSE="debug gpg"
52
53 -DEPEND="
54 +COMMON_DEPEND="
55 dev-libs/libgcrypt:0=
56 gpg? (
57 app-crypt/gpgme
58 || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) )
59 )
60 "
61 -RDEPEND="${DEPEND}
62 - !=kde-apps/kdepimlibs-4.14.10_p2016*
63 +DEPEND="${COMMON_DEPEND}
64 + gpg? ( dev-libs/boost )
65 +"
66 +RDEPEND="${COMMON_DEPEND}
67 + !~kde-apps/kdepimlibs-4.14.10_p20160611
68 !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
69 "