commit: 91f228b31d30c4fde8f255072e68631e5a0f95a8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 14:51:30 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 27 14:54:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f228b3
kde-apps/kdebase-runtime-meta: Add kde-frameworks/kwallet alt. RDEPEND
It is now serving also legacy applications.
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild | 9 ++++++---
kde-apps/kdebase-runtime-meta/metadata.xml | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
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
index 9c924c0f752..1ee2d6c6269 100644
--- 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
@@ -24,9 +24,12 @@ RDEPEND="
$(add_kdeapps_dep ktimezoned '' 16.04.3)
$(add_kdeapps_dep ktraderclient '' 16.04.3)
$(add_kdeapps_dep phonon-kde '' 16.04.3)
- kwallet? (
- $(add_kdeapps_dep kwalletd '' 16.04.3)
- pam? ( $(add_plasma_dep kwallet-pam 'oldwallet') )
+ kwallet? ( || (
+ ( $(add_frameworks_dep kwallet '' 5.34.0-r1) )
+ ( $(add_kdeapps_dep kwalletd '' 16.04.3)
+ pam? ( $(add_plasma_dep kwallet-pam 'oldwallet') )
+ ) )
+ pam? ( $(add_plasma_dep kwallet-pam) )
)
nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
"
diff --git a/kde-apps/kdebase-runtime-meta/metadata.xml
b/kde-apps/kdebase-runtime-meta/metadata.xml
index 2f37d4d8eca..080de1ce90f 100644
--- a/kde-apps/kdebase-runtime-meta/metadata.xml
+++ b/kde-apps/kdebase-runtime-meta/metadata.xml
@@ -6,6 +6,6 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="kwallet">Install <pkg>kde-apps/kwalletd</pkg> on a
minimal setup for migration purposes</flag>
+ <flag name="kwallet">Enable encrypted storage of passwords with
<pkg>kde-frameworks/kwallet</pkg></flag>
</use>
</pkgmetadata>
