From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 27 May 2017 15:56:16 +0000 (+0200)
Subject: dev-vcs/subversion: Add kde-frameworks/kwallet alt. RDEPEND
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c57db492243f9581208a63eceb367809a4e95f74;p=gentoo.git

dev-vcs/subversion: Add kde-frameworks/kwallet alt. RDEPEND

Package-Manager: Portage-2.3.5, Repoman-2.3.1
---

diff --git a/dev-vcs/subversion/subversion-1.8.17.ebuild b/dev-vcs/subversion/subversion-1.8.17.ebuild
index 931a4029896c..663a46742acf 100644
--- a/dev-vcs/subversion/subversion-1.8.17.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.17.ebuild
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kwallet? ( kde-apps/kwalletd:4 )
+	kwallet? ( || (
+		( >=kde-frameworks/kwallet-5.34.0-r1 )
+		( kde-apps/kwalletd:4 )
+	) )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
diff --git a/dev-vcs/subversion/subversion-1.9.5.ebuild b/dev-vcs/subversion/subversion-1.9.5.ebuild
index 7b0ad1c36f20..096932f6f69d 100644
--- a/dev-vcs/subversion/subversion-1.9.5.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.5.ebuild
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kwallet? ( kde-apps/kwalletd:4 )
+	kwallet? ( || (
+		( >=kde-frameworks/kwallet-5.34.0-r1 )
+		( kde-apps/kwalletd:4 )
+	) )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once