From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 27 May 2017 14:51:30 +0000 (+0200)
Subject: kde-apps/kdebase-runtime-meta: Add kde-frameworks/kwallet alt. RDEPEND
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=91f228b31d30c4fde8f255072e68631e5a0f95a8;p=gentoo.git

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
---

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 9c924c0f7524..1ee2d6c62696 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 2f37d4d8ecad..080de1ce90f6 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>