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/kdebase-runtime-meta/
Date: Sat, 27 May 2017 14:54:33
Message-Id: 1495896854.91f228b31d30c4fde8f255072e68631e5a0f95a8.asturm@gentoo
1 commit: 91f228b31d30c4fde8f255072e68631e5a0f95a8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 27 14:51:30 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat May 27 14:54:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f228b3
7
8 kde-apps/kdebase-runtime-meta: Add kde-frameworks/kwallet alt. RDEPEND
9
10 It is now serving also legacy applications.
11
12 Package-Manager: Portage-2.3.5, Repoman-2.3.1
13
14 .../kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild | 9 ++++++---
15 kde-apps/kdebase-runtime-meta/metadata.xml | 2 +-
16 2 files changed, 7 insertions(+), 4 deletions(-)
17
18 diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild
19 index 9c924c0f752..1ee2d6c6269 100644
20 --- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild
21 +++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild
22 @@ -24,9 +24,12 @@ RDEPEND="
23 $(add_kdeapps_dep ktimezoned '' 16.04.3)
24 $(add_kdeapps_dep ktraderclient '' 16.04.3)
25 $(add_kdeapps_dep phonon-kde '' 16.04.3)
26 - kwallet? (
27 - $(add_kdeapps_dep kwalletd '' 16.04.3)
28 - pam? ( $(add_plasma_dep kwallet-pam 'oldwallet') )
29 + kwallet? ( || (
30 + ( $(add_frameworks_dep kwallet '' 5.34.0-r1) )
31 + ( $(add_kdeapps_dep kwalletd '' 16.04.3)
32 + pam? ( $(add_plasma_dep kwallet-pam 'oldwallet') )
33 + ) )
34 + pam? ( $(add_plasma_dep kwallet-pam) )
35 )
36 nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
37 "
38
39 diff --git a/kde-apps/kdebase-runtime-meta/metadata.xml b/kde-apps/kdebase-runtime-meta/metadata.xml
40 index 2f37d4d8eca..080de1ce90f 100644
41 --- a/kde-apps/kdebase-runtime-meta/metadata.xml
42 +++ b/kde-apps/kdebase-runtime-meta/metadata.xml
43 @@ -6,6 +6,6 @@
44 <name>Gentoo KDE Project</name>
45 </maintainer>
46 <use>
47 - <flag name="kwallet">Install <pkg>kde-apps/kwalletd</pkg> on a minimal setup for migration purposes</flag>
48 + <flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
49 </use>
50 </pkgmetadata>